diff --git a/build.gradle.kts b/build.gradle.kts index 9df2981100..ad4485b2a9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,8 @@ description = "The Unidata netCDF-Java library (aka CDM)." // and run ./gradlew wrapper twice tasks.wrapper { distributionType = Wrapper.DistributionType.ALL - gradleVersion = "9.3.1" - distributionSha256Sum = "17f277867f6914d61b1aa02efab1ba7bb439ad652ca485cd8ca6842fccec6e43" + gradleVersion = "9.4.0" + distributionSha256Sum = "b21468753cb43c167738ee04f10c706c46459cf8f8ae6ea132dc9ce589a261f2" } spotless { diff --git a/gradle/ncj.libs.versions.toml b/gradle/ncj.libs.versions.toml index cd4e268eaa..e69ee12d67 100644 --- a/gradle/ncj.libs.versions.toml +++ b/gradle/ncj.libs.versions.toml @@ -111,10 +111,9 @@ pragmatists-junitparams = { module = "pl.pragmatists:JUnitParams", version.ref = logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback-classic" } [plugins] -# versions = { id = "com.github.ben-manes.versions", version = "0.45.0" } -cyclonedx-bom = { id = "org.cyclonedx.bom", version = "3.1.0" } +cyclonedx-bom = { id = "org.cyclonedx.bom", version = "3.2.0" } execfork = { id = "com.github.psxpaul.execfork", version = "0.2.2"} -javacc = { id = "org.javacc.javacc", version = "4.0.1" } -protobuf = { id = "com.google.protobuf", version = "0.9.5" } -shadow = { id = "com.gradleup.shadow", version = "9.3.1" } -spotless = { id = "com.diffplug.spotless", version = "8.2.1" } +javacc = { id = "org.javacc.javacc", version = "4.0.3" } +protobuf = { id = "com.google.protobuf", version = "0.9.6" } +shadow = { id = "com.gradleup.shadow", version = "9.3.2" } +spotless = { id = "com.diffplug.spotless", version = "8.3.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a659d..d997cfc60f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17c9e60fba..5e1b8a0423 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=17f277867f6914d61b1aa02efab1ba7bb439ad652ca485cd8ca6842fccec6e43 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip +distributionSha256Sum=b21468753cb43c167738ee04f10c706c46459cf8f8ae6ea132dc9ce589a261f2 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index adff685a03..0262dcbd52 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/uber-jars/build.gradle.kts b/uber-jars/build.gradle.kts index 6a96f1d2eb..0b9f99ed42 100644 --- a/uber-jars/build.gradle.kts +++ b/uber-jars/build.gradle.kts @@ -133,6 +133,7 @@ val netcdfAllSbom = includeConfigs = listOf("netcdfAll") xmlOutput = artifactOutputLocation.get().file("netcdfAll-${project.version}-sbom.xml") jsonOutput = artifactOutputLocation.get().file("netcdfAll-${project.version}-sbom.json") + dependsOn(buildNetcdfAll) } val ncIdvSbom = @@ -142,6 +143,7 @@ val ncIdvSbom = includeConfigs = listOf("ncIdv") xmlOutput = artifactOutputLocation.get().file("ncIdv-${project.version}-sbom.xml") jsonOutput = artifactOutputLocation.get().file("ncIdv-${project.version}-sbom.json") + dependsOn(buildNcIdv) } val toolsUISbom = @@ -151,6 +153,7 @@ val toolsUISbom = includeConfigs = listOf("toolsUI") xmlOutput = artifactOutputLocation.get().file("toolsUI-${project.version}-sbom.xml") jsonOutput = artifactOutputLocation.get().file("toolsUI-${project.version}-sbom.json") + dependsOn(buildToolsUi) } val buildSboms = tasks.register("buildSboms") { dependsOn(netcdfAllSbom, ncIdvSbom, toolsUISbom) }