Эх сурвалжийг харах

Update AspectJ sample to Java 17

Marcus Da Coregio 2 жил өмнө
parent
commit
24dc56e6ca

+ 9 - 9
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"

+ 2 - 1
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