Skip to content

Commit ab3e1a8

Browse files
committed
Switch from Javax Servlet API dependencies to Jakarta Servlet API dependencies.
1 parent 276ef5e commit ab3e1a8

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

docs/spring-session-docs.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repositories {
88
dependencies {
99

1010
testCompile project(':spring-session-data-geode')
11-
testCompile "javax.servlet:javax.servlet-api"
11+
testCompile "jakarta.servlet:jakarta.servlet-api"
1212
testCompile "junit:junit"
1313
testCompile "org.assertj:assertj-core"
1414
testCompile "org.mockito:mockito-core"

gradle/dependency-management.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ dependencyManagement {
2323
// mavenBom "org.springframework.session:spring-session-bom:${springSessionBomVersion}"
2424
}
2525
dependencies {
26-
dependency "javax.servlet:javax.servlet-api:$javaxServletApiVersion"
27-
dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
26+
dependency "jakarta.servlet:jakarta.servlet-api:$javaxServletApiVersion"
27+
dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
2828
dependency "antlr:antlr:$antlrVersion"
2929
dependency "ch.qos.logback:logback-classic:$logbackVersion"
3030
dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"

samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ dependencies {
99
compile "org.springframework.data:spring-data-geode-test"
1010
compile "org.webjars:bootstrap"
1111
compile "org.webjars:webjars-taglib"
12-
compile jstlDependencies
1312
compile slf4jDependencies
1413

15-
providedCompile "javax.servlet:javax.servlet-api"
14+
providedCompile "jakarta.servlet:jakarta.servlet-api"
15+
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
16+
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
1617

1718
runtime "org.springframework.shell:spring-shell"
1819

samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ dependencies {
66
compile "org.springframework:spring-web"
77
compile "org.webjars:bootstrap"
88
compile "org.webjars:webjars-taglib"
9-
compile jstlDependencies
109
compile slf4jDependencies
1110

12-
providedCompile "javax.servlet:javax.servlet-api"
11+
providedCompile "jakarta.servlet:jakarta.servlet-api"
12+
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
13+
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
1314

1415
runtime "org.springframework.shell:spring-shell"
1516

samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ dependencies {
99
compile "org.springframework.data:spring-data-geode-test"
1010
compile "org.webjars:bootstrap"
1111
compile "org.webjars:webjars-taglib"
12-
compile jstlDependencies
1312
compile slf4jDependencies
1413

15-
providedCompile "javax.servlet:javax.servlet-api"
14+
providedCompile "jakarta.servlet:jakarta.servlet-api"
15+
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
16+
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
1617

1718
runtime "org.springframework.shell:spring-shell"
1819

samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ dependencies {
66
compile "org.springframework:spring-web"
77
compile "org.webjars:bootstrap"
88
compile "org.webjars:webjars-taglib"
9-
compile jstlDependencies
109
compile slf4jDependencies
1110

12-
providedCompile "javax.servlet:javax.servlet-api"
11+
providedCompile "jakarta.servlet:jakarta.servlet-api"
12+
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
13+
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
1314

1415
runtime "org.springframework.shell:spring-shell"
1516

spring-session-data-geode/spring-session-data-geode.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
optional "org.springframework.security:spring-security-core"
2121
optional "org.springframework.security:spring-security-web"
2222

23-
provided "javax.servlet:javax.servlet-api"
23+
provided "jakarta.servlet:jakarta.servlet-api"
2424

2525
// TODO: Remove dependency declarations when all internal Apache Geode API usage is removed; Only required by test,
2626
// and specifically, the GemFireUtilsTests! :P

0 commit comments

Comments
 (0)