Skip to content

Commit 0f05e88

Browse files
Merge remote-tracking branch 'origin/master'
2 parents 3e6ae6f + 03d5a2c commit 0f05e88

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

config

Whitespace-only changes.

schema/bom-1.6.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2237,7 +2237,7 @@
22372237
"aggregate": {
22382238
"$ref": "#/definitions/aggregateType",
22392239
"title": "Aggregate",
2240-
"description": "Specifies an aggregate type that describe how complete a relationship is."
2240+
"description": "Specifies an aggregate type that describes how complete a relationship is."
22412241
},
22422242
"assemblies": {
22432243
"type": "array",

schema/bom-1.6.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2672,7 +2672,7 @@ limitations under the License.
26722672
<xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
26732673
<xs:annotation>
26742674
<xs:documentation>
2675-
opyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
2675+
Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
26762676
</xs:documentation>
26772677
</xs:annotation>
26782678
</xs:element>
@@ -2715,7 +2715,7 @@ limitations under the License.
27152715
<xs:sequence minOccurs="0" maxOccurs="unbounded">
27162716
<xs:element name="aggregate" type="bom:aggregateType" default="not_specified">
27172717
<xs:annotation>
2718-
<xs:documentation>Specifies an aggregate type that describe how complete a relationship is.</xs:documentation>
2718+
<xs:documentation>Specifies an aggregate type that describes how complete a relationship is.</xs:documentation>
27192719
</xs:annotation>
27202720
</xs:element>
27212721
<xs:element name="assemblies" minOccurs="0" maxOccurs="1">

tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<lib.commons.lang3.version>3.17.0</lib.commons.lang3.version>
5656
<lib.commons.text.version>1.12.0</lib.commons.text.version>
5757
<lib.unirest.version>1.4.9</lib.unirest.version>
58-
<lib.cyclonedx.core.java.version>9.0.5</lib.cyclonedx.core.java.version>
58+
<lib.cyclonedx.core.java.version>10.0.0</lib.cyclonedx.core.java.version>
5959
</properties>
6060

6161
<scm>

tools/src/test/php/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"ext-dom": "*",
66
"ext-json": "*",
77
"ext-libxml": "*",
8-
"opis/json-schema": "2.3"
8+
"opis/json-schema": "2.4.1"
99
},
1010
"require-dev": {
1111
"roave/security-advisories": "dev-latest"

0 commit comments

Comments
 (0)