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

Backport: Support ingestion of CycloneDX v1.6 BOMs #3863

Merged
merged 1 commit into from
Jun 22, 2024

Conversation

nscuro
Copy link
Member

@nscuro nscuro commented Jun 22, 2024

Description

Adds support for ingestion of CycloneDX v1.6 BOMs.

  • Updates cyclonedx-core-java to version 9.0.3
  • Bumps Jackson to version 2.17.1 to resolve compatibility issues with cyclonedx-core-java
  • Resolve various compilation errors due to refactoring in cyclonedx-core-java
  • Add validator tests for all CycloneDX versions

Note that BOM exports will continue to use v1.5 for the time being. This avoids breaking users' workflows in case their tooling doesn't yet support v1.6.

Addressed Issue

Closes #3584
Backports #3710

Additional Details

N/A

Checklist

  • I have read and understand the contributing guidelines
  • This PR fixes a defect, and I have provided tests to verify that the fix is effective
  • This PR implements an enhancement, and I have provided tests to verify that it works as intended
  • This PR introduces changes to the database model, and I have added corresponding update logic
  • This PR introduces new or alters existing behavior, and I have updated the documentation accordingly

* Updates `cyclonedx-core-java` to version `9.0.3`
* Bumps Jackson to version `2.17.1` to resolve compatibility issues with `cyclonedx-core-java`
* Resolve various compilation errors due to refactoring in `cyclonedx-core-java`
* Add validator tests for all CycloneDX versions

Note that BOM exports will continue to use v1.5 for the time being. This avoids breaking users' workflows in case their tooling doesn't yet support v1.6.

Closes DependencyTrack#3584

Signed-off-by: nscuro <nscuro@protonmail.com>
@nscuro nscuro added enhancement New feature or request cdx-1.6 Related to CycloneDX specification v1.6 labels Jun 22, 2024
@nscuro nscuro added this to the 4.11.4 milestone Jun 22, 2024
Copy link

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for bbedc381 69.44% (target: 70.00%)
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (bbedc38) Report Missing Report Missing Report Missing
Head commit (3706c3b) 22079 16809 76.13%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#3863) 36 25 69.44%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences


🚀 Don’t miss a bit, follow what’s new on Codacy.

Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.

@nscuro nscuro merged commit 93a32e1 into DependencyTrack:4.11.x Jun 22, 2024
5 of 7 checks passed
@nscuro nscuro deleted the backport-pr-3710 branch June 22, 2024 16:09
nscuro added a commit to DependencyTrack/hyades-apiserver that referenced this pull request Jun 24, 2024
* Updates `cyclonedx-core-java` to version `9.0.3`
* ~Bumps Jackson to version `2.17.1` to resolve compatibility issues with `cyclonedx-core-java`~
    * Jackson was already updated
* Resolve various compilation errors due to refactoring in `cyclonedx-core-java`
* Add validator tests for all CycloneDX versions

Note that BOM exports will continue to use v1.5 for the time being. This avoids breaking users' workflows in case their tooling doesn't yet support v1.6.

Ports DependencyTrack/dependency-track#3863 from Dependency-Track v4.11.4.

Signed-off-by: nscuro <nscuro@protonmail.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cdx-1.6 Related to CycloneDX specification v1.6 enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant