From a0246a61b68dc49d23403eeaa5d843e02fb10cde Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 14 Jan 2022 16:21:35 +0100 Subject: [PATCH] Update to jakarta.servlet-api dependency Closes gh-1960 --- .../resources/samples/integrationtest/withpropdeps/build.gradle | 2 +- .../samples/showcase/samples/sgbcs-sample-war/build.gradle | 2 +- gradle/dependency-management.gradle | 2 +- spring-session-core/spring-session-core.gradle | 2 +- spring-session-data-mongodb/spring-session-data-mongodb.gradle | 2 +- spring-session-data-redis/spring-session-data-redis.gradle | 2 +- spring-session-docs/spring-session-docs.gradle | 2 +- spring-session-hazelcast/hazelcast4/hazelcast4.gradle | 2 +- spring-session-hazelcast/spring-session-hazelcast.gradle | 2 +- spring-session-jdbc/spring-session-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-custom-cookie.gradle | 2 +- .../spring-session-sample-javaconfig-hazelcast.gradle | 2 +- .../spring-session-sample-javaconfig-jdbc.gradle | 2 +- .../spring-session-sample-javaconfig-redis.gradle | 2 +- .../spring-session-sample-javaconfig-rest.gradle | 2 +- .../spring-session-sample-javaconfig-security.gradle | 2 +- .../spring-session-sample-misc-hazelcast.gradle | 2 +- .../spring-session-sample-xml-jdbc.gradle | 2 +- .../spring-session-sample-xml-redis.gradle | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle b/buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle index cc4b661e..0bdffa27 100644 --- 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 index 750a5735..b68d8b30 100644 --- 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 index a9c8f6b8..45f0cb50 100644 --- 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 index 25c4c36b..1adc0e80 100644 --- 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 index 8d24631e..a1f00178 100644 --- 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 index e00c7ab4..6b701b8d 100644 --- 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 index b0fb52d7..1c47661b 100644 --- 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 index e4e8d9bd..d4ce5b7d 100644 --- 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 index 951eaf43..b7cd931f 100644 --- 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 index 21867b21..3d255b67 100644 --- 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 index 31feb7d0..dc3401cf 100644 --- 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 index 6b1837a2..f2a85d1e 100644 --- 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 index 3d3f5ad9..a7ef307c 100644 --- 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 index 6f12909c..459bc911 100644 --- 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 index d827edc4..520b9a00 100644 --- 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 index 13b3e261..a7a57c22 100644 --- 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 index 27910b9c..b280a1fb 100644 --- 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 index 4f516f74..0f3d3514 100644 --- 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 index 6f12909c..459bc911 100644 --- 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"