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

Issue gh-46
This commit is contained in:
Eleftheria Stein 2021-11-11 18:41:57 +01:00 committed by Marcus Da Coregio
parent fe037cf4d7
commit 75f86c51ec
2 changed files with 6 additions and 8 deletions

View File

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

View File

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