Merge pull request #1457 from lesserwhirls/deps

Upgrade a few 3rd party dependencies

Author: lesserwhirls

cdm-test/build.gradle

@@ -24,6 +24,7 @@ dependencies {
   testImplementation 'org.apache.commons:commons-compress'
   testImplementation 'edu.ucar:jj2000'
   testImplementation 'org.jdom:jdom2'
+  testImplementation 'com.google.code.findbugs:jsr305'
   testImplementation 'com.google.guava:guava'
   testImplementation 'com.google.re2j:re2j'
   testImplementation 'software.amazon.awssdk:s3'

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.code.findbugs:jsr305'
     implementation 'com.google.guava:guava'
 
     testImplementation('software.amazon.awssdk:s3') {

gradle/root/fatJars.gradle

@@ -27,9 +27,17 @@ apply plugin: 'com.gradleup.shadow'
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 configurations {
-  ncIdv
-  netcdfAll
-  toolsUI
+  // set target attribute to ensure right guava variant is selected
+  // https://stackoverflow.com/a/77399208/2345036
+  ncIdv {
+    attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
+  }
+  netcdfAll {
+    attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
+  }
+  toolsUI {
+    attributes.attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, objects.named(TargetJvmEnvironment.class, TargetJvmEnvironment.STANDARD_JVM))
+  }
 }
 
 dependencies {

httpservices/build.gradle

@@ -12,6 +12,7 @@ dependencies {
   api 'org.apache.httpcomponents:httpcore'
 
   implementation 'org.apache.httpcomponents:httpmime'
+  implementation 'com.google.code.findbugs:jsr305'
   implementation 'com.google.re2j:re2j'
   implementation 'org.slf4j:slf4j-api'
 

netcdf-java-platform/build.gradle

@@ -9,8 +9,8 @@ javaPlatform {
 }
 
 dependencies {
-  def awsVersion = '2.17.290'
-  def jacksonVersion = '2.16.1'
+  def awsVersion = '2.31.76'
+  def jacksonVersion = '2.19.1'
   api enforcedPlatform("software.amazon.awssdk:bom:${awsVersion}")
   api enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
   constraints {
@@ -20,15 +20,13 @@ dependencies {
     // general dependencies
     api "com.google.protobuf:protobuf-java:${depVersion.protobuf}"
     api "com.google.protobuf:protoc:${depVersion.protobuf}"
-    api 'com.google.guava:guava:32.0.1-jre'
+    api 'com.google.guava:guava:33.4.8-jre'
     api 'com.google.re2j:re2j:1.3'
     api 'org.jdom:jdom2:2.0.6.1'
     api 'joda-time:joda-time:2.12.7'
 
     // netcdf4, dap4
-    // Tricky dependency here. We need to make sure that we keep in-line with the version
-    // that chronicle-map uses in the TDS, or else we see bad things happen on the TDS side.
-    api 'net.java.dev.jna:jna:5.12.1'
+    api 'net.java.dev.jna:jna:5.17.0'
 
     // Annotations: Nullable
     api 'com.google.code.findbugs:jsr305:3.0.2'

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.code.findbugs:jsr305'
   implementation 'com.google.guava:guava'
 
   testImplementation project(':cdm-test-utils')

uicdm/build.gradle

@@ -32,6 +32,7 @@ dependencies {
   implementation 'org.apache.xmlbeans:xmlbeans'
   implementation 'org.jdom:jdom2'
   implementation 'org.apache.httpcomponents:httpclient'
+  implementation 'com.google.code.findbugs:jsr305'
   implementation 'com.google.protobuf:protobuf-java'
   implementation 'com.google.re2j:re2j'
   implementation 'org.slf4j:slf4j-api'