Explorar el Código

Update java-configuration:hello-security-explicit to use Spring 6

Issue gh-46
Eleftheria Stein hace 3 años
padre
commit
75f86c51ec

+ 5 - 7
servlet/java-configuration/hello-security-explicit/build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id "java"
 	id "nebula.integtest" version "8.2.0"
-	id "org.gretty" version "3.0.6"
+	id "org.gretty" version "4.0.0"
 	id "war"
 }
 
@@ -13,17 +13,15 @@ repositories {
 }
 
 dependencies {
-	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.0-SNAPSHOT")
+	implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT")
 	implementation platform("org.junit:junit-bom:5.7.0")
 
 	implementation "org.springframework.security:spring-security-config"
 	implementation "org.springframework.security:spring-security-web"
-	implementation "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2"
-	implementation "org.apache.taglibs:taglibs-standard-jstlel:1.2.5"
 
-	providedCompile "javax.servlet:javax.servlet-api:4.0.1"
-	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3"
+	providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
+	providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
 
 	testImplementation "org.assertj:assertj-core:3.18.0"
 	testImplementation "org.springframework:spring-test"

+ 1 - 1
servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat9"
+	servletContainer = "tomcat10"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'