From f98129cfdaf07bbf269d566524e403f4fb23fd3b Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Wed, 24 Jun 2026 12:13:11 -0600 Subject: [PATCH 1/2] Upgrade 3rd party dependencies --- gradle/ncj.libs.versions.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/ncj.libs.versions.toml b/gradle/ncj.libs.versions.toml index 05195caf7e..0d3e4ed0e7 100644 --- a/gradle/ncj.libs.versions.toml +++ b/gradle/ncj.libs.versions.toml @@ -4,11 +4,11 @@ netcdf-java = "5.10.0-SNAPSHOT" unidata-doc-theme = "0.1.1" # 3rd party dependencies -awssdk = "2.46.5" +awssdk = "2.46.17" awssdkv1 = "1.12.797" commons-math3 = "3.6.1" bounce = "0.18" -grpc = "1.81.0" +grpc = "1.82.1" guava = "33.6.0-jre" httpcomponents = "4.5.14" jackson = "2.22.0" @@ -20,10 +20,10 @@ jgoodies-forms = "1.6.0" jj2000 = "5.4" joda-time = "2.14.2" jsr305 = "3.0.2" -jna = "5.19.0" +jna = "5.19.1" lgooddatepicker = "11.2.1" mcidas = "20231121" -protobuf = "4.35.0" +protobuf = "4.35.1" re2j = "1.8" sensorweb-waterml = "2.7.0" slf4j = "2.0.18" @@ -118,5 +118,5 @@ execfork = { id = "com.github.psxpaul.execfork", version = "0.2.2"} javacc = { id = "org.javacc.javacc", version = "4.0.3" } protobuf = { id = "com.google.protobuf", version = "0.10.0" } shadow = { id = "com.gradleup.shadow", version = "9.4.2" } -spotless = { id = "com.diffplug.spotless", version = "8.6.0" } +spotless = { id = "com.diffplug.spotless", version = "8.7.0" } versions = { id = "com.github.ben-manes.versions", version = "0.54.0" } From 13bb5ab134860dcaa5c0f5fccd59b78c74f52aa9 Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Wed, 24 Jun 2026 12:17:29 -0600 Subject: [PATCH 2/2] Fix new spotless catch --- build-logic-ncj/build.gradle.kts | 5 +++-- netcdf4/build.gradle.kts | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-logic-ncj/build.gradle.kts b/build-logic-ncj/build.gradle.kts index c910841c14..3405adf99f 100644 --- a/build-logic-ncj/build.gradle.kts +++ b/build-logic-ncj/build.gradle.kts @@ -25,5 +25,6 @@ spotless { // Helper function that transforms a plugin alias from the version catalog // into a valid dependency notation -fun plugin(plugin: Provider) = - plugin.map { "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" } +fun plugin(plugin: Provider) = plugin.map { + "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" +} diff --git a/netcdf4/build.gradle.kts b/netcdf4/build.gradle.kts index 2047e2006c..3c0509d7f1 100644 --- a/netcdf4/build.gradle.kts +++ b/netcdf4/build.gradle.kts @@ -22,10 +22,9 @@ val unloadedTestSourceSet = runtimeClasspath += sourceSets.main.get().output } -val unloadedTestImplementation by - configurations.getting { - extendsFrom(configurations.implementation.get(), configurations.testImplementation.get()) - } +val unloadedTestImplementation by configurations.getting { + extendsFrom(configurations.implementation.get(), configurations.testImplementation.get()) +} val unloadedTestRuntimeOnly by configurations.getting