Some fixes for TemurinGenSBOM and latest CDXA update

Signed-off-by: Andrew Leonard <[email protected]>
adoptium · Dec 4, 2024 · fcdf28f · fcdf28f
1 parent 4473c09
commit fcdf28f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/cyclonedx-lib/build.xml b/cyclonedx-lib/build.xml
@@ -793,16 +793,20 @@
                   <arg value="--xmlFile"/>
                  <arg value="${testSBOMFile_xml}"/>
                 </java>
+
+<!-- This fails for XML until upstream issue is fixed: https://github.com/CycloneDX/cyclonedx-core-java/issues/562
                 <java classpath="${classpath}" classname="temurin.sbom.TemurinGenSBOM" fork="yes" failonerror="yes">
-                  <arg value="--verbose"/>
-                  <arg value="--addMetadataTools"/>
-                  <arg value="--tool"/>
+                  <arg value="verbose"/>
+                  <arg value="addMetadataTools"/>
+                  <arg value="tool"/>
                   <arg value="GCC"/>
-                  <arg value="--version"/>
+                  <arg value="version"/>
                   <arg value="10.1"/>
-                  <arg value="--xmlFile"/>
+                  <arg value="xmlFile"/>
                  <arg value="${testSBOMFile_xml}"/>
                 </java>
+-->
+
                 <java classpath="${classpath}" classname="temurin.sbom.TemurinGenSBOM" fork="yes" failonerror="yes">
                   <arg value="--verbose"/>
                   <arg value="--addFormulation"/>