From 7a4ec001998ce25408a3b592e13ca24eaf45ba18 Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Thu, 22 Jun 2023 09:52:14 -0300 Subject: [PATCH] Use Spring 6 --- .../java-configuration/aspectj/build.gradle | 18 +++++++++--------- .../aspectj/gradle/gretty.gradle | 4 ++-- .../authentication/preauth/build.gradle | 6 +++--- .../authentication/remember-me/build.gradle | 11 +++++++---- .../remember-me/gradle/gretty.gradle | 4 ++-- .../example/MvcWebApplicationInitializer.java | 2 +- .../main/java/example/WebMvcConfiguration.java | 8 ++++---- .../src/test/java/example/RememberMeTests.java | 3 +-- .../username-password/form/build.gradle | 6 +++--- .../username-password/in-memory/build.gradle | 8 ++++---- .../in-memory/gradle/gretty.gradle | 4 ++-- .../example/MvcWebApplicationInitializer.java | 2 +- .../main/java/example/WebMvcConfiguration.java | 8 ++++---- .../username-password/jdbc/build.gradle | 8 ++++---- .../jdbc/gradle/gretty.gradle | 4 ++-- .../example/MvcWebApplicationInitializer.java | 2 +- .../main/java/example/WebMvcConfiguration.java | 8 ++++---- .../username-password/ldap/build.gradle | 8 ++++---- .../ldap/gradle/gretty.gradle | 4 ++-- .../example/MvcWebApplicationInitializer.java | 2 +- .../main/java/example/WebMvcConfiguration.java | 8 ++++---- .../authentication/x509/build.gradle | 6 +++--- .../authentication/x509/gradle/gretty.gradle | 4 ++-- .../example/MvcWebApplicationInitializer.java | 2 +- servlet/java-configuration/data/build.gradle | 4 ++-- .../hello-mvc-security/build.gradle | 6 +++--- .../hello-security-explicit/build.gradle | 4 ++-- .../hello-security/build.gradle | 4 ++-- .../max-sessions/build.gradle | 11 +++++++---- .../max-sessions/gradle/gretty.gradle | 4 ++-- .../example/MvcWebApplicationInitializer.java | 2 +- .../main/java/example/WebMvcConfiguration.java | 8 ++++---- .../saml2/login/build.gradle | 6 +++--- servlet/xml/java/contacts/build.gradle | 4 ++-- servlet/xml/java/dms/build.gradle | 4 ++-- servlet/xml/java/helloworld/build.gradle | 2 +- servlet/xml/java/preauth/build.gradle | 5 +++-- .../xml/java/saml2/login-logout/build.gradle | 6 +++--- 38 files changed, 108 insertions(+), 102 deletions(-) diff --git a/servlet/java-configuration/aspectj/build.gradle b/servlet/java-configuration/aspectj/build.gradle index 933af17..a3e3e25 100644 --- a/servlet/java-configuration/aspectj/build.gradle +++ b/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.4") 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.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/aspectj/gradle/gretty.gradle b/servlet/java-configuration/aspectj/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/aspectj/gradle/gretty.gradle +++ b/servlet/java-configuration/aspectj/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/authentication/preauth/build.gradle b/servlet/java-configuration/authentication/preauth/build.gradle index 83101e3..5bea19c 100644 --- a/servlet/java-configuration/authentication/preauth/build.gradle +++ b/servlet/java-configuration/authentication/preauth/build.gradle @@ -16,14 +16,14 @@ repositories { ext["micrometer.version"] = "1.10.0-SNAPSHOT" dependencies { - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") 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-spring6:3.1.0.M3" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.RELEASE" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/authentication/remember-me/build.gradle b/servlet/java-configuration/authentication/remember-me/build.gradle index df727d0..fa19719 100644 --- a/servlet/java-configuration/authentication/remember-me/build.gradle +++ b/servlet/java-configuration/authentication/remember-me/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" } @@ -16,14 +16,17 @@ repositories { ext["micrometer.version"] = "1.10.0-SNAPSHOT" 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.4") 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.0.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/authentication/remember-me/gradle/gretty.gradle b/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle +++ b/servlet/java-configuration/authentication/remember-me/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/authentication/remember-me/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/authentication/remember-me/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/authentication/remember-me/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/authentication/remember-me/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/authentication/remember-me/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/authentication/remember-me/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; diff --git a/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java b/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java index f8c6075..72d18a3 100644 --- a/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java +++ b/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java @@ -16,8 +16,7 @@ package example; -import javax.servlet.http.Cookie; - +import jakarta.servlet.http.Cookie; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/servlet/java-configuration/authentication/username-password/form/build.gradle b/servlet/java-configuration/authentication/username-password/form/build.gradle index a6fc815..1346ca1 100644 --- a/servlet/java-configuration/authentication/username-password/form/build.gradle +++ b/servlet/java-configuration/authentication/username-password/form/build.gradle @@ -14,14 +14,14 @@ repositories { } dependencies { - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") 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-spring6:3.1.0.M1" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.RELEASE" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle b/servlet/java-configuration/authentication/username-password/in-memory/build.gradle index 5703fab..1346ca1 100644 --- a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle +++ b/servlet/java-configuration/authentication/username-password/in-memory/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" } @@ -14,14 +14,14 @@ 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.4") 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.0.RELEASE" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle +++ b/servlet/java-configuration/authentication/username-password/in-memory/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/authentication/username-password/in-memory/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/username-password/in-memory/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/authentication/username-password/in-memory/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/authentication/username-password/in-memory/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/authentication/username-password/in-memory/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/username-password/in-memory/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/authentication/username-password/in-memory/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/authentication/username-password/in-memory/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; diff --git a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle b/servlet/java-configuration/authentication/username-password/jdbc/build.gradle index bd8cc55..6c33200 100644 --- a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle +++ b/servlet/java-configuration/authentication/username-password/jdbc/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" } @@ -14,8 +14,8 @@ 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.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.hsqldb:hsqldb:2.5.1" @@ -23,7 +23,7 @@ dependencies { implementation "org.springframework.security:spring-security-web" implementation "org.springframework:spring-jdbc" implementation "org.springframework:spring-webmvc" - implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.RELEASE" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle +++ b/servlet/java-configuration/authentication/username-password/jdbc/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/authentication/username-password/jdbc/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/authentication/username-password/jdbc/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/authentication/username-password/jdbc/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/authentication/username-password/jdbc/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/authentication/username-password/jdbc/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; diff --git a/servlet/java-configuration/authentication/username-password/ldap/build.gradle b/servlet/java-configuration/authentication/username-password/ldap/build.gradle index c6364bd..2dc6383 100644 --- a/servlet/java-configuration/authentication/username-password/ldap/build.gradle +++ b/servlet/java-configuration/authentication/username-password/ldap/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" } @@ -14,15 +14,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.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-ldap" 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.0.RELEASE" runtimeOnly "com.unboundid:unboundid-ldapsdk:4.0.14" diff --git a/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle +++ b/servlet/java-configuration/authentication/username-password/ldap/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/authentication/username-password/ldap/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/username-password/ldap/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/authentication/username-password/ldap/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/authentication/username-password/ldap/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/authentication/username-password/ldap/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/username-password/ldap/src/main/java/example/WebMvcConfiguration.java index 9c01f78..3e18741 100644 --- a/servlet/java-configuration/authentication/username-password/ldap/src/main/java/example/WebMvcConfiguration.java +++ b/servlet/java-configuration/authentication/username-password/ldap/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; diff --git a/servlet/java-configuration/authentication/x509/build.gradle b/servlet/java-configuration/authentication/x509/build.gradle index 2268004..b120a01 100644 --- a/servlet/java-configuration/authentication/x509/build.gradle +++ b/servlet/java-configuration/authentication/x509/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" } @@ -14,8 +14,8 @@ 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.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/authentication/x509/gradle/gretty.gradle b/servlet/java-configuration/authentication/x509/gradle/gretty.gradle index 6949bdf..3428615 100644 --- a/servlet/java-configuration/authentication/x509/gradle/gretty.gradle +++ b/servlet/java-configuration/authentication/x509/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/authentication/x509/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/x509/src/main/java/example/MvcWebApplicationInitializer.java index a45eec0..5679405 100644 --- a/servlet/java-configuration/authentication/x509/src/main/java/example/MvcWebApplicationInitializer.java +++ b/servlet/java-configuration/authentication/x509/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/data/build.gradle b/servlet/java-configuration/data/build.gradle index 3b886d3..4efad22 100644 --- a/servlet/java-configuration/data/build.gradle +++ b/servlet/java-configuration/data/build.gradle @@ -10,8 +10,8 @@ repositories { } dependencies { - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/hello-mvc-security/build.gradle b/servlet/java-configuration/hello-mvc-security/build.gradle index a6fc815..1346ca1 100644 --- a/servlet/java-configuration/hello-mvc-security/build.gradle +++ b/servlet/java-configuration/hello-mvc-security/build.gradle @@ -14,14 +14,14 @@ repositories { } dependencies { - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") 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-spring6:3.1.0.M1" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.RELEASE" testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/java-configuration/hello-security-explicit/build.gradle b/servlet/java-configuration/hello-security-explicit/build.gradle index c24ba43..9384bee 100644 --- a/servlet/java-configuration/hello-security-explicit/build.gradle +++ b/servlet/java-configuration/hello-security-explicit/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/hello-security/build.gradle b/servlet/java-configuration/hello-security/build.gradle index c24ba43..9384bee 100644 --- a/servlet/java-configuration/hello-security/build.gradle +++ b/servlet/java-configuration/hello-security/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/java-configuration/max-sessions/build.gradle b/servlet/java-configuration/max-sessions/build.gradle index 5703fab..56cd874 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.0" 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.4") 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.0.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; diff --git a/servlet/java-configuration/saml2/login/build.gradle b/servlet/java-configuration/saml2/login/build.gradle index d49031b..634538c 100644 --- a/servlet/java-configuration/saml2/login/build.gradle +++ b/servlet/java-configuration/saml2/login/build.gradle @@ -36,15 +36,15 @@ dependencies { implementation "org.opensaml:opensaml-saml-api:4.1.1" implementation "org.opensaml:opensaml-saml-impl:4.1.1" } - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") 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.springframework.security:spring-security-saml2-service-provider" - implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.RELEASE" implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1" providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0" diff --git a/servlet/xml/java/contacts/build.gradle b/servlet/xml/java/contacts/build.gradle index 25d317c..fa25f00 100644 --- a/servlet/xml/java/contacts/build.gradle +++ b/servlet/xml/java/contacts/build.gradle @@ -14,8 +14,8 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") + implementation platform("org.springframework:spring-framework-bom:6.0.7") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/xml/java/dms/build.gradle b/servlet/xml/java/dms/build.gradle index 0cab842..1de7b49 100644 --- a/servlet/xml/java/dms/build.gradle +++ b/servlet/xml/java/dms/build.gradle @@ -10,8 +10,8 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") - implementation platform("org.springframework:spring-framework-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") + implementation platform("org.springframework:spring-framework-bom:6.0.7") implementation platform("org.junit:junit-bom:5.7.0") implementation 'org.springframework:spring-beans' diff --git a/servlet/xml/java/helloworld/build.gradle b/servlet/xml/java/helloworld/build.gradle index 7dab4ec..8e7f0d0 100644 --- a/servlet/xml/java/helloworld/build.gradle +++ b/servlet/xml/java/helloworld/build.gradle @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:6.0.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" diff --git a/servlet/xml/java/preauth/build.gradle b/servlet/xml/java/preauth/build.gradle index 67c6123..1623e3d 100644 --- a/servlet/xml/java/preauth/build.gradle +++ b/servlet/xml/java/preauth/build.gradle @@ -10,7 +10,7 @@ repositories { } dependencies { - implementation platform("org.springframework.security:spring-security-bom:5.6.0-SNAPSHOT") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") implementation platform("org.junit:junit-bom:5.7.0") implementation "org.springframework.security:spring-security-config" @@ -18,7 +18,8 @@ dependencies { implementation 'org.slf4j:slf4j-api:1.7.30' implementation 'org.slf4j:slf4j-simple:1.7.30' - providedCompile 'javax.servlet:javax.servlet-api:4.0.0' + providedCompile "jakarta.servlet:jakarta.servlet-api:6.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" diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle index 3d90f9e..a36b910 100644 --- a/servlet/xml/java/saml2/login-logout/build.gradle +++ b/servlet/xml/java/saml2/login-logout/build.gradle @@ -21,15 +21,15 @@ dependencies { implementation "org.opensaml:opensaml-saml-api:4.1.1" implementation "org.opensaml:opensaml-saml-impl:4.1.1" } - 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.springframework:spring-framework-bom:6.0.7") + implementation platform("org.springframework.security:spring-security-bom:6.0.4") 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.security:spring-security-saml2-service-provider" implementation "org.springframework:spring-webmvc" - implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.RELEASE" implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1' providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"