Merge branch '6.0.x'

framework-platform/framework-platform.gradle

@@ -24,7 +24,7 @@ dependencies {
 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")
 		api("com.fasterxml.woodstox:woodstox-core:6.5.1")
-		api("com.github.ben-manes.caffeine:caffeine:3.1.7")
+		api("com.github.ben-manes.caffeine:caffeine:3.1.8")
 		api("com.github.librepdf:openpdf:1.3.30")
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
@@ -99,7 +99,7 @@ dependencies {
 		api("org.apache.derby:derbyclient:10.16.1.1")
 		api("org.apache.derby:derbytools:10.16.1.1")
 		api("org.apache.httpcomponents.client5:httpclient5:5.2.1")
-		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.1")
+		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.2")
 		api("org.apache.poi:poi-ooxml:5.2.3")
 		api("org.apache.tomcat.embed:tomcat-embed-core:10.1.12")
 		api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.12")

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -127,7 +127,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	}
 
 	@Test
-	void multiplePerTargetAspects() throws Exception {
+	void multiplePerTargetAspects() {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
@@ -153,7 +153,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	}
 
 	@Test
-	void multiplePerTargetAspectsWithOrderAnnotation() throws Exception {
+	void multiplePerTargetAspectsWithOrderAnnotation() {
 		TestBean target = new TestBean();
 		int realAge = 65;
 		target.setAge(realAge);
@@ -283,7 +283,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 		int realAge = 65;
 		target.setAge(realAge);
 		ITestBean itb = createProxy(target, ITestBean.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspectInstance, "someBean")));
+				getAdvisorFactory().getAdvisors(aspectInstanceFactory(aspectInstance, "someBean")));
 		assertThat(itb.getAge()).as("Around advice must apply").isEqualTo(-1);
 		assertThat(target.getAge()).isEqualTo(realAge);
 	}
@@ -292,7 +292,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	void bindingWithSingleArg() {
 		TestBean target = new TestBean();
 		ITestBean itb = createProxy(target, ITestBean.class,
-			getAdvisorFactory().getAdvisors(aspectInstanceFactory(new BindingAspectWithSingleArg(), "someBean")));
+				getAdvisorFactory().getAdvisors(aspectInstanceFactory(new BindingAspectWithSingleArg(), "someBean")));
 		itb.setAge(10);
 		assertThat(itb.getAge()).as("Around advice must apply").isEqualTo(20);
 		assertThat(target.getAge()).isEqualTo(20);
@@ -483,7 +483,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	}
 
 	@Test
-	void nonAbstractParentAspect() throws Exception {
+	void nonAbstractParentAspect() {
 		IncrementingAspect aspect = new IncrementingAspect();
 
 		// Precondition:
@@ -689,7 +689,7 @@ abstract class AbstractAspectJAdvisorFactoryTests {
 	@Aspect
 	static class Library {
 
-		@Pointcut("execution(!void get*())")
+		@Pointcut("execution(int get*())")  // before AspectJ 1.9.20, "!void" used to work instead of "int"
 		void propertyAccess() {}
 
 		@Pointcut("execution(* *(..)) && args(i)")