Rename variable from javax to jakarta

dopplershift · Aug 19, 2024 · f2400c7 · f2400c7
1 parent 41717f1
commit f2400c7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dap4/d4ts/build.gradle b/dap4/d4ts/build.gradle
@@ -8,7 +8,7 @@ dependencies {
   implementation 'edu.ucar:dap4'
   implementation project(":dap4:d4servlet")
 
-  providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
+  providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.jakartaServletApi}"
 
   compileOnly 'org.slf4j:slf4j-api'
 

diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle
@@ -25,8 +25,8 @@ ext {
   depVersion.jaxen = '1.1.6'
   depVersion.netcdfJava = '5.6.1-SNAPSHOT'
   // gradle seems to have issues with the compileOnly configuration, so we need to provide the full maven
-  // coordinates for javax.servlet-api if the gradle plugin in applied. If we don't, we see errors like this:
-  depVersion.javaxServletApi = '4.0.3'
+  // coordinates for jakarta.servlet-api if the gradle plugin in applied. If we don't, we see errors like this:
+  depVersion.jakartaServletApi = '4.0.3'
   depVersion.hibernateValidator = '6.2.5.Final'
   // TODO: figure out way to keep this version in sync with netcdf-java version
   // It is included in the netcdf-java-bom (via netcdf-java-platform), but we can't

diff --git a/opendap/dtswar/build.gradle b/opendap/dtswar/build.gradle
@@ -14,7 +14,7 @@ dependencies {
   implementation 'org.jdom:jdom2'
   implementation 'org.slf4j:slf4j-api'
 
-  providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
+  providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.jakartaServletApi}"
 
   runtimeOnly 'org.apache.taglibs:taglibs-standard-spec'
   runtimeOnly 'org.apache.taglibs:taglibs-standard-impl'

diff --git a/tds/build.gradle b/tds/build.gradle
@@ -38,7 +38,7 @@ dependencies {
   implementation project(':dap4:d4servlet')
 
   // Server stuff
-  providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
+  providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.jakartaServletApi}"
   runtimeOnly 'org.apache.taglibs:taglibs-standard-spec'
   runtimeOnly 'org.apache.taglibs:taglibs-standard-impl'
 
@@ -94,7 +94,7 @@ dependencies {
   implementation 'org.thymeleaf:thymeleaf-spring5'
 
   // Testing
-  testImplementation "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
+  testImplementation "jakarta.servlet:jakarta.servlet-api:${depVersion.jakartaServletApi}"
   testImplementation 'org.springframework:spring-test'
   testImplementation 'org.hamcrest:hamcrest-core'
   testImplementation 'commons-io:commons-io'