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

Jump to bottom

feat(general): upgrade cyclonedx-python-lib to version 5.0.0 #4754

Merged
merged 10 commits into from
Oct 25, 2023
Merged

feat(general): upgrade cyclonedx-python-lib to version 5.0.0 #4754

merged 10 commits into from
Oct 25, 2023

Conversation

gruebel
Copy link
Contributor

@gruebel gruebel commented Mar 25, 2023

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Description

  • this version upgrade is a bit tricky, because the output changes a bit. It now includes a namespace prefix, not sure, if we need to bump the minor version of checkov for this 🤔

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my feature, policy, or fix is effective and works
  • New and existing tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@gruebel
Merge remote-tracking branch 'origin/main' into upgrade-cyclonedx-ver…
cd935a4 
…sion

# Conflicts:
#	Pipfile.lock
#	tests/sca_image/outputs/results_cyclonedx.xml
#	tests/sca_package/outputs/results_cyclonedx.xml
#	tests/sca_package/outputs/results_cyclonedx_with_comma_in_licenses.xml
#	tests/sca_package/test_output_reports.py
#	tests/sca_package_2/outputs/results_cyclonedx.xml
@gruebel
fix merge conflicts
1396752
@gruebel
Merge remote-tracking branch 'origin/main' into upgrade-cyclonedx-ver…
89534ac 
…sion

# Conflicts:
#	Pipfile.lock
#	checkov/common/output/cyclonedx.py
#	tests/sca_package_2/outputs/results_cyclonedx.xml
@gruebel
bump to 5.0.0rc1
07a0194
@gruebel gruebel temporarily deployed to scan-security October 12, 2023 21:58 — with GitHub Actions Inactive
@gruebel
Copy link
Contributor Author

gruebel commented Oct 23, 2023

waiting for v5 release

@gruebel gruebel changed the title feat(general): upgrade cyclonedx-python-lib to version 4.0.0 feat(general): upgrade cyclonedx-python-lib to version 5.0.0 Oct 23, 2023
@gruebel
Merge remote-tracking branch 'origin/main' into upgrade-cyclonedx-ver…
6d0d68c 
…sion

# Conflicts:
#	Pipfile.lock
#	setup.py
#	tests/sca_package_2/outputs/results_cyclonedx.xml
@gruebel
update cycloneDX to 5.0.0 and lower bound it
44e1648
@gruebel gruebel temporarily deployed to scan-security October 25, 2023 08:00 — with GitHub Actions Inactive
@gruebel gruebel merged commit 7b110e1 into bridgecrewio:main Oct 25, 2023
33 checks passed
@gruebel gruebel deleted the upgrade-cyclonedx-version branch October 25, 2023 08:34
mikeurbanski1 pushed a commit that referenced this pull request Oct 25, 2023
@gruebel @actions-user
feat(general): upgrade cyclonedx-python-lib to version 5.0.0 (#4754)
c43c3dc 
* upgrade cyclonedx-python-lib to version 4.0.0

* fix tests

* fix tests

* fix image test

* fix merge conflicts

* bump to 5.0.0rc1

* update cycloneDX to 5.0.0 and lower bound it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NoaAzoulay NoaAzoulay NoaAzoulay approved these changes

@ChanochShayner ChanochShayner ChanochShayner approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gruebel @NoaAzoulay @ChanochShayner