From fe16e9b951faa8152ed69673970cb732b568f85c Mon Sep 17 00:00:00 2001 From: Marcus Da Coregio Date: Mon, 7 Nov 2022 08:47:05 -0300 Subject: [PATCH] Use Servlet API 6.0 Closes gh-100 --- .../java-configuration/hello-security-explicit/build.gradle | 2 +- servlet/java-configuration/hello-security/build.gradle | 2 +- servlet/java-configuration/saml2/login/build.gradle | 4 ++-- servlet/xml/java/contacts/build.gradle | 2 +- servlet/xml/java/dms/build.gradle | 2 +- servlet/xml/java/helloworld/build.gradle | 2 +- servlet/xml/java/saml2/login-logout/build.gradle | 2 ++ 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/servlet/java-configuration/hello-security-explicit/build.gradle b/servlet/java-configuration/hello-security-explicit/build.gradle index e68ea40..c24ba43 100644 --- a/servlet/java-configuration/hello-security-explicit/build.gradle +++ b/servlet/java-configuration/hello-security-explicit/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-web" - providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0" + 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" diff --git a/servlet/java-configuration/hello-security/build.gradle b/servlet/java-configuration/hello-security/build.gradle index e68ea40..c24ba43 100644 --- a/servlet/java-configuration/hello-security/build.gradle +++ b/servlet/java-configuration/hello-security/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation "org.springframework.security:spring-security-config" implementation "org.springframework.security:spring-security-web" - providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0" + 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" diff --git a/servlet/java-configuration/saml2/login/build.gradle b/servlet/java-configuration/saml2/login/build.gradle index 48a00ec..d49031b 100644 --- a/servlet/java-configuration/saml2/login/build.gradle +++ b/servlet/java-configuration/saml2/login/build.gradle @@ -17,7 +17,7 @@ plugins { id "java" id "nebula.integtest" version "8.2.0" - id "org.gretty" version "4.0.0" + id "org.gretty" version "4.0.3" id "war" } @@ -47,7 +47,7 @@ dependencies { implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1" - providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0" + 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" diff --git a/servlet/xml/java/contacts/build.gradle b/servlet/xml/java/contacts/build.gradle index 8c419d8..25d317c 100644 --- a/servlet/xml/java/contacts/build.gradle +++ b/servlet/xml/java/contacts/build.gradle @@ -32,7 +32,7 @@ dependencies { 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 "jakarta.servlet:jakarta.servlet-api:6.0.0" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0" runtimeOnly 'net.sf.ehcache:ehcache:2.10.5' diff --git a/servlet/xml/java/dms/build.gradle b/servlet/xml/java/dms/build.gradle index 1769d12..0cab842 100644 --- a/servlet/xml/java/dms/build.gradle +++ b/servlet/xml/java/dms/build.gradle @@ -23,7 +23,7 @@ dependencies { 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 "jakarta.servlet:jakarta.servlet-api:6.0.0" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0" runtimeOnly 'net.sf.ehcache:ehcache:2.10.5' diff --git a/servlet/xml/java/helloworld/build.gradle b/servlet/xml/java/helloworld/build.gradle index 02ef07c..7dab4ec 100644 --- a/servlet/xml/java/helloworld/build.gradle +++ b/servlet/xml/java/helloworld/build.gradle @@ -22,7 +22,7 @@ dependencies { 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 "jakarta.servlet:jakarta.servlet-api:6.0.0" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0" testImplementation "org.springframework:spring-test" diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle index af683e9..3d90f9e 100644 --- a/servlet/xml/java/saml2/login-logout/build.gradle +++ b/servlet/xml/java/saml2/login-logout/build.gradle @@ -32,6 +32,8 @@ dependencies { implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1" implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1' + providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0" + testImplementation "org.assertj:assertj-core:3.18.0" testImplementation "org.springframework:spring-test" testImplementation "org.springframework.security:spring-security-test"