Merge pull request #1599 from lesserwhirls/deps

Author: lesserwhirls

build-logic-ncj/src/main/kotlin/ncj-versions-conventions.gradle.kts

@@ -5,7 +5,7 @@
 
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
-plugins { id("com.github.ben-manes.versions") }
+plugins { id("io.github.ben-manes.versions") }
 
 // https://github.com/ben-manes/gradle-versions-plugin
 fun isNonStable(version: String): Boolean {

build.gradle.kts

@@ -14,9 +14,9 @@ description = "The Unidata netCDF-Java library (aka CDM)."
 // To upgrade gradle, update the version and expected checksum values below
 // and run ./gradlew wrapper twice
 tasks.wrapper {
-  distributionType = Wrapper.DistributionType.ALL
-  gradleVersion = "9.5.1"
-  distributionSha256Sum = "c72fb9991f6025cbe337d52ba77e531b3faf62bdd3e348fe1ccee9f51c71adb0"
+  distributionType = Wrapper.DistributionType.BIN
+  gradleVersion = "9.7.1"
+  distributionSha256Sum = "acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a"
 }
 
 spotless {

code-coverage-report/build.gradle.kts

@@ -29,7 +29,8 @@ dependencies {
 
 reporting {
   reports {
-    val testCodeCoverageReportAgg by
-      creating(JacocoCoverageReport::class) { testSuiteName = "test" }
+    create<JacocoCoverageReport>("testCodeCoverageReportAgg") {
+      testSuiteName = "test"
+    }
   }
 }

gradle/ncj.libs.versions.toml

@@ -4,37 +4,37 @@ netcdf-java = "5.11.0-SNAPSHOT"
 unidata-doc-theme = "0.1.1"
 
 # 3rd party dependencies
-awssdk = "2.48.4"
+awssdk = "2.54.17"
 awssdkv1 = "1.12.797"
 commons-math3 = "3.6.1"
 bounce = "0.18"
-grpc = "1.82.1"
-guava = "33.6.0-jre"
+grpc = "1.84.0"
+guava = "33.7.1-jre"
 httpcomponents = "4.5.14"
-jackson = "2.22.1"
+jackson = "2.22.2"
 jcommander = "1.82"
 jdom2 = "2.0.6.1"
 jfree-jcommon = "1.0.24"
 jfree-jfreechart = "1.0.19"
 jgoodies-forms = "1.6.0"
 jj2000 = "5.4"
-joda-time = "2.14.2"
+joda-time = "2.14.3"
 jsr305 = "3.0.2"
 jna = "5.19.1"
 lgooddatepicker = "11.2.1"
 mcidas = "20231121"
-protobuf = "4.35.1"
+protobuf = "4.36.1"
 re2j = "1.8"
 sensorweb-waterml = "2.7.0"
-slf4j = "2.0.18"
+slf4j = "2.0.19"
 tomcat-annotations = "6.0.53"
 visad = "2.0-20191209"
 xmlbeans = "3.1.0"
 
 #testing only
 commons-compress = "1.28.0"
 commons-io = "2.22.0"
-jsoup = "1.22.2"
+jsoup = "1.23.2"
 junit4 = "4.13.2"
 junit5 = "5.14.4"
 junitparams = "1.0.5"
@@ -113,10 +113,10 @@ pragmatists-junitparams = { module = "pl.pragmatists:JUnitParams", version.ref =
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback-classic" }
 
 [plugins]
-cyclonedx-bom = { id = "org.cyclonedx.bom", version = "3.2.4" }
+cyclonedx-bom = { id = "org.cyclonedx.bom", version = "3.4.1" }
 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.7.0" }
-versions = { id = "com.github.ben-manes.versions", version = "0.54.0" }
+shadow = { id = "com.gradleup.shadow", version = "9.6.1" }
+spotless = { id = "com.diffplug.spotless", version = "8.10.2" }
+versions = { id = "io.github.ben-manes.versions", version = "0.61.0" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c72fb9991f6025cbe337d52ba77e531b3faf62bdd3e348fe1ccee9f51c71adb0
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
+distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

gradle/wrapper/gradle-wrapper.properties

@@ -22,16 +22,22 @@ val unloadedTestSourceSet =
     runtimeClasspath += sourceSets.main.get().output
   }
 
-val unloadedTestImplementation by configurations.getting {
-  extendsFrom(configurations.implementation.get(), configurations.testImplementation.get())
-}
+val unloadedTestImplementation =
+  configurations.named("unloadedTestImplementation") {
+    extendsFrom(
+      configurations.implementation.get(),
+      configurations.testImplementation.get(),
+    )
+  }
 
-val unloadedTestRuntimeOnly by configurations.getting
+val unloadedTestRuntimeOnly = configurations.named("unloadedTestRuntimeOnly")
 
-configurations["unloadedTestRuntimeOnly"].extendsFrom(
-  configurations.runtimeOnly.get(),
-  configurations.testRuntimeOnly.get(),
-)
+configurations.named("unloadedTestRuntimeOnly").configure {
+  extendsFrom(
+    configurations.runtimeOnly.get(),
+    configurations.testRuntimeOnly.get(),
+  )
+}
 
 dependencies {
   implementation(platform(project(":netcdf-java-platform")))

gradlew

@@ -27,11 +27,12 @@ val artifactOutputLocation = rootProject.layout.buildDirectory.dir("distribution
 tasks.clean { delete(artifactOutputLocation) }
 
 // configurations for the uber-jars
-val toolsUI by configurations.creating { extendsFrom(configurations.implementation.get()) }
+val toolsUI = configurations.create("toolsUI") { extendsFrom(configurations.implementation.get()) }
 
-val ncIdv by configurations.creating { extendsFrom(configurations.implementation.get()) }
+val ncIdv = configurations.create("ncIdv") { extendsFrom(configurations.implementation.get()) }
 
-val netcdfAll by configurations.creating { extendsFrom(configurations.implementation.get()) }
+val netcdfAll =
+  configurations.create("netcdfAll") { extendsFrom(configurations.implementation.get()) }
 
 dependencies {
   implementation(platform(project(":netcdf-java-platform")))