From 24dc56e6ca3d61c9206df622921bfe0b36af91a2 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 31 Mar 2023 09:28:45 -0300 Subject: [PATCH] Update AspectJ sample to Java 17 --- .../java-configuration/aspectj/build.gradle | 18 +++++++++--------- .../sample/aspectj/AspectjSecurityConfig.java | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/servlet/java-configuration/aspectj/build.gradle b/servlet/java-configuration/aspectj/build.gradle index 933af17..7fd2721 100644 --- a/servlet/java-configuration/aspectj/build.gradle +++ b/servlet/java-configuration/aspectj/build.gradle @@ -1,5 +1,5 @@ plugins { - id "io.freefair.aspectj.post-compile-weaving" version "5.2.1" + id "io.freefair.aspectj.post-compile-weaving" version "8.0.1" id "java" } @@ -10,22 +10,22 @@ repositories { } compileJava { - sourceCompatibility "1.8" - targetCompatibility "1.8" + sourceCompatibility "17" + targetCompatibility "17" } compileTestJava { - sourceCompatibility "1.8" - targetCompatibility "1.8" + sourceCompatibility "17" + targetCompatibility "17" } dependencies { - aspect platform("org.springframework:spring-framework-bom:5.3.0") - aspect platform("org.springframework.security:spring-security-bom:5.4.0-SNAPSHOT") + aspect platform("org.springframework:spring-framework-bom:6.0.7") + aspect platform("org.springframework.security:spring-security-bom:6.0.2") aspect "org.springframework.security:spring-security-aspects" - implementation platform("org.springframework:spring-framework-bom:5.3.0") - implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") + implementation platform("org.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.2") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java b/servlet/java-configuration/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java index f2d6ab6..9d99a75 100644 --- a/servlet/java-configuration/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java +++ b/servlet/java-configuration/aspectj/src/main/java/sample/aspectj/AspectjSecurityConfig.java @@ -20,6 +20,7 @@ import org.springframework.context.annotation.AdviceMode; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -31,7 +32,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; * @author Rob Winch */ @Configuration -@EnableGlobalMethodSecurity(mode = AdviceMode.ASPECTJ, securedEnabled = true) +@EnableMethodSecurity(mode = AdviceMode.ASPECTJ, securedEnabled = true, prePostEnabled = false) public class AspectjSecurityConfig { @Bean