Skip to content

Commit 335dfab

Browse files
jkowalleckjkowalleck
authored
Merge branch 'master' into 1.6-dev
2 parents d309ee9 + 963e99b commit 335dfab

8 files changed

+77
-29
lines changed

‎.github/workflows/cibuild.yml ‎.github/workflows/build_docs.yml

+32-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI Build
1+
name: Build Docs
22

33
on:
44
push:
@@ -10,43 +10,51 @@ env:
1010
PYTHON_VERSION_DEFAULT: "3.10"
1111

1212
jobs:
13-
build:
13+
docs_xml:
1414
runs-on: ubuntu-latest
15+
defaults:
16+
run:
17+
working-directory: docgen/xml
1518
steps:
1619
- name: Checkout
1720
# see https://github.com/actions/checkout
1821
uses: actions/checkout@v4
19-
- name: Set up JDK
20-
# see https://github.com/actions/setup-java
21-
uses: actions/setup-java@v3
22-
with:
23-
java-version: '8'
24-
distribution: 'zulu'
25-
java-package: jdk
26-
- name: Build with Maven
27-
run: mvn -B package --file pom.xml
28-
working-directory: tools
2922
- name: Setup Python Environment
3023
# see https://github.com/actions/setup-python
31-
uses: actions/setup-python@v4
24+
uses: actions/setup-python@v5
3225
with:
3326
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
3427
architecture: 'x64'
35-
- name: Generate JSON Schema documentation
36-
run: ./gen.sh
37-
working-directory: docgen/json
38-
- name: Generate XML Schema documentation
28+
- name: Generate Schema documentation
3929
run: ./gen.sh
40-
working-directory: docgen/xml
41-
- name: Archive JSON Schema documentation
30+
- name: Archive Schema documentation
4231
# https://github.com/actions/upload-artifact
4332
uses: actions/upload-artifact@v3
4433
with:
45-
name: JSON-Schema-documentation
46-
path: docgen/json/docs
47-
- name: Archive XML Schema documentation
34+
name: XML-Schema-documentation
35+
path: docgen/xml/docs
36+
if-no-files-found: error
37+
docs_json:
38+
runs-on: ubuntu-latest
39+
defaults:
40+
run:
41+
working-directory: docgen/json
42+
steps:
43+
- name: Checkout
44+
# see https://github.com/actions/checkout
45+
uses: actions/checkout@v4
46+
- name: Setup Python Environment
47+
# see https://github.com/actions/setup-python
48+
uses: actions/setup-python@v5
49+
with:
50+
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
51+
architecture: 'x64'
52+
- name: Generate Schema documentation
53+
run: ./gen.sh
54+
- name: Archive Schema documentation
4855
# https://github.com/actions/upload-artifact
4956
uses: actions/upload-artifact@v3
5057
with:
51-
name: XML-Schema-documentation
52-
path: docgen/xml/docs
58+
name: JSON-Schema-documentation
59+
path: docgen/json/docs
60+
if-no-files-found: error

‎.github/workflows/test_java.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: CT Java
2+
3+
on:
4+
push:
5+
branches: ['master', 'main']
6+
pull_request:
7+
workflow_dispatch:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
defaults:
14+
run:
15+
working-directory: tools
16+
17+
jobs:
18+
test:
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
# see https://github.com/actions/checkout
23+
uses: actions/checkout@v4
24+
- name: Set up JDK
25+
# see https://github.com/actions/setup-java
26+
uses: actions/setup-java@v4
27+
with:
28+
java-version: '8'
29+
distribution: 'zulu'
30+
java-package: jdk
31+
- name: test with Maven
32+
run: mvn clean test

‎.github/workflows/js.yml ‎.github/workflows/test_js.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
22

3-
name: JS CI
3+
name: CT JavaScript
44

55
on:
66
push:
@@ -12,7 +12,6 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: true
1414

15-
1615
defaults:
1716
run:
1817
working-directory: tools/src/test/js
@@ -27,7 +26,7 @@ jobs:
2726
uses: actions/checkout@v4
2827
- name: Setup Node.js
2928
# see https://github.com/actions/setup-node
30-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3130
with:
3231
node-version: '20.x'
3332
- name: Install Depenencies

‎.github/workflows/php.yml ‎.github/workflows/test_php.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
# docs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
22

3-
name: PHP CI
3+
name: CT PHP
44

55
on:
66
push:
77
branches: ['master', 'main']
88
pull_request:
99
workflow_dispatch:
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
defaults:
1216
run:
1317
working-directory: tools/src/test/php

‎tools/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<lib.commons.lang3.version>3.6</lib.commons.lang3.version>
5656
<lib.commons.text.version>1.2</lib.commons.text.version>
5757
<lib.unirest.version>1.4.9</lib.unirest.version>
58-
<lib.cyclonedx.core.java.version>7.2.0</lib.cyclonedx.core.java.version>
58+
<lib.cyclonedx.core.java.version>8.0.3</lib.cyclonedx.core.java.version>
5959
</properties>
6060

6161
<scm>

‎tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ List<String> getAllResources() throws Exception {
2828
files.addAll(getResources("1.2/"));
2929
files.addAll(getResources("1.3/"));
3030
files.addAll(getResources("1.4/"));
31+
files.addAll(getResources("1.5/"));
3132
return files;
3233
}
3334

‎tools/src/test/java/org/cyclonedx/schema/JsonSchemaVerificationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
4040
schemaVersion = CycloneDxSchema.Version.VERSION_13;
4141
} else if (file.endsWith("-1.4.json")) {
4242
schemaVersion = CycloneDxSchema.Version.VERSION_14;
43+
} else if (file.endsWith("-1.5.json")) {
44+
schemaVersion = CycloneDxSchema.Version.VERSION_15;
4345
} else {
4446
schemaVersion = null;
4547
}

‎tools/src/test/java/org/cyclonedx/schema/XmlSchemaVerificationTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Collection<DynamicTest> dynamicTestsWithCollection() throws Exception {
4444
schemaVersion = CycloneDxSchema.Version.VERSION_13;
4545
} else if (file.endsWith("-1.4.xml")) {
4646
schemaVersion = CycloneDxSchema.Version.VERSION_14;
47+
} else if (file.endsWith("-1.5.xml")) {
48+
schemaVersion = CycloneDxSchema.Version.VERSION_15;
4749
} else {
4850
schemaVersion = null;
4951
}

0 commit comments

Comments
 (0)