Merge branch '1.6-dev' into 1.6-dev-attestations

CycloneDX · Dec 15, 2023 · 0a54c3d · 0a54c3d
2 parents e8ae437 + 335dfab
commit 0a54c3d
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 29 deletions.
diff --git a/.github/workflows/cibuild.yml → .github/workflows/build_docs.yml b/.github/workflows/cibuild.yml → .github/workflows/build_docs.yml
@@ -1,4 +1,4 @@
-name: CI Build
+name: Build Docs
 
 on:
   push:
@@ -10,43 +10,51 @@ env:
   PYTHON_VERSION_DEFAULT: "3.10"
 
 jobs:
-  build:
+  docs_xml:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: docgen/xml
     steps:
     - name: Checkout
       # see https://github.com/actions/checkout
       uses: actions/checkout@v4
-    - name: Set up JDK
-      # see https://github.com/actions/setup-java
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'zulu'
-        java-package: jdk
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-      working-directory: tools
     - name: Setup Python Environment
       # see https://github.com/actions/setup-python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
         architecture: 'x64'
-    - name: Generate JSON Schema documentation
-      run: ./gen.sh
-      working-directory: docgen/json
-    - name: Generate XML Schema documentation
+    - name: Generate Schema documentation
       run: ./gen.sh
-      working-directory: docgen/xml
-    - name: Archive JSON Schema documentation
+    - name: Archive Schema documentation
       # https://github.com/actions/upload-artifact
       uses: actions/upload-artifact@v3
       with:
-        name: JSON-Schema-documentation
-        path: docgen/json/docs
-    - name: Archive XML Schema documentation
+        name: XML-Schema-documentation
+        path: docgen/xml/docs
+        if-no-files-found: error
+  docs_json:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: docgen/json
+    steps:
+    - name: Checkout
+      # see https://github.com/actions/checkout
+      uses: actions/checkout@v4
+    - name: Setup Python Environment
+      # see https://github.com/actions/setup-python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
+        architecture: 'x64'
+    - name: Generate Schema documentation
+      run: ./gen.sh
+    - name: Archive Schema documentation
       # https://github.com/actions/upload-artifact
       uses: actions/upload-artifact@v3
       with:
-        name: XML-Schema-documentation
-        path: docgen/xml/docs
+        name: JSON-Schema-documentation
+        path: docgen/json/docs
+        if-no-files-found: error
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
@@ -0,0 +1,32 @@
+name: CT Java
+
+on:
+  push:
+    branches: ['master', 'main']
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    working-directory: tools
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      # see https://github.com/actions/checkout
+      uses: actions/checkout@v4
+    - name: Set up JDK
+      # see https://github.com/actions/setup-java
+      uses: actions/setup-java@v4
+      with:
+        java-version: '8'
+        distribution: 'zulu'
+        java-package: jdk
+    - name: test with Maven
+      run: mvn clean test
diff --git a/.github/workflows/js.yml → .github/workflows/test_js.yml b/.github/workflows/js.yml → .github/workflows/test_js.yml
@@ -1,6 +1,6 @@
 # docs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
 
-name: JS CI
+name: CT JavaScript
 
 on:
   push:
@@ -12,7 +12,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-
 defaults:
   run:
     working-directory: tools/src/test/js
@@ -27,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup Node.js
         # see https://github.com/actions/setup-node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
       - name: Install Depenencies

diff --git a/.github/workflows/php.yml → .github/workflows/test_php.yml b/.github/workflows/php.yml → .github/workflows/test_php.yml
@@ -1,13 +1,17 @@
 # docs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
 
-name: PHP CI
+name: CT PHP
 
 on:
   push:
     branches: ['master', 'main']
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     working-directory: tools/src/test/php

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -55,7 +55,7 @@
         <lib.commons.lang3.version>3.6</lib.commons.lang3.version>
         <lib.commons.text.version>1.2</lib.commons.text.version>
         <lib.unirest.version>1.4.9</lib.unirest.version>
-        <lib.cyclonedx.core.java.version>7.2.0</lib.cyclonedx.core.java.version>
+        <lib.cyclonedx.core.java.version>8.0.3</lib.cyclonedx.core.java.version>
     </properties>
 
     <scm>

diff --git a/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java
@@ -28,6 +28,7 @@ List<String> getAllResources() throws Exception {
         files.addAll(getResources("1.2/"));
         files.addAll(getResources("1.3/"));
         files.addAll(getResources("1.4/"));
+        files.addAll(getResources("1.5/"));
         return files;
     }
 

diff --git a/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java
@@ -40,6 +40,8 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
                     schemaVersion = CycloneDxSchema.Version.VERSION_13;
                 } else if (file.endsWith("-1.4.json")) {
                     schemaVersion = CycloneDxSchema.Version.VERSION_14;
+                } else if (file.endsWith("-1.5.json")) {
+                    schemaVersion = CycloneDxSchema.Version.VERSION_15;
                 } else {
                     schemaVersion = null;
                 }

diff --git a/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java
@@ -44,6 +44,8 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
                     schemaVersion = CycloneDxSchema.Version.VERSION_13;
                 } else if (file.endsWith("-1.4.xml")) {
                     schemaVersion = CycloneDxSchema.Version.VERSION_14;
+                } else if (file.endsWith("-1.5.xml")) {
+                    schemaVersion = CycloneDxSchema.Version.VERSION_15;
                 } else {
                     schemaVersion = null;
                 }