Skip to content

Commit 58e5ad2

Browse files
jkowalleckjkowalleck
committed
Merge branch '1.7-dev' into 1.7-dev-citations
2 parents a3d7d01 + d88ff39 commit 58e5ad2

30 files changed

+2645
-336
lines changed

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
[![Build Status](https://github.com/CycloneDX/specification/workflows/CI%20Build/badge.svg)](https://github.com/CycloneDX/specification/actions?workflow=CI+Build)
1+
[![Build Docs](https://github.com/CycloneDX/specification/actions/workflows/build_docs.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/build_docs.yml)
2+
[![CT Java](https://github.com/CycloneDX/specification/actions/workflows/test_java.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_java.yml)
3+
[![CT JavaScript](https://github.com/CycloneDX/specification/actions/workflows/test_js.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_js.yml)
4+
[![CT PHP](https://github.com/CycloneDX/specification/actions/workflows/test_php.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_php.yml)
5+
[![CT ProtoBuf](https://github.com/CycloneDX/specification/actions/workflows/test_proto.yml/badge.svg)](https://github.com/CycloneDX/specification/actions/workflows/test_proto.yml)
26
[![License][license-image]][license-url]
37
[![Website](https://img.shields.io/badge/https://-cyclonedx.org-blue.svg)](https://cyclonedx.org/)
48
[![Slack Invite](https://img.shields.io/badge/Slack-Join-blue?logo=slack&labelColor=393939)](https://cyclonedx.org/slack/invite)

‎schema/bom-1.7.proto‎

Lines changed: 225 additions & 5 deletions
Large diffs are not rendered by default.

‎schema/bom-1.7.schema.json‎

Lines changed: 536 additions & 157 deletions
Large diffs are not rendered by default.

‎schema/bom-1.7.xsd‎

Lines changed: 680 additions & 173 deletions
Large diffs are not rendered by default.

‎tools/src/test/resources/1.7/invalid-metadata-distribution-1.7.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
3+
"bomFormat": "CycloneDX",
4+
"specVersion": "1.7",
5+
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
6+
"version": 1,
7+
"metadata": {
8+
"distribution": "Unrestricted"
9+
},
10+
"components": []
11+
}

‎tools/src/test/resources/1.7/invalid-metadata-distribution-1.7.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0"?>
2+
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
3+
<metadata>
4+
<distribution>Unrestricted</distribution>
5+
</metadata>
6+
<components />
7+
</bom>

‎tools/src/test/resources/1.7/valid-external-reference-properties-1.7.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
3+
"bomFormat": "CycloneDX",
4+
"specVersion": "1.7",
5+
"serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
6+
"version": 1,
7+
"components": [
8+
{
9+
"type": "application",
10+
"name": "dummy",
11+
"description": "this component has an external reference with properties",
12+
"externalReferences": [
13+
{
14+
"type": "component-analysis-report",
15+
"url": "http://example.com/extref/component-analysis-report",
16+
"properties": [
17+
{
18+
"name": "author",
19+
"value": "John Doe"
20+
},
21+
{
22+
"name": "timestamp",
23+
"value": "2025-01-27T12:27:26Z"
24+
}
25+
]
26+
}
27+
]
28+
}
29+
]
30+
}

‎tools/src/test/resources/1.7/valid-external-reference-properties-1.7.textproto‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# proto-file: schema/bom-1.7.proto
2+
# proto-message: Bom
3+
4+
spec_version: "1.7"
5+
version: 1
6+
serial_number: "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79"
7+
components {
8+
type: CLASSIFICATION_APPLICATION
9+
name: "dummy"
10+
description: "this component has an external reference with properties"
11+
external_references {
12+
type: EXTERNAL_REFERENCE_TYPE_COMPONENT_ANALYSIS_REPORT
13+
url: "http://example.com/extref/component-analysis-report"
14+
properties {
15+
name: "author"
16+
value: "John Doe"
17+
}
18+
properties {
19+
name: "timestamp"
20+
value: "2025-01-27T12:27:26Z"
21+
}
22+
}
23+
}

‎tools/src/test/resources/1.7/valid-external-reference-properties-1.7.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0"?>
2+
<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
3+
<components>
4+
<component type="application">
5+
<name>dummy</name>
6+
<description>this component has an external reference with properties</description>
7+
<externalReferences>
8+
<reference type="component-analysis-report">
9+
<url>http://example.com/extref/component-analysis-report</url>
10+
<properties>
11+
<property name="author">John Doe</property>
12+
<property name="timestamp">2025-01-27T12:27:26Z</property>
13+
</properties>
14+
</reference>
15+
</externalReferences>
16+
</component>
17+
</components>
18+
</bom>

‎tools/src/test/resources/1.7/valid-license-expression-with-licensing-1.7.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
3+
"bomFormat": "CycloneDX",
4+
"specVersion": "1.7",
5+
"serialNumber": "urn:uuid:78a32681-a31f-4097-b151-7b771cc58157",
6+
"version": 1,
7+
"components": [
8+
{
9+
"type": "library",
10+
"publisher": "Acme Inc",
11+
"group": "com.acme",
12+
"name": "cryptographic-provider",
13+
"version": "2.2.0",
14+
"licenses": [
15+
{
16+
"bom-ref": "acme-license-1",
17+
"expression": "LicenseRef-AcmeCommercialLicense",
18+
"licensing": {
19+
"altIds": [
20+
"acme",
21+
"acme-license"
22+
],
23+
"licensor": {
24+
"organization": {
25+
"name": "Acme Inc",
26+
"contact": [
27+
{
28+
"name": "Acme Licensing Fulfillment",
29+
"email": "[email protected]"
30+
}
31+
]
32+
}
33+
},
34+
"licensee": {
35+
"organization": {
36+
"name": "Example Co."
37+
}
38+
},
39+
"purchaser": {
40+
"individual": {
41+
"name": "Samantha Wright",
42+
"email": "[email protected]",
43+
"phone": "800-555-1212"
44+
}
45+
},
46+
"purchaseOrder": "PO-12345",
47+
"licenseTypes": [
48+
"appliance"
49+
],
50+
"lastRenewal": "2022-04-13T20:20:39+00:00",
51+
"expiration": "2023-04-13T20:20:39+00:00"
52+
}
53+
}
54+
]
55+
}
56+
]
57+
}

0 commit comments

Comments
 (0)