From 8fe2bf8b561ccbf2564438a0f46263c2a8f294df Mon Sep 17 00:00:00 2001
From: Andrew Leonard <anleonar@redhat.com>
Date: Thu, 2 Jan 2025 10:38:33 +0000
Subject: [PATCH] Update CycloneDX core java to release 10.1.0 for XML fix
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
---
cyclonedx-lib/build.xml | 12 +++++-------
.../dependency_data/dependency_data.properties | 4 ++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/cyclonedx-lib/build.xml b/cyclonedx-lib/build.xml
index 40a95a94f..d1dbe906e 100644
--- a/cyclonedx-lib/build.xml
+++ b/cyclonedx-lib/build.xml
@@ -793,18 +793,16 @@
<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"/>
diff --git a/cyclonedx-lib/dependency_data/dependency_data.properties b/cyclonedx-lib/dependency_data/dependency_data.properties
index cb2d15487..2818eef2b 100644
--- a/cyclonedx-lib/dependency_data/dependency_data.properties
+++ b/cyclonedx-lib/dependency_data/dependency_data.properties
@@ -27,8 +27,8 @@ commons-lang3.jar=commons-lang3-${commons-lang3.version}.jar
commons-io.version=2.16.1
commons-io.sha256=f41f7baacd716896447ace9758621f62c1c6b0a91d89acee488da26fc477c84f
commons-io.jar=commons-io-${commons-io.version}.jar
-cyclonedx-core-java.version=9.1.0
-cyclonedx-core-java.sha256=a911ee5e5ebdabc2b2c08d08f9c92c673c21965ee1b982f40fc166d80f1eb088
+cyclonedx-core-java.version=10.1.0
+cyclonedx-core-java.sha256=4931d0aed28763ae9fa1c574e26b7636879abdc101ff81ce3c63ad905c99937c
cyclonedx-core-java.jar=cyclonedx-core-java-${cyclonedx-core-java.version}.jar
github-package-url.version=1.5.0
github-package-url.sha256=e45551727707acc0c56ac62d56964332ea0f138d6cc3656d988b9369150f5247