diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle index 8f4f24c..24eade3 100644 --- a/servlet/xml/java/saml2/login-logout/build.gradle +++ b/servlet/xml/java/saml2/login-logout/build.gradle @@ -7,6 +7,7 @@ plugins { apply from: "gradle/gretty.gradle" repositories { + jcenter() mavenCentral() maven { url "https://repo.spring.io/snapshot" } maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" } @@ -18,16 +19,16 @@ 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:5.3.13") - implementation platform("org.springframework.security:spring-security-bom:5.7.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 "org.springframework.security:spring-security-saml2-service-provider" implementation "org.springframework:spring-webmvc" - implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" - implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.0.4.RELEASE' + implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1' testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/xml/java/saml2/login-logout/src/main/java/example/WebConfiguration.java b/servlet/xml/java/saml2/login-logout/src/main/java/example/WebConfiguration.java index c21d1e1..07daabe 100644 --- a/servlet/xml/java/saml2/login-logout/src/main/java/example/WebConfiguration.java +++ b/servlet/xml/java/saml2/login-logout/src/main/java/example/WebConfiguration.java @@ -18,10 +18,10 @@ package example; import java.util.List; -import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect; -import org.thymeleaf.spring5.SpringTemplateEngine; -import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; import org.thymeleaf.templatemode.TemplateMode; import org.springframework.beans.BeansException;