diff --git a/servlet/java-configuration/max-sessions/build.gradle b/servlet/java-configuration/max-sessions/build.gradle index 5703fab..3c3302a 100644 --- a/servlet/java-configuration/max-sessions/build.gradle +++ b/servlet/java-configuration/max-sessions/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.3" id "war" } @@ -14,14 +14,17 @@ 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.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" implementation "org.springframework.security:spring-security-web" implementation "org.springframework:spring-webmvc" - implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.1.RELEASE" + + providedCompile "jakarta.servlet:jakarta.servlet-api:6.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" diff --git a/servlet/java-configuration/max-sessions/gradle/gretty.gradle b/servlet/java-configuration/max-sessions/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/max-sessions/gradle/gretty.gradle +++ b/servlet/java-configuration/max-sessions/gradle/gretty.gradle @@ -1,5 +1,5 @@ gretty { - servletContainer = "tomcat9" + servletContainer = "tomcat10" contextPath = "/" fileLogEnabled = false integrationTestTask = 'integrationTest' @@ -38,4 +38,4 @@ project.tasks.matching { it.name == "integrationTest" }.all { integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl } -} \ No newline at end of file +} diff --git a/servlet/java-configuration/max-sessions/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/max-sessions/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/max-sessions/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/max-sessions/src/main/java/example/MvcWebApplicationInitializer.java @@ -16,7 +16,7 @@ package example; -import javax.servlet.Filter; +import jakarta.servlet.Filter; import org.springframework.web.filter.HiddenHttpMethodFilter; import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; diff --git a/servlet/java-configuration/max-sessions/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/max-sessions/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/max-sessions/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/max-sessions/src/main/java/example/WebMvcConfiguration.java @@ -16,10 +16,10 @@ package example; -import org.thymeleaf.spring5.ISpringTemplateEngine; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.spring6.ISpringTemplateEngine; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.thymeleaf.templateresolver.ITemplateResolver;