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

Ship cyclonedx-bom v0.6.0 #710

Merged
merged 6 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions cargo-cyclonedx/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.5.1 - UNRELEASED

### Added

- Emitting CycloneDX 1.5 is now supported. The data emitted is unchanged.

## 0.5.0 - 2024-03-01

### Added
Expand Down
4 changes: 2 additions & 2 deletions cargo-cyclonedx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-cyclonedx"
version = "0.5.0"
version = "0.5.1"
categories = ["command-line-utilities", "development-tools", "development-tools::cargo-plugins"]
description = "CycloneDX Software Bill of Materials (SBOM) for Rust Crates"
keywords = ["sbom", "bom", "components", "dependencies", "owasp"]
Expand All @@ -25,7 +25,7 @@ anyhow = "1.0.75"
cargo-lock = "9.0.0"
cargo_metadata = "0.18.1"
clap = { version = "4.4.11", features = ["derive"] }
cyclonedx-bom = { version = "0.5.0", path = "../cyclonedx-bom" }
cyclonedx-bom = { version = "0.6.0", path = "../cyclonedx-bom" }
env_logger = "0.10.0"
log = "0.4.20"
once_cell = "1.18.0"
Expand Down
2 changes: 1 addition & 1 deletion cargo-cyclonedx/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Defaults to the host target, as printed by 'rustc -vV'"
#[clap(long = "license-accept-named", action=ArgAction::Append)]
pub license_accept_named: Vec<String>,

/// The CycloneDX specification version to output: `1.3` or `1.4`. Defaults to 1.3
/// The CycloneDX specification version to output: `1.3`, `1.4` or `1.5`. Defaults to 1.3
#[clap(long = "spec-version")]
pub spec_version: Option<SpecVersion>,
}
Expand Down
24 changes: 24 additions & 0 deletions cyclonedx-bom/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.6.0 - UNRELEASED

### Added

- Added support for CycloneDX version 1.5, necessitating a number of breaking changes to the API.
- Added the ability to turn a `NormalizedString` into a `String` without cloning ([#707])
- Added the ability to view a number of types as a `&str` to reduce the necessary cloning ([#708])
- Added an ability to parse a `serde_json::Value` into a CycloneDX document ([#705])
- Added automatic validation of generated JSON against the official CycloneDX schemas ([#653])

### Fixed

- Added support for `external_references` field on `Tool` introduced in CycloneDX 1.4 but accidentally omitted from the parser ([#709])

### Changed

- Introduced the `cyclonedx-bom-macros` crate with a proc macro to eliminate copy-pasted code between various spec versions
- Multiple refactors to make the code simpler and easier to maintain

## 0.5.0 - 2024-02-21

### Changed
Expand Down Expand Up @@ -44,3 +63,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#609]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/609
[#616]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/616
[#618]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/618
[#653]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/653
[#705]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/705
[#707]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/707
[#708]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/708
[#709]: https://github.com/CycloneDX/cyclonedx-rust-cargo/pull/709
2 changes: 1 addition & 1 deletion cyclonedx-bom/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cyclonedx-bom"
version = "0.5.0"
version = "0.6.0"
description = "CycloneDX Software Bill of Materials Library"
categories = []
keywords = ["sbom", "bom", "components", "dependencies", "owasp"]
Expand Down
Loading