From f4afba567a7c73f14d39087b5574b73ae2d4d2d2 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Fri, 10 Dec 2021 13:14:56 -0300 Subject: [PATCH] Update xml:helloworld sample to use Spring 6 Issue gh-46 --- servlet/xml/java/helloworld/build.gradle | 9 +++++---- servlet/xml/java/helloworld/gradle/gretty.gradle | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/servlet/xml/java/helloworld/build.gradle b/servlet/xml/java/helloworld/build.gradle index 702108f..348926d 100644 --- a/servlet/xml/java/helloworld/build.gradle +++ b/servlet/xml/java/helloworld/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,16 +13,17 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:5.6.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 "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" - implementation 'javax.servlet:jstl:1.2' implementation 'org.slf4j:slf4j-api:1.7.30' implementation 'org.slf4j:slf4j-simple:1.7.30' + providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0" + providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0" + testImplementation "org.springframework:spring-test" testImplementation "org.springframework.security:spring-security-test" testImplementation("org.junit.jupiter:junit-jupiter-api") diff --git a/servlet/xml/java/helloworld/gradle/gretty.gradle b/servlet/xml/java/helloworld/gradle/gretty.gradle index 6949bdf..ae3483d 100644 --- a/servlet/xml/java/helloworld/gradle/gretty.gradle +++ b/servlet/xml/java/helloworld/gradle/gretty.gradle @@ -1,5 +1,5 @@ gretty { - servletContainer = "tomcat9" + servletContainer = "tomcat10" contextPath = "/" fileLogEnabled = false integrationTestTask = 'integrationTest'