Use Servlet API 6.0

Closes gh-100
spring-projects · Feb 23, 2023 · fe16e9b · fe16e9b
1 parent 09dbcb8
commit fe16e9b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"