From c72dd1ff66f841443e864925061d0ff01a1a59be Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 16 Aug 2023 17:32:26 +0200 Subject: [PATCH 1/2] Change "!void" pointcut expression to "int" for AspectJ 1.9.20 --- .../AbstractAspectJAdvisorFactoryTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 0d802ea2dce..a4030f8d2ea 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 @@ -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)") From 2111bf9b9d50a27ea3c56cb105fc44da98aa0c01 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 16 Aug 2023 17:53:02 +0200 Subject: [PATCH 2/2] Upgrade to Caffeine 3.1.8 and Apache HttpComponents Core Reactive 5.2.2 --- framework-platform/framework-platform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index ff52f0014f9..f4ac09132a9 100644 --- a/framework-platform/framework-platform.gradle +++ b/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") @@ -97,7 +97,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")