Spring/spring-session-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch from Javax Servlet API dependencies to Jakarta Servlet API dependencies.

Browse Source
This commit is contained in:
John Blum
2022-03-23 15:11:27 -07:00
parent a6d37715b7
commit b79b7a4c38
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/spring-session-docs.gradle
View File

@@ -8,7 +8,7 @@ repositories {
dependencies {
testCompile project(':spring-session-data-geode')
testCompile "javax.servlet:javax.servlet-api"
testCompile "jakarta.servlet:jakarta.servlet-api"
testCompile "junit:junit"
testCompile "org.assertj:assertj-core"
testCompile "org.mockito:mockito-core"

4
gradle/dependency-management.gradle
View File

@@ -23,8 +23,8 @@ dependencyManagement {
// mavenBom "org.springframework.session:spring-session-bom:${springSessionBomVersion}"
}
dependencies {
dependency "javax.servlet:javax.servlet-api:$javaxServletApiVersion"
dependency "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
dependency "jakarta.servlet:jakarta.servlet-api:$javaxServletApiVersion"
dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:$javaxServletJspJstlApiVersion"
dependency "antlr:antlr:$antlrVersion"
dependency "ch.qos.logback:logback-classic:$logbackVersion"
dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion"

5
samples/javaconfig/gemfire-clientserver/spring-session-sample-javaconfig-gemfire-clientserver.gradle
View File

@@ -25,10 +25,11 @@ dependencies {
compile "org.springframework.data:spring-data-geode-test"
compile "org.webjars:bootstrap"
compile "org.webjars:webjars-taglib"
compile jstlDependencies
compile slf4jDependencies
providedCompile "javax.servlet:javax.servlet-api"
providedCompile "jakarta.servlet:jakarta.servlet-api"
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
runtime "org.springframework.shell:spring-shell"

5
samples/javaconfig/gemfire-p2p/spring-session-sample-javaconfig-gemfire-p2p.gradle
View File

@@ -22,10 +22,11 @@ dependencies {
compile "org.springframework:spring-web"
compile "org.webjars:bootstrap"
compile "org.webjars:webjars-taglib"
compile jstlDependencies
compile slf4jDependencies
providedCompile "javax.servlet:javax.servlet-api"
providedCompile "jakarta.servlet:jakarta.servlet-api"
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
runtime "org.springframework.shell:spring-shell"

5
samples/xml/gemfire-clientserver/spring-session-sample-xml-gemfire-clientserver.gradle
View File

@@ -9,10 +9,11 @@ dependencies {
compile "org.springframework.data:spring-data-geode-test"
compile "org.webjars:bootstrap"
compile "org.webjars:webjars-taglib"
compile jstlDependencies
compile slf4jDependencies
providedCompile "javax.servlet:javax.servlet-api"
providedCompile "jakarta.servlet:jakarta.servlet-api"
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
runtime "org.springframework.shell:spring-shell"

5
samples/xml/gemfire-p2p/spring-session-sample-xml-gemfire-p2p.gradle
View File

@@ -6,10 +6,11 @@ dependencies {
compile "org.springframework:spring-web"
compile "org.webjars:bootstrap"
compile "org.webjars:webjars-taglib"
compile jstlDependencies
compile slf4jDependencies
providedCompile "javax.servlet:javax.servlet-api"
providedCompile "jakarta.servlet:jakarta.servlet-api"
providedCompile "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
providedCompile "org.apache.taglibs:taglibs-standard-jstlel"
runtime "org.springframework.shell:spring-shell"

2
spring-session-data-geode/spring-session-data-geode.gradle
View File

@@ -20,7 +20,7 @@ dependencies {
optional "org.springframework.security:spring-security-core"
optional "org.springframework.security:spring-security-web"
provided "javax.servlet:javax.servlet-api"
provided "jakarta.servlet:jakarta.servlet-api"
// TODO: Remove dependency declarations when all internal Apache Geode API usage is removed; Only required by tests!
provided "org.apache.geode:geode-logging:$apacheGeodeVersion"