Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CycloneDX core java to release 10.1.0 for XML fix #4106

Merged
merged 2 commits into from
Jan 6, 2025
+7 −9
Merged

Update CycloneDX core java to release 10.1.0 for XML fix #4106

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fe2bf8
Update CycloneDX core java to release 10.1.0 for XML fix
andrew-m-leonard Jan 2, 2025
14cd0a3
Merge branch 'master' of github.com:adoptium/temurin-build into CDX_xml
andrew-m-leonard Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Loading
Loading status checks…
Update CycloneDX core java to release 10.1.0 for XML fix 
Signed-off-by: Andrew Leonard <[email protected]>
@andrew-m-leonard
andrew-m-leonard committed Jan 2, 2025
commit 8fe2bf8b561ccbf2564438a0f46263c2a8f294df
12 changes: 5 additions & 7 deletions cyclonedx-lib/build.xml
View file
Original file line number Diff line number Diff line change
@@ -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"/>
4 changes: 2 additions & 2 deletions cyclonedx-lib/dependency_data/dependency_data.properties
View file
Original file line number Diff line number Diff line change
@@ -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