[pull] master from CycloneDX:master#51
Merged
Merged
Conversation
…tch with json Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
… (so it matches the json spec) Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
performanceTradeoffs in valid-machine-learning-*.xml test files to verify the schema correctly validates multiple entries for these fields. Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
…proto) Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
…roto files Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
As discussed in ticket #726 and in CycloneDX/cyclonedx-python-lib#914, this PR fixes a schema mismatch where modelCard supports properties in JSON but was missing it in XML and Protobuf. Changes: Add optional properties to modelCardType in XML schemas: `bom-1.5.xsd`, `bom-1.6.xsd`, `bom-1.7.xsd` Add properties to ModelCard Protobuf message: `bom-1.5.proto`, `bom-1.6.proto`, `bom-1.7.proto` This is backward compatible (adds optional fields only). fixes #726
…#744) As discussed in ticket #737, the XML schema incorrectly restricts several ModelCard.Considerations list fields to a single entry. The JSON schema defines these fields as arrays, and other ModelCard list fields already allow multiple entries. This PR updates the XML schemas (1.5, 1.6, 1.7) so the following elements can contain multiple entries: `users/user` `useCases/useCase` `technicalLimitations/technicalLimitation` `performanceTradeoffs/performanceTradeoff` Additionally, the XML schema version attributes are bumped (patch-only) to reflect the schema change. fixes #737
## Fixed – Schema Alignment * Protobuf: added the optional, repeated field `ModelCard.property` ([#726] via [#743]) * XML: added the optional, repeated node `//modelCard/properties` ([#726] via [#743]) * XML: changed the node `//modelCard/considerations/users/user` from optional to optional and repeated ([#737] via [#744]) * XML: changed the node `//modelCard/considerations/useCases/useCase` from optional to optional and repeated ([#737] via [#744]) * XML: changed the node `//modelCard/considerations/technicalLimitations/technicalLimitation` from optional to optional and repeated ([#737] via [#744]) * XML: changed the node `//modelCard/considerations/performanceTradeoffs/performanceTradeoff` from optional to optional and repeated ([#737] via [#744]) ## Tests * Added test cases for the updated schemas. [#726]: #726 [#743]: #743 [#737]: #737 [#744]: #744 ----- - fixes #917 - fixes #726 - fixes #737 --- progress: https://github.com/CycloneDX/specification/milestone/13 intended release: v1.7.1 backports: - 1.5.1 - #933 - 1.6.2 - #934
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )