Replace Javax Servlet depedendencies with Jakarta Servlet.

Replace Javax Servlet JSP JSTL dependencies with Jakarta Servlet JSP JSTL dependencies and Apache Standard Taglibs.
This commit is contained in:
John Blum
2022-01-11 18:57:14 -08:00
parent cafc9a7ee0
commit 230cb21623
6 changed files with 14 additions and 10 deletions

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"

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"

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"

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"

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"

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 test,
// and specifically, the GemFireUtilsTests! :P