Merge pull request #1713 from redhat-appstudio/renovate/major-cyclonedx-core-java.version

Update dependency org.cyclonedx:cyclonedx-core-java to v9

Author: rnc

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/dependencies/AnalyserBase.java

@@ -14,8 +14,8 @@
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
-import org.cyclonedx.BomGeneratorFactory;
 import org.cyclonedx.CycloneDxSchema;
+import org.cyclonedx.generators.BomGeneratorFactory;
 import org.cyclonedx.generators.json.BomJsonGenerator;
 import org.cyclonedx.model.Bom;
 
@@ -142,7 +142,7 @@ void writeSbom(Set<TrackingData> trackingData) throws IOException {
             }
         }
 
-        BomJsonGenerator generator = BomGeneratorFactory.createJson(CycloneDxSchema.Version.VERSION_14, bom);
+        BomJsonGenerator generator = BomGeneratorFactory.createJson(CycloneDxSchema.VERSION_LATEST, bom);
         String sbom = generator.toJsonString();
         Log.infof("Generated SBOM:\n%s", sbom);
         if (this.sbom != null) {

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/dependencies/SBomGenerator.java

@@ -9,11 +9,11 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.cyclonedx.BomParserFactory;
 import org.cyclonedx.exception.ParseException;
 import org.cyclonedx.model.Bom;
 import org.cyclonedx.model.Component;
 import org.cyclonedx.model.Property;
+import org.cyclonedx.parsers.BomParserFactory;
 
 import com.redhat.hacbs.classfile.tracker.TrackingData;
 

java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/DeployCommand.java

@@ -25,8 +25,8 @@
 import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.commons.lang3.StringUtils;
-import org.cyclonedx.BomGeneratorFactory;
-import org.cyclonedx.CycloneDxSchema;
+import org.cyclonedx.Version;
+import org.cyclonedx.generators.BomGeneratorFactory;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import com.redhat.hacbs.classfile.tracker.ClassFileTracker;
@@ -345,7 +345,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
                 }
             });
             var sbom = SBomGenerator.generateSBom(data, null);
-            var json = BomGeneratorFactory.createJson(CycloneDxSchema.Version.VERSION_12, sbom);
+            var json = BomGeneratorFactory.createJson(Version.VERSION_12, sbom);
             String sbomStr = json.toJsonString();
             Log.debugf("Build Sbom \n%s", sbomStr);
             Files.writeString(logsPath.resolve("build-sbom.json"), sbomStr, StandardCharsets.UTF_8);

java-components/management-console/src/main/java/com/redhat/hacbs/management/github/GithubIntegration.java

@@ -15,9 +15,9 @@
 import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
 
-import org.cyclonedx.BomParserFactory;
 import org.cyclonedx.exception.ParseException;
 import org.cyclonedx.model.Bom;
+import org.cyclonedx.parsers.BomParserFactory;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kohsuke.github.GHArtifact;
 import org.kohsuke.github.GHCheckRun;

java-components/management-console/src/main/java/com/redhat/hacbs/management/internal/discovery/BuildSBOMDiscoveryManager.java

@@ -15,9 +15,9 @@
 import jakarta.transaction.Transactional;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.cyclonedx.BomParserFactory;
 import org.cyclonedx.exception.ParseException;
 import org.cyclonedx.model.Bom;
+import org.cyclonedx.parsers.BomParserFactory;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import com.google.cloud.tools.jib.api.Credential;

java-components/pom.xml

@@ -58,7 +58,7 @@
         <asm.version>9.7</asm.version>
         <assertj.version>3.25.3</assertj.version>
         <aws-java-sdk.version>1.12.725</aws-java-sdk.version>
-        <cyclonedx-core-java.version>8.0.3</cyclonedx-core-java.version>
+        <cyclonedx-core-java.version>9.0.0</cyclonedx-core-java.version>
         <gradle-tooling-api.version>8.7</gradle-tooling-api.version>
         <maven-indexer.version>7.1.2</maven-indexer.version>
         <maven-resolver.version>1.9.20</maven-resolver.version>