Upgrade gradle

bufr/build.gradle

@@ -11,13 +11,13 @@ dependencies {
 
   api project(':cdm:cdm-core')
 
-  compile 'org.jdom:jdom2'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'com.beust:jcommander'
-  compile 'com.google.protobuf:protobuf-java'
-  compile 'com.google.re2j:re2j'
-  compile 'org.slf4j:slf4j-api'
-  compile 'com.google.guava:guava'
+  implementation 'org.jdom:jdom2'
+  implementation 'com.google.code.findbugs:jsr305'
+  implementation 'com.beust:jcommander'
+  implementation 'com.google.protobuf:protobuf-java'
+  implementation 'com.google.re2j:re2j'
+  implementation 'org.slf4j:slf4j-api'
+  implementation 'com.google.guava:guava'
 
   testImplementation project(':cdm-test-utils')
 

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'

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'

cdm/core/build.gradle

@@ -12,16 +12,16 @@ dependencies {
 
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  compile project(':udunits')
-  compile project(':httpservices')
-
-  compile 'com.beust:jcommander'
-  compile 'com.google.guava:guava'
-  compile 'com.google.protobuf:protobuf-java'
-  compile 'com.google.re2j:re2j'
-  compile 'joda-time:joda-time'
-  compile 'org.jdom:jdom2'
-  compile 'org.slf4j:slf4j-api'
+  implementation project(':udunits')
+  implementation project(':httpservices')
+
+  implementation 'com.beust:jcommander'
+  implementation 'com.google.guava:guava'
+  implementation 'com.google.protobuf:protobuf-java'
+  implementation 'com.google.re2j:re2j'
+  implementation 'joda-time:joda-time'
+  implementation 'org.jdom:jdom2'
+  implementation 'org.slf4j:slf4j-api'
 
   implementation 'com.google.code.findbugs:jsr305'
 

cdm/image/build.gradle

@@ -10,7 +10,7 @@ dependencies {
 
   api project(':cdm:cdm-core')
 
-  compile 'org.slf4j:slf4j-api'
+  implementation 'org.slf4j:slf4j-api'
 
   testImplementation project(':cdm-test-utils')
   testImplementation 'junit:junit'

cdm/misc/build.gradle

@@ -9,15 +9,17 @@ dependencies {
   api enforcedPlatform(project(':netcdf-java-platform'))
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  compile project(':udunits')
-  compile project(':cdm:cdm-core')
+  implementation project(':udunits')
+  implementation project(':cdm:cdm-core')
 
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'com.google.re2j:re2j'
+  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'
 
-  testCompile project(':grib')
+  testImplementation project(':grib')
 
   testImplementation project(':cdm-test-utils')
 

cdm/radial/build.gradle

@@ -8,13 +8,14 @@ dependencies {
   api enforcedPlatform(project(':netcdf-java-platform'))
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  compile project(':udunits')
-  compile project(':cdm:cdm-core')
+  implementation project(':udunits')
+  implementation project(':cdm:cdm-core')
 
-  compile 'org.jdom:jdom2'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'com.google.re2j:re2j'
-  compile 'org.slf4j:slf4j-api'
+  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'
 
   testImplementation project(':cdm-test-utils')
   testImplementation project(':netcdf4')

cdm/radial/src/main/java/ucar/nc2/iosp/sigmet/SigmetIOServiceProvider.java

@@ -5,7 +5,6 @@
 
 package ucar.nc2.iosp.sigmet;
 
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ucar.ma2.*;

cdm/s3/build.gradle

@@ -8,8 +8,8 @@ dependencies {
   api enforcedPlatform(project(':netcdf-java-platform'))
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  compile project(':cdm:cdm-core')
-  compile 'org.slf4j:slf4j-api'
+  implementation project(':cdm:cdm-core')
+  implementation 'org.slf4j:slf4j-api'
 
   implementation('software.amazon.awssdk:s3') {
     // exclude netty nio client due to open CVEs. See
@@ -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

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

docs/build.gradle

@@ -10,16 +10,19 @@ apply from: "$rootDir/gradle/any/testing.gradle"
 dependencies {
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  testCompile project(':cdm:cdm-core')
-  testCompile project(':cdm:cdm-s3')
-  testCompile project(':netcdf4')
-  testCompile project(':opendap')
-  testCompile project(':cdm-test-utils')
-  testCompile project(':bufr')
-  testCompile project(':grib')
-  testCompile 'org.slf4j:slf4j-api'
-  testCompile 'junit:junit'
-  testCompile 'com.google.truth:truth'
+  testImplementation project(':cdm:cdm-core')
+  testImplementation project(':cdm:cdm-s3')
+  testImplementation project(':netcdf4')
+  testImplementation project(':opendap')
+  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'
 
   testRuntimeOnly 'ch.qos.logback:logback-classic'
 }

gradle/any/shared-mvn-coords.gradle

@@ -7,7 +7,7 @@ ext {
 
   // plugin version management
   buildPlugins = [:]
-  buildPlugins.shadow = 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+  buildPlugins.shadow = 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
   buildPlugins.sonarqube = 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0'
   buildPlugins.spotless = 'com.diffplug.spotless:spotless-plugin-gradle:4.5.1'
   buildPlugins.protobuf = 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'

gradle/root/fatJars.gradle

@@ -68,11 +68,6 @@ dependencies {
 def fatJarTasks = []
 
 fatJarTasks << tasks.create(name: 'buildNcIdv', type: ShadowJar) {
-  // it looks like ShadowJar needs us to set both
-  // baseName and setArchivesBaseName even though
-  // baseName is deprecated.
-  // todo: keep an eye on ShadowJar to see when we can stop setting baseName in these tasks
-  baseName = 'ncIdv'
   setArchiveBaseName('ncIdv')
 
   configurations = [project.configurations.ncIdv]
@@ -86,7 +81,6 @@ fatJarTasks << tasks.create(name: 'buildNcIdv', type: ShadowJar) {
 }
 
 fatJarTasks << tasks.create(name: 'buildNetcdfAll', type: ShadowJar) {
-  baseName = 'netcdfAll'
   setArchiveBaseName('netcdfAll')
 
   configurations = [project.configurations.netcdfAll]
@@ -97,7 +91,6 @@ fatJarTasks << tasks.create(name: 'buildNetcdfAll', type: ShadowJar) {
 }
 
 fatJarTasks << tasks.create(name: 'buildToolsUI', type: ShadowJar) {
-  baseName = 'toolsUI'
   setArchiveBaseName('toolsUI')
   configurations = [project.configurations.toolsUI]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

grib/build.gradle

@@ -11,16 +11,17 @@ dependencies {
 
   api project(':cdm:cdm-core')
 
-  compile 'com.google.protobuf:protobuf-java'
-  compile 'org.jdom:jdom2'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'edu.ucar:jj2000'
-  compile 'com.google.guava:guava'
-  compile 'com.beust:jcommander'
-  compile 'com.google.re2j:re2j'
-  compile 'org.slf4j:slf4j-api'
+  implementation 'com.google.protobuf:protobuf-java'
+  implementation 'org.jdom:jdom2'
+  implementation 'com.google.code.findbugs:jsr305'
+  implementation 'edu.ucar:jj2000'
+  implementation 'com.google.guava:guava'
+  implementation 'com.beust:jcommander'
+  implementation 'com.google.re2j:re2j'
+  implementation 'org.slf4j:slf4j-api'
 
   testImplementation project(':cdm-test-utils')
+  testImplementation project(':udunits')
 
   testImplementation 'com.google.truth:truth'
   testImplementation 'org.jsoup:jsoup'

legacy/build.gradle

@@ -11,15 +11,16 @@ dependencies {
 
   api project(':cdm:cdm-core')
 
-  compile project(':grib')
-  compile project(':opendap')
+  implementation project(':grib')
+  implementation project(':opendap')
+  implementation project(':udunits')
 
-  compile 'com.google.guava:guava'
-  compile 'org.jdom:jdom2'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'org.slf4j:slf4j-api'
+  implementation 'com.google.guava:guava'
+  implementation 'org.jdom:jdom2'
+  implementation 'com.google.code.findbugs:jsr305'
+  implementation 'org.slf4j:slf4j-api'
 
-  compile 'com.amazonaws:aws-java-sdk-s3'  // For CrawlableDatasetAmazonS3.
+  implementation 'com.amazonaws:aws-java-sdk-s3'  // For CrawlableDatasetAmazonS3.
 
   testImplementation project(':cdm-test-utils')
   testRuntimeOnly 'ch.qos.logback:logback-classic'

netcdf4/build.gradle

@@ -10,9 +10,10 @@ dependencies {
   api enforcedPlatform(project(':netcdf-java-platform'))
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  compile project(':cdm:cdm-core')
-  compile 'net.java.dev.jna:jna'
-  compile 'org.slf4j:slf4j-api'
+  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')
 
@@ -28,7 +29,7 @@ dependencies {
 
 sourceSets {
   unloadedTest {
-    resources.srcDir file('src/unloadedTest/resources')
+    resources.srcDirs = [file('src/unloadedTest/resources')]
     compileClasspath += sourceSets.main.output + configurations.testCompileClasspath
     runtimeClasspath += output + sourceSets.main.output + configurations.testRuntimeClasspath
   }

opendap/build.gradle

@@ -19,9 +19,9 @@ dependencies {
 
   implementation 'com.google.guava:guava'
 
-  compile 'org.jdom:jdom2'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'org.slf4j:slf4j-api'
+  implementation 'org.jdom:jdom2'
+  implementation 'com.google.code.findbugs:jsr305'
+  implementation 'org.slf4j:slf4j-api'
 
   testImplementation project(':cdm-test-utils')
   testImplementation 'com.google.truth:truth'

uibase/build.gradle

@@ -5,28 +5,28 @@ apply from: "$rootDir/gradle/any/dependencies.gradle"
 apply from: "$rootDir/gradle/any/java-library.gradle"
 
 dependencies {
-  compile enforcedPlatform(project(':netcdf-java-platform'))
+  implementation enforcedPlatform(project(':netcdf-java-platform'))
   testImplementation enforcedPlatform(project(':netcdf-java-testing-platform'))
 
-  compile 'org.jdom:jdom2'
-  compile 'com.google.protobuf:protobuf-java'
-  compile 'com.google.guava:guava'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'org.slf4j:slf4j-api'
+  implementation 'org.jdom:jdom2'
+  implementation 'com.google.protobuf:protobuf-java'
+  implementation 'com.google.guava:guava'
+  implementation 'com.google.code.findbugs:jsr305'
+  implementation 'org.slf4j:slf4j-api'
 
   // 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/
-  compile 'org.bounce:bounce:0.18'
+  api 'org.bounce:bounce:0.18'
 
   // http://www.jfree.org/
-  compile 'org.jfree:jcommon:1.0.23'
-  compile '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.
-  compile 'com.jgoodies:jgoodies-forms:1.6.0'
+  api 'com.jgoodies:jgoodies-forms:1.6.0'
 
   // LGoodDatePicker - swing calendar widget used in TdsMonitor
-  compile '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')