Update to jakarta.servlet-api dependency

eleftherias · eleftherias · commit a0246a61b68d · 2022-01-25T13:26:47.000+01:00
Closes gh-1960
diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-	optional 'javax.servlet:javax.servlet-api:3.1.0'
+	optional 'jakarta.servlet:jakarta.servlet-api:4.0.4'
 	testImplementation platform('org.junit:junit-bom:5.8.1')
 	testImplementation 'org.junit.jupiter:junit-jupiter-api'
 	testImplementation 'org.junit.jupiter:junit-jupiter-engine'
diff --git a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-	provided 'javax.servlet:javax.servlet-api'
+	provided 'jakarta.servlet:jakarta.servlet-api:4.0.4'
     testImplementation 'commons-io:commons-io:2.11.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation platform('org.junit:junit-bom:5.8.1')
diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle
@@ -26,7 +26,7 @@ dependencyManagement {
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
 		dependency 'io.lettuce:lettuce-core:6.1.5.RELEASE'
 		dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
-		dependency 'javax.servlet:javax.servlet-api:4.0.1'
+		dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
 		dependency 'mysql:mysql-connector-java:8.0.27'
 		dependency 'org.apache.derby:derby:10.14.2.0'
 		dependency 'org.assertj:assertj-core:3.21.0'
diff --git a/spring-session-core/spring-session-core.gradle b/spring-session-core/spring-session-core.gradle
@@ -7,7 +7,7 @@ dependencies {
 
 	optional "io.projectreactor:reactor-core"
 	optional "jakarta.annotation:jakarta.annotation-api"
-	optional "javax.servlet:javax.servlet-api"
+	optional "jakarta.servlet:jakarta.servlet-api"
 	optional "org.springframework:spring-context"
 	optional "org.springframework:spring-jdbc"
 	optional "org.springframework:spring-messaging"
diff --git a/spring-session-data-mongodb/spring-session-data-mongodb.gradle b/spring-session-data-mongodb/spring-session-data-mongodb.gradle
@@ -41,5 +41,5 @@ dependencies {
     testImplementation "org.mockito:mockito-core"
     testImplementation "org.mockito:mockito-junit-jupiter"
     testImplementation "io.projectreactor:reactor-test"
-    testImplementation "javax.servlet:javax.servlet-api"
+    testImplementation "jakarta.servlet:jakarta.servlet-api"
 }
diff --git a/spring-session-data-redis/spring-session-data-redis.gradle b/spring-session-data-redis/spring-session-data-redis.gradle
@@ -15,7 +15,7 @@ dependencies {
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "org.springframework:spring-test"
 	testImplementation "io.projectreactor:reactor-test"
-	testImplementation "javax.servlet:javax.servlet-api"
+	testImplementation "jakarta.servlet:jakarta.servlet-api"
 	testImplementation "org.springframework:spring-web"
 	testImplementation "org.springframework.security:spring-security-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-docs/spring-session-docs.gradle b/spring-session-docs/spring-session-docs.gradle
@@ -22,7 +22,7 @@ dependencies {
 	testImplementation 'org.assertj:assertj-core'
 	testImplementation 'com.hazelcast:hazelcast'
 	testImplementation 'io.lettuce:lettuce-core'
-	testImplementation 'javax.servlet:javax.servlet-api'
+	testImplementation 'jakarta.servlet:jakarta.servlet-api'
 	testImplementation 'org.junit.jupiter:junit-jupiter-api'
 	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 }
diff --git a/spring-session-hazelcast/hazelcast4/hazelcast4.gradle b/spring-session-hazelcast/hazelcast4/hazelcast4.gradle
@@ -25,7 +25,7 @@ dependencies {
     api "org.springframework:spring-context"
     api "jakarta.annotation:jakarta.annotation-api"
 
-    testImplementation "javax.servlet:javax.servlet-api"
+    testImplementation "jakarta.servlet:jakarta.servlet-api"
     testImplementation "org.assertj:assertj-core"
     testImplementation "org.mockito:mockito-core"
     testImplementation "org.springframework:spring-test"
diff --git a/spring-session-hazelcast/spring-session-hazelcast.gradle b/spring-session-hazelcast/spring-session-hazelcast.gradle
@@ -13,7 +13,7 @@ dependencies {
 	hazelcast4(project(path: ":hazelcast4", configuration: 'classesOnlyElements'))
 	compileOnly(project(":hazelcast4"))
 
-	testImplementation "javax.servlet:javax.servlet-api"
+	testImplementation "jakarta.servlet:jakarta.servlet-api"
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "org.springframework:spring-test"
diff --git a/spring-session-jdbc/spring-session-jdbc.gradle b/spring-session-jdbc/spring-session-jdbc.gradle
@@ -7,7 +7,7 @@ dependencies {
 	api "org.springframework:spring-context"
 	api "org.springframework:spring-jdbc"
 
-	testImplementation "javax.servlet:javax.servlet-api"
+	testImplementation "jakarta.servlet:jakarta.servlet-api"
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "org.springframework:spring-test"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
@@ -17,7 +17,7 @@ dependencies {
 	implementation  "ch.qos.logback:logback-classic"
 	implementation  "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -19,7 +19,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
 
 	testImplementation "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
@@ -16,7 +16,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
@@ -17,7 +17,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
@@ -18,7 +18,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
@@ -19,7 +19,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 	providedCompile "javax.servlet.jsp:javax.servlet.jsp-api"
 
 	testImplementation "org.assertj:assertj-core"
diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
@@ -15,7 +15,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
@@ -16,7 +16,7 @@ dependencies {
 	implementation "org.slf4j:log4j-over-slf4j"
 	implementation "ch.qos.logback:logback-classic"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
@@ -17,7 +17,7 @@ dependencies {
 	implementation "ch.qos.logback:logback-classic"
 	implementation "org.testcontainers:testcontainers"
 
-	providedCompile "javax.servlet:javax.servlet-api"
+	providedCompile "jakarta.servlet:jakarta.servlet-api"
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- optional 'javax.servlet:javax.servlet-api:3.1.0'`
	`12`	`+ optional 'jakarta.servlet:jakarta.servlet-api:4.0.4'`
`13`	`13`	`testImplementation platform('org.junit:junit-bom:5.8.1')`
`14`	`14`	`testImplementation 'org.junit.jupiter:junit-jupiter-api'`
`15`	`15`	`testImplementation 'org.junit.jupiter:junit-jupiter-engine'`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
`7`		`- provided 'javax.servlet:javax.servlet-api'`
	`7`	`+ provided 'jakarta.servlet:jakarta.servlet-api:4.0.4'`
`8`	`8`	`testImplementation 'commons-io:commons-io:2.11.0'`
`9`	`9`	`testImplementation 'org.assertj:assertj-core:3.21.0'`
`10`	`10`	`testImplementation platform('org.junit:junit-bom:5.8.1')`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ dependencies {`
`41`	`41`	`testImplementation "org.mockito:mockito-core"`
`42`	`42`	`testImplementation "org.mockito:mockito-junit-jupiter"`
`43`	`43`	`testImplementation "io.projectreactor:reactor-test"`
`44`		`- testImplementation "javax.servlet:javax.servlet-api"`
	`44`	`+ testImplementation "jakarta.servlet:jakarta.servlet-api"`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ dependencies {`
`22`	`22`	`testImplementation 'org.assertj:assertj-core'`
`23`	`23`	`testImplementation 'com.hazelcast:hazelcast'`
`24`	`24`	`testImplementation 'io.lettuce:lettuce-core'`
`25`		`- testImplementation 'javax.servlet:javax.servlet-api'`
	`25`	`+ testImplementation 'jakarta.servlet:jakarta.servlet-api'`
`26`	`26`	`testImplementation 'org.junit.jupiter:junit-jupiter-api'`
`27`	`27`	`testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'`
`28`	`28`	`}`