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

fix: align XML schema with JSON schema for Dependency type #146 #158

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: align XML schema with JSON schema for Dependency type #146 #158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee0dd89
fix: align XML schema with JSON schema for `Dependency` type #146
madpah Sep 13, 2022
b1b54a1
Merge branch 'master' into fix/align-dependency-type-definition-json-…
jkowalleck Jun 14, 2023
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
6 changes: 3 additions & 3 deletions schema/bom-1.4.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ limitations under the License.
targetNamespace="http://cyclonedx.org/schema/bom/1.4"
vc:minVersion="1.0"
vc:maxVersion="1.1"
version="1.4.2">
version="1.4.3">

<xs:import namespace="http://cyclonedx.org/schema/spdx" schemaLocation="http://cyclonedx.org/schema/spdx"/>

Expand Down Expand Up @@ -1188,11 +1188,11 @@ limitations under the License.

<xs:complexType name="dependencyType">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="dependency" type="bom:dependencyType"/>
<xs:element name="dependency" type="bom:refType"/>
Copy link
Member

Choose a reason for hiding this comment

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

❌ this is a breaking change.

the following would no longer be valid, but was valid before

<bom nmlns="http://cyclonedx.org/schema/bom/1.4">
<dependencies>
  <dependency ref="foo">
    <dependencies>
     <dependency ref="bar" />
    </dependencies>
  </dependency>
</dependencies>
</bom>

Copy link
Author

Choose a reason for hiding this comment

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

You are not wrong - this is a breaking change. Does this mean we have to wait until 1.5 to get this "aligned"?

Copy link
Member

Choose a reason for hiding this comment

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

@stevespringett , @CycloneDX/core-team , @CycloneDX/industry-working-group

</xs:sequence>
<xs:attribute name="ref" type="bom:refType" use="required">
<xs:annotation>
<xs:documentation>References a component or service by the its bom-ref attribute</xs:documentation>
<xs:documentation>References a component or service by its bom-ref attribute</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:anyAttribute namespace="##other" processContents="lax">
Expand Down