Use log4j jarkarta web

dopplershift · Aug 19, 2024 · a4b3209 · a4b3209
1 parent bf14c1a
commit a4b3209
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/dap4/d4ts/build.gradle b/dap4/d4ts/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   compileOnly 'org.slf4j:slf4j-api'
 
   runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
-  runtimeOnly 'org.apache.logging.log4j:log4j-web'
+  runtimeOnly 'org.apache.logging.log4j:log4j-jakarta-web'
 
   compileOnly 'org.slf4j:slf4j-api'
 }

diff --git a/opendap/dtswar/build.gradle b/opendap/dtswar/build.gradle
@@ -21,5 +21,5 @@ dependencies {
 
 
   runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
-  runtimeOnly 'org.apache.logging.log4j:log4j-web'
+  runtimeOnly 'org.apache.logging.log4j:log4j-jakarta-web'
 }
diff --git a/tds-platform/build.gradle b/tds-platform/build.gradle
@@ -18,6 +18,8 @@ dependencies {
   api enforcedPlatform('org.springframework.security:spring-security-bom:6.3.1')
   api platform('net.openhft:chronicle-bom:2.25ea62')
   api enforcedPlatform("org.apache.logging.log4j:log4j-bom:2.17.1")
+  // remove log4j-jakarta-web and use log4j-jakarta-bom when that is released
+  api enforcedPlatform("org.apache.logging.log4j:log4j-jakarta-web:2.23.1")
   api enforcedPlatform("jakarta.platform:jakarta.jakartaee-bom:9.0.0")
 
 
@@ -79,7 +81,7 @@ dependencies {
     runtime 'edu.ucar:dap4'
 
     // defined in tds-testing-platform as well, but using api config
-    runtime 'org.apache.logging.log4j:log4j-web'
+    runtime 'org.apache.logging.log4j:log4j-jakarta-web'
 
     // tds
     api 'org.json:json:20231013'

diff --git a/tds-testing-platform/build.gradle b/tds-testing-platform/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 
     // dap4
     // defined in tds-platform as well, but using runtime config
-    api 'org.apache.logging.log4j:log4j-web' // api because of :dap4:d4tests)
+    api 'org.apache.logging.log4j:log4j-jakarta-web' // api because of :dap4:d4tests)
 
     // tds
     api "jaxen:jaxen:${depVersion.jaxen}"  // api because of XPath operations in mock tests

diff --git a/tds/build.gradle b/tds/build.gradle
@@ -109,7 +109,7 @@ dependencies {
   // Logging
   implementation 'org.slf4j:slf4j-api'
   runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
-  runtimeOnly 'org.apache.logging.log4j:log4j-web'
+  runtimeOnly 'org.apache.logging.log4j:log4j-jakarta-web'
   testRuntimeOnly 'ch.qos.logback:logback-classic'
 
   // This is for freshInstallTest