Merge pull request #2231 from rnc/JBS38

JBS-38 Remove sbom/cyclonedx

Author: rnc

hack/examples/gradle-v0.1.yaml

@@ -297,7 +297,6 @@ spec:
       imagePullPolicy: Always
       script: |
         /opt/jboss/container/java/run/run-java.sh analyse-dependencies path $(workspaces.source.path)/$(params.CONTEXT_DIR)/$(params.DEPENDENCY_ANALYSER_PATH) \
-          -s $(workspaces.source.path)/$(params.CONTEXT_DIR)/$(params.DEPENDENCY_ANALYSER_PATH)/java-sbom.json \
           -c "$(results.dependencies.path)" \
           -u "$(results.untrusted-dependencies.path)" \
           --task-run-name $(context.taskRun.name) \

hack/examples/maven-v0.2.yaml

@@ -194,7 +194,6 @@ spec:
       imagePullPolicy: Always
       script: |
         /opt/jboss/container/java/run/run-java.sh analyse-dependencies path $(workspaces.source.path)/$(params.CONTEXT_DIR)/$(params.DEPENDENCY_ANALYSER_PATH) \
-          -s $(workspaces.source.path)/$(params.CONTEXT_DIR)/$(params.DEPENDENCY_ANALYSER_PATH)/java-sbom.json \
           -c "$(results.dependencies.path)" \
           -u "$(results.untrusted-dependencies.path)" \
           --task-run-name $(context.taskRun.name) \

java-components/build-request-processor/pom.xml

@@ -59,10 +59,6 @@
             <groupId>com.google.cloud.tools</groupId>
             <artifactId>jib-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.cyclonedx</groupId>
-            <artifactId>cyclonedx-core-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
@@ -71,6 +67,7 @@
         <dependency>
             <groupId>org.gradle</groupId>
             <artifactId>gradle-tooling-api</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.indexer</groupId>

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

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -11,18 +10,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
-import org.cyclonedx.CycloneDxSchema;
-import org.cyclonedx.generators.BomGeneratorFactory;
-import org.cyclonedx.generators.json.BomJsonGenerator;
-import org.cyclonedx.model.Bom;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.redhat.hacbs.classfile.tracker.ClassFileTracker;
 import com.redhat.hacbs.classfile.tracker.TrackingData;
-import com.redhat.hacbs.container.results.ResultsUpdater;
 
 import io.quarkus.logging.Log;
 import picocli.CommandLine;
@@ -40,9 +32,6 @@ public abstract class AnalyserBase implements Runnable {
     @Inject
     RebuildService rebuild;
 
-    @CommandLine.Option(names = "-s")
-    Path sbom;
-
     @CommandLine.Option(names = "-c")
     Path dependenciesCount;
 
@@ -52,9 +41,6 @@ public abstract class AnalyserBase implements Runnable {
     @CommandLine.Option(names = "--publishers")
     Path publishers;
 
-    @Inject
-    Instance<ResultsUpdater> resultsUpdater;
-
     protected String imageDigest = "";
 
     @Override
@@ -65,36 +51,13 @@ public void run() {
             doAnalysis(gavs, trackingData);
             rebuild.rebuild(taskRunName, gavs);
             writeResults(gavs, trackingData);
-            writeSbom(trackingData);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
     abstract void doAnalysis(Set<String> gavs, Set<TrackingData> trackingData) throws Exception;
 
-    void writeSbom(Set<TrackingData> trackingData) throws IOException {
-        Bom bom;
-        InputStream existing = null;
-        try {
-            if (Files.exists(sbom)) {
-                existing = Files.newInputStream(sbom);
-            }
-            bom = SBomGenerator.generateSBom(trackingData, existing);
-        } finally {
-            if (existing != null) {
-                existing.close();
-            }
-        }
-
-        BomJsonGenerator generator = BomGeneratorFactory.createJson(CycloneDxSchema.VERSION_LATEST, bom);
-        String sbom = generator.toJsonString();
-        Log.infof("Generated SBOM:\n%s", sbom);
-        if (this.sbom != null) {
-            Files.writeString(this.sbom, sbom, StandardCharsets.UTF_8);
-        }
-    }
-
     void writeResults(Set<String> gavs, Set<TrackingData> trackingData) throws IOException {
         if (dependenciesCount != null) {
             Files.writeString(dependenciesCount, trackingData.size() + "");

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

@@ -57,7 +57,6 @@
         <!-- Dependencies -->
         <asm.version>9.7.1</asm.version>
         <assertj.version>3.26.3</assertj.version>
-        <cyclonedx-core-java.version>9.0.4</cyclonedx-core-java.version>
         <gradle-tooling-api.version>8.10.2</gradle-tooling-api.version>
         <maven-indexer.version>7.1.5</maven-indexer.version>
         <maven-resolver.version>1.9.22</maven-resolver.version>
@@ -185,11 +184,6 @@
                 <version>0.0.4</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.cyclonedx</groupId>
-                <artifactId>cyclonedx-core-java</artifactId>
-                <version>${cyclonedx-core-java.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.maven.release</groupId>
                 <artifactId>maven-release-manager</artifactId>

java-components/build-request-processor/src/test/java/com/redhat/hacbs/container/analyser/sbom/SBomMergeTestCase.java

@@ -326,10 +326,13 @@ func setupE2E(t *testing.T, namespace string) *testArgs {
 	}
 	_, err = jvmClient.JvmbuildserviceV1alpha1().JBSConfigs(ta.ns).Create(context.TODO(), &jbsConfig, metav1.CreateOptions{})
 	if err != nil {
+		fmt.Printf("Problem creating JBSConfig %#v \n", err)
 		debugAndFailTest(ta, err.Error())
 	}
+	time.Sleep(time.Second * 10)
 	err = waitForCache(ta)
 	if err != nil {
+		fmt.Printf("Problem waiting for cache %#v \n", err)
 		debugAndFailTest(ta, err.Error())
 	}
 	return ta
@@ -1109,11 +1112,7 @@ func setupMinikube(t *testing.T, namespace string) *testArgs {
 		fmt.Printf("Problem creating JBSConfig %#v \n", err)
 		debugAndFailTest(ta, err.Error())
 	}
-
 	time.Sleep(time.Second * 10)
-
-	dumpPodDetails(ta)
-
 	err = waitForCache(ta)
 	if err != nil {
 		fmt.Printf("Problem waiting for cache %#v \n", err)