Upgrade gradle plugins and improve SBOMs

Author: lesserwhirls

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")))

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" }

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)

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)

uber-jars/build.gradle.kts

@@ -128,26 +128,29 @@ uberJarTasks.forEach {
 
 val netcdfAllSbom =
   tasks.register<CyclonedxDirectTask>("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<CyclonedxDirectTask>("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<CyclonedxDirectTask>("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) }

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)