Merge remote-tracking branch 'origin/master'

CycloneDX · Jan 5, 2025 · 0f05e88 · 0f05e88
2 parents 3e6ae6f + 03d5a2c
commit 0f05e88
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/config b/config
diff --git a/schema/bom-1.6.schema.json b/schema/bom-1.6.schema.json
@@ -2237,7 +2237,7 @@
         "aggregate": {
           "$ref": "#/definitions/aggregateType",
           "title": "Aggregate",
-          "description": "Specifies an aggregate type that describe how complete a relationship is."
+          "description": "Specifies an aggregate type that describes how complete a relationship is."
         },
         "assemblies": {
           "type": "array",

diff --git a/schema/bom-1.6.xsd b/schema/bom-1.6.xsd
@@ -2672,7 +2672,7 @@ limitations under the License.
             <xs:element name="copyright" type="bom:copyrightsType" minOccurs="0" maxOccurs="1">
                 <xs:annotation>
                     <xs:documentation>
-                        opyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
+                        Copyright evidence captures intellectual property assertions, providing evidence of possible ownership and legal protection.
                     </xs:documentation>
                 </xs:annotation>
             </xs:element>
@@ -2715,7 +2715,7 @@ limitations under the License.
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:element name="aggregate" type="bom:aggregateType" default="not_specified">
                 <xs:annotation>
-                    <xs:documentation>Specifies an aggregate type that describe how complete a relationship is.</xs:documentation>
+                    <xs:documentation>Specifies an aggregate type that describes how complete a relationship is.</xs:documentation>
                 </xs:annotation>
             </xs:element>
             <xs:element name="assemblies" minOccurs="0" maxOccurs="1">

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -55,7 +55,7 @@
         <lib.commons.lang3.version>3.17.0</lib.commons.lang3.version>
         <lib.commons.text.version>1.12.0</lib.commons.text.version>
         <lib.unirest.version>1.4.9</lib.unirest.version>
-        <lib.cyclonedx.core.java.version>9.0.5</lib.cyclonedx.core.java.version>
+        <lib.cyclonedx.core.java.version>10.0.0</lib.cyclonedx.core.java.version>
     </properties>
 
     <scm>

diff --git a/tools/src/test/php/composer.json b/tools/src/test/php/composer.json
@@ -5,7 +5,7 @@
     "ext-dom": "*",
     "ext-json": "*",
     "ext-libxml": "*",
-    "opis/json-schema": "2.3"
+    "opis/json-schema": "2.4.1"
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest"