diff --git a/build.gradle.kts b/build.gradle.kts index f1246be891..4f2dc83ad9 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.2.0" - distributionSha256Sum = "16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3" + gradleVersion = "9.3.1" + distributionSha256Sum = "17f277867f6914d61b1aa02efab1ba7bb439ad652ca485cd8ca6842fccec6e43" } spotless { diff --git a/dap4/build.gradle.kts b/dap4/build.gradle.kts index cbb23db686..490af48335 100644 --- a/dap4/build.gradle.kts +++ b/dap4/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation(project(":cdm-core")) implementation(project(":httpservices")) - implementation(libs.httpcomponents.api) + implementation(libs.httpcomponents.httpclient) implementation(libs.slf4j.api) testImplementation(platform(project(":netcdf-java-testing-platform"))) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a26d1cdd5..52f5ff6297 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -64,7 +64,7 @@ grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" } grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } grpc-testing = { module = "io.grpc:grpc-testing", version.ref = "grpc" } guava = { module = "com.google.guava:guava", version.ref = "guava" } -httpcomponents-api = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpcomponents" } +httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpcomponents" } httpcomponents-httpmime = { module = "org.apache.httpcomponents:httpmime", version.ref = "httpcomponents" } jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" } jackson-core = { module = "com.fasterxml.jackson.core:jackson-core" } @@ -112,9 +112,9 @@ logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "lo [plugins] # versions = { id = "com.github.ben-manes.versions", version = "0.45.0" } -cyclonedx-bom = { id = "org.cyclonedx.bom", version = "3.0.1" } +cyclonedx-bom = { id = "org.cyclonedx.bom", version = "3.1.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.2.2" } +shadow = { id = "com.gradleup.shadow", version = "9.3.1" } spotless = { id = "com.diffplug.spotless", version = "8.0.0" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee3125..61285a659d 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 b11741a1ad..17c9e60fba 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=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip +distributionSha256Sum=17f277867f6914d61b1aa02efab1ba7bb439ad652ca485cd8ca6842fccec6e43 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/httpservices/build.gradle.kts b/httpservices/build.gradle.kts index b401fbe7eb..e60cfe58e6 100644 --- a/httpservices/build.gradle.kts +++ b/httpservices/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(platform(project(":netcdf-java-platform"))) api(libs.guava) - api(libs.httpcomponents.api) + api(libs.httpcomponents.httpclient) implementation(libs.findbugs.jsr305) implementation(libs.httpcomponents.httpmime) diff --git a/netcdf-java-platform/build.gradle.kts b/netcdf-java-platform/build.gradle.kts index d091b421c3..c7852f460a 100644 --- a/netcdf-java-platform/build.gradle.kts +++ b/netcdf-java-platform/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { api(libs.grpc.protobuf) api(libs.grpc.stub) api(libs.guava) - api(libs.httpcomponents.api) + api(libs.httpcomponents.httpclient) api(libs.httpcomponents.httpmime) api(libs.jdom2) api(libs.jj2000) diff --git a/uber-jars/build.gradle.kts b/uber-jars/build.gradle.kts index 3436530844..cff780abde 100644 --- a/uber-jars/build.gradle.kts +++ b/uber-jars/build.gradle.kts @@ -128,26 +128,29 @@ uberJarTasks.forEach { val netcdfAllSbom = tasks.register("netcdfAllSbom") { + componentName = "netcdfAll" group = "build" includeConfigs = listOf("netcdfAll") - xmlOutput = artifactOutputLocation.get().file("netcdfAll-sbom.xml") - jsonOutput = artifactOutputLocation.get().file("netcdfAll-sbom.json") + xmlOutput = artifactOutputLocation.get().file("netcdfAll-${project.version}-sbom.xml") + jsonOutput = artifactOutputLocation.get().file("netcdfAll-${project.version}-sbom.json") } val ncIdvSbom = tasks.register("ncIdvSbom") { + componentName = "ncIdv" group = "build" includeConfigs = listOf("ncIdv") - xmlOutput = artifactOutputLocation.get().file("ncIdv-sbom.xml") - jsonOutput = artifactOutputLocation.get().file("ncIdv-sbom.json") + xmlOutput = artifactOutputLocation.get().file("ncIdv-${project.version}-sbom.xml") + jsonOutput = artifactOutputLocation.get().file("ncIdv-${project.version}-sbom.json") } val toolsUISbom = tasks.register("toolsUISbom") { + componentName = "toolsUI" group = "build" includeConfigs = listOf("toolsUI") - xmlOutput = artifactOutputLocation.get().file("toolsUI-sbom.xml") - jsonOutput = artifactOutputLocation.get().file("toolsUI-sbom.json") + xmlOutput = artifactOutputLocation.get().file("toolsUI-${project.version}-sbom.xml") + jsonOutput = artifactOutputLocation.get().file("toolsUI-${project.version}-sbom.json") } val buildSboms = tasks.register("buildSboms") { dependsOn(netcdfAllSbom, ncIdvSbom, toolsUISbom) } diff --git a/uicdm/build.gradle.kts b/uicdm/build.gradle.kts index 40de234c80..a2a7efa435 100644 --- a/uicdm/build.gradle.kts +++ b/uicdm/build.gradle.kts @@ -47,6 +47,7 @@ dependencies { runtimeOnly(project(":cdm-zarr")) runtimeOnly(project(":dap4")) runtimeOnly(project(":libaec-native")) + runtimeOnly(project(":libblosc2-native")) runtimeOnly(libs.logback.classic)