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.

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

Fix various SBOM creation problems #4077

Merged
merged 9 commits into from
Dec 5, 2024

Conversation

andrew-m-leonard
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard commented Dec 4, 2024

  • Fix benign build ERROR with createSBOM jar SHA list
11:37:51  ERROR: Cannot determine jar version from /home/jenkins/workspace/build-scripts/jobs/jdk21u/jdk21u-linux-x64-temurin/sbin/../cyclonedx-lib/dependency_data/dependency_data.properties for SBOM creation dependency temurin-gen-cdxa.jar.
  • Bom.metadata not being created correctly for addComponentProp, luckily it is the first method called, so didn't cause a problem!
  • Rededundent addExternalReference and addComponentExtRef were not removed and unittests were actually failing, but they were no being tested with fail on error! so passed!
  • Metadata.tools has been deprecated in CycloneDX 1.0.6 spec and will be removed at some point, replaced by ToolInformation.Component
  • Add the 3 new extra CycloneDX 1.0.6 dependency jars to the SBOM classpath

@andrew-m-leonard andrew-m-leonard self-assigned this Dec 4, 2024
@github-actions github-actions bot added jenkins Issues that enhance or fix our jenkins server testing Issues that enhance or fix our test suites labels Dec 4, 2024
@karianna
Copy link
Contributor

karianna commented Dec 5, 2024

@andrew-m-leonard linter fixes required

@andrew-m-leonard andrew-m-leonard requested review from sxa, adamfarley and Haroon-Khel and removed request for adamfarley December 5, 2024 10:37
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I trust you to have tested this so I'm not analyzing all the logic paths too closely in this review, but I suggest you accept the suggestion to remove the extra space before merging.

sbin/build.sh Outdated Show resolved Hide resolved
Co-authored-by: Stewart X Addison <[email protected]>
@Haroon-Khel
Copy link
Contributor

Ill rebase #4075 with these changes once this pr gets merged

@andrew-m-leonard andrew-m-leonard merged commit aa86fc7 into adoptium:master Dec 5, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jenkins Issues that enhance or fix our jenkins server testing Issues that enhance or fix our test suites
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants