diff --git a/cdm-test-utils/build.gradle b/cdm-test-utils/build.gradle index 01deef5025..93d0af646b 100644 --- a/cdm-test-utils/build.gradle +++ b/cdm-test-utils/build.gradle @@ -15,6 +15,7 @@ dependencies { implementation 'junit:junit' implementation 'org.slf4j:slf4j-api' implementation 'com.google.re2j:re2j' + implementation 'org.jdom:jdom2' implementation 'org.testcontainers:testcontainers' testRuntimeOnly 'ch.qos.logback:logback-classic' diff --git a/cdm-test/build.gradle b/cdm-test/build.gradle index c1f3702565..93c1a4194c 100644 --- a/cdm-test/build.gradle +++ b/cdm-test/build.gradle @@ -18,12 +18,14 @@ dependencies { testImplementation project(':grib') testImplementation project(':netcdf4') testImplementation project(':cdm-test-utils') + testImplementation project(':udunits') testImplementation 'commons-io:commons-io' testImplementation 'org.apache.commons:commons-compress' testImplementation 'edu.ucar:jj2000' testImplementation 'org.jdom:jdom2' testImplementation 'com.google.guava:guava' + testImplementation 'com.google.re2j:re2j' testImplementation 'software.amazon.awssdk:s3' testImplementation 'com.google.truth:truth' testImplementation 'org.slf4j:slf4j-api' diff --git a/cdm/misc/build.gradle b/cdm/misc/build.gradle index 2b386e44db..1375012b3d 100644 --- a/cdm/misc/build.gradle +++ b/cdm/misc/build.gradle @@ -13,6 +13,8 @@ dependencies { implementation project(':cdm:cdm-core') implementation 'com.google.code.findbugs:jsr305' + implementation 'com.google.guava:guava' + implementation 'com.google.protobuf:protobuf-java' implementation 'com.google.re2j:re2j' implementation 'org.slf4j:slf4j-api' diff --git a/cdm/radial/build.gradle b/cdm/radial/build.gradle index 9cc518b8bf..9726ef7e43 100644 --- a/cdm/radial/build.gradle +++ b/cdm/radial/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation 'org.jdom:jdom2' implementation 'com.google.code.findbugs:jsr305' + implementation 'com.google.guava:guava' implementation 'com.google.re2j:re2j' implementation 'org.slf4j:slf4j-api' diff --git a/cdm/s3/build.gradle b/cdm/s3/build.gradle index bee0e0b749..e92debdc38 100644 --- a/cdm/s3/build.gradle +++ b/cdm/s3/build.gradle @@ -23,6 +23,8 @@ dependencies { implementation 'software.amazon.awssdk:apache-client' implementation 'com.google.code.findbugs:jsr305' + implementation 'com.google.guava:guava' + implementation 'com.google.re2j:re2j' runtimeOnly('software.amazon.awssdk:sts') { // see above comment about awssdk and netty-nio-client diff --git a/cdm/zarr/build.gradle b/cdm/zarr/build.gradle index 9ede9ddcc0..e22888b319 100644 --- a/cdm/zarr/build.gradle +++ b/cdm/zarr/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation 'org.slf4j:slf4j-api' implementation 'com.fasterxml.jackson.core:jackson-core' implementation 'com.fasterxml.jackson.core:jackson-databind' + implementation 'com.google.guava:guava' testImplementation('software.amazon.awssdk:s3') { // exclude netty nio client due to open CVEs. See diff --git a/docs/build.gradle b/docs/build.gradle index 6bad6078a2..58687a9ef6 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -17,6 +17,9 @@ dependencies { testImplementation project(':cdm-test-utils') testImplementation project(':bufr') testImplementation project(':grib') + testImplementation project(':udunits') + + testImplementation 'org.jdom:jdom2' testImplementation 'org.slf4j:slf4j-api' testImplementation 'junit:junit' testImplementation 'com.google.truth:truth' diff --git a/grib/build.gradle b/grib/build.gradle index 02c3394104..047909fd9c 100644 --- a/grib/build.gradle +++ b/grib/build.gradle @@ -21,6 +21,7 @@ dependencies { implementation 'org.slf4j:slf4j-api' testImplementation project(':cdm-test-utils') + testImplementation project(':udunits') testImplementation 'com.google.truth:truth' testImplementation 'org.jsoup:jsoup' diff --git a/legacy/build.gradle b/legacy/build.gradle index 714c22b110..39c8a39f91 100644 --- a/legacy/build.gradle +++ b/legacy/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation project(':grib') implementation project(':opendap') + implementation project(':udunits') implementation 'com.google.guava:guava' implementation 'org.jdom:jdom2' diff --git a/netcdf4/build.gradle b/netcdf4/build.gradle index ea3bcc66f9..62cd44ad5c 100644 --- a/netcdf4/build.gradle +++ b/netcdf4/build.gradle @@ -13,6 +13,7 @@ dependencies { implementation project(':cdm:cdm-core') implementation 'net.java.dev.jna:jna' implementation 'org.slf4j:slf4j-api' + implementation 'com.google.guava:guava' testImplementation project(':cdm-test-utils') diff --git a/uibase/build.gradle b/uibase/build.gradle index 000b7f95bd..253d75085f 100644 --- a/uibase/build.gradle +++ b/uibase/build.gradle @@ -16,17 +16,17 @@ dependencies { // Used by NcmlEditor. Abandoned, no updates since 2013. https://sourceforge.net/projects/bounce/ // https://sourceforge.net/p/bounce/svn/HEAD/tree/src/main/java/org/bounce/ - implementation 'org.bounce:bounce:0.18' + api 'org.bounce:bounce:0.18' // http://www.jfree.org/ - implementation 'org.jfree:jcommon:1.0.23' - implementation 'org.jfree:jfreechart:1.0.19' + api 'org.jfree:jcommon:1.0.23' + api 'org.jfree:jfreechart:1.0.19' // http://www.jgoodies.com/. Latest version is 1.9.0, but there is breakage when we try to upgrade. - implementation 'com.jgoodies:jgoodies-forms:1.6.0' + api 'com.jgoodies:jgoodies-forms:1.6.0' // LGoodDatePicker - swing calendar widget used in TdsMonitor - implementation 'com.github.lgooddatepicker:LGoodDatePicker:10.3.1' + api 'com.github.lgooddatepicker:LGoodDatePicker:10.3.1' testImplementation project(':cdm:cdm-core') testImplementation project(':cdm-test-utils') diff --git a/uicdm/build.gradle b/uicdm/build.gradle index da222d1d9e..3b4dacbc0a 100644 --- a/uicdm/build.gradle +++ b/uicdm/build.gradle @@ -23,13 +23,16 @@ dependencies { implementation project(':netcdf4') implementation project(':opendap') implementation project(':dap4') + implementation project(':udunits') implementation project(':uibase') implementation project(':visad:cdm-mcidas') // For Gempak IOSPs. implementation project(':waterml') // constrained by netcdf-java-platform + implementation 'org.apache.xmlbeans:xmlbeans' implementation 'org.jdom:jdom2' implementation 'org.apache.httpcomponents:httpclient' + implementation 'com.google.protobuf:protobuf-java' implementation 'com.google.re2j:re2j' implementation 'org.slf4j:slf4j-api' diff --git a/visad/mcidas/build.gradle b/visad/mcidas/build.gradle index 72b2188324..0f0e85c6b8 100644 --- a/visad/mcidas/build.gradle +++ b/visad/mcidas/build.gradle @@ -11,6 +11,7 @@ dependencies { api project(':cdm:cdm-core') implementation project(':grib') + implementation project(':udunits') implementation 'edu.wisc.ssec:visad-mcidas-slim-ucar-ns' implementation 'com.google.guava:guava'