Skip to content

Commit

Permalink
tests: java tests run agsinst CDX1.5
Browse files Browse the repository at this point in the history
Signed-off-by: Jan Kowalleck <[email protected]>
  • Loading branch information
jkowalleck committed Dec 12, 2023
1 parent cf6b1bc commit 7b7ea13
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 7b7ea13

Please sign in to comment.