update gradlke to reference new combined dap4 module in ncj

dopplershift · Jun 7, 2023 · e5e9116 · e5e9116
1 parent e0bb358
commit e5e9116
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/dap4/d4servlet/build.gradle b/dap4/d4servlet/build.gradle
@@ -4,8 +4,7 @@ apply from: "$rootDir/gradle/any/java-published.gradle"
 dependencies {
     implementation enforcedPlatform(project(':tds-platform'))
 
-    compile 'edu.ucar:d4core'
-    compile 'edu.ucar:d4lib'
+    compile 'edu.ucar:dap4'
     compile 'edu.ucar:httpservices'
 
     compileOnly 'javax.servlet:javax.servlet-api'

diff --git a/dap4/d4tests/build.gradle b/dap4/d4tests/build.gradle
@@ -6,15 +6,13 @@ dependencies {
   compile enforcedPlatform(project(':tds-testing-platform'))
 
   // A lot of these dependencies should be in the testRuntime config, not testCompile.
-  testCompile 'edu.ucar:d4core'
-  testCompile 'edu.ucar:d4lib'
+  testCompile 'edu.ucar:dap4'
   testCompile project(':dap4:dap4-servlet')
 
   testCompile(project(':dap4:d4ts')) {
     exclude group: 'org.apache.logging.log4j'
   }
 
-  testCompile 'edu.ucar:d4cdm'
   testCompile 'edu.ucar:cdm-core'
   testCompile 'edu.ucar:httpservices'
 

diff --git a/dap4/d4ts/build.gradle b/dap4/d4ts/build.gradle
@@ -5,8 +5,7 @@ apply from: "$rootDir/gradle/any/gretty.gradle"
 dependencies {
     compile enforcedPlatform(project(':tds-platform'))
 
-    compile 'edu.ucar:d4core'
-    compile 'edu.ucar:d4lib'
+    compile 'edu.ucar:dap4'
     compile project(":dap4:dap4-servlet")
     providedCompile "javax.servlet:javax.servlet-api:${depVersion.javaxServletApi}"
 

diff --git a/tds-platform/build.gradle b/tds-platform/build.gradle
@@ -73,9 +73,7 @@ dependencies {
     runtime 'org.apache.taglibs:taglibs-standard-impl:1.2.5'
 
     // dap4
-    api 'edu.ucar:d4core'
-    api 'edu.ucar:d4lib'
-    api 'edu.ucar:d4cdm'
+    api 'edu.ucar:dap4'
     // defined in tds-testing-platform as well, but using api config
     runtime 'org.apache.logging.log4j:log4j-web'
 

diff --git a/tds/build.gradle b/tds/build.gradle
@@ -30,9 +30,7 @@ dependencies {
   implementation project(':tds-ugrid')
 
   // DAP4 Dependencies (technically forward)
-  compile 'edu.ucar:d4cdm'
-  compile 'edu.ucar:d4core'
-  compile 'edu.ucar:d4lib'
+  compile 'edu.ucar:dap4'
 
   compile project(':dap4:dap4-servlet')