Skip to content

Commit 9f8f7ff

Browse files
Use Servlet API 6.0
Closes gh-100
1 parent 4b076d7 commit 9f8f7ff

File tree

7 files changed

+9
-7
lines changed

7 files changed

+9
-7
lines changed

servlet/java-configuration/hello-security-explicit/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation "org.springframework.security:spring-security-config"
2222
implementation "org.springframework.security:spring-security-web"
2323

24-
providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
24+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
2525
providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
2626

2727
testImplementation "org.assertj:assertj-core:3.18.0"

servlet/java-configuration/hello-security/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation "org.springframework.security:spring-security-config"
2222
implementation "org.springframework.security:spring-security-web"
2323

24-
providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
24+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
2525
providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
2626

2727
testImplementation "org.assertj:assertj-core:3.18.0"

servlet/java-configuration/saml2/login/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
plugins {
1818
id "java"
1919
id "nebula.integtest" version "8.2.0"
20-
id "org.gretty" version "4.0.0"
20+
id "org.gretty" version "4.0.3"
2121
id "war"
2222
}
2323

@@ -47,7 +47,7 @@ dependencies {
4747
implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1"
4848
implementation "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1"
4949

50-
providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
50+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
5151
providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
5252

5353
testImplementation "org.assertj:assertj-core:3.18.0"

servlet/xml/java/contacts/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
implementation 'org.slf4j:slf4j-api:1.7.30'
3333
implementation 'org.slf4j:slf4j-simple:1.7.30'
3434

35-
providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
35+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
3636
providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
3737

3838
runtimeOnly 'net.sf.ehcache:ehcache:2.10.5'

servlet/xml/java/dms/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation 'org.slf4j:slf4j-api:1.7.30'
2424
implementation 'org.slf4j:slf4j-simple:1.7.30'
2525

26-
providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
26+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
2727
providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
2828

2929
runtimeOnly 'net.sf.ehcache:ehcache:2.10.5'

servlet/xml/java/helloworld/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
implementation 'org.slf4j:slf4j-api:1.7.30'
2323
implementation 'org.slf4j:slf4j-simple:1.7.30'
2424

25-
providedCompile "jakarta.servlet:jakarta.servlet-api:5.0.0"
25+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
2626
providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0"
2727

2828
testImplementation "org.springframework:spring-test"

servlet/xml/java/saml2/login-logout/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ dependencies {
3232
implementation "org.thymeleaf:thymeleaf-spring6:3.1.0.M1"
3333
implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.0.M1'
3434

35+
providedCompile "jakarta.servlet:jakarta.servlet-api:6.0.0"
36+
3537
testImplementation "org.assertj:assertj-core:3.18.0"
3638
testImplementation "org.springframework:spring-test"
3739
testImplementation "org.springframework.security:spring-security-test"

0 commit comments

Comments
 (0)