From 7b7ea1314aba8a916b53d8296bb5dc2c84442991 Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 12 Dec 2023 10:15:32 +0100 Subject: [PATCH] tests: java tests run agsinst CDX1.5 Signed-off-by: Jan Kowalleck --- tools/pom.xml | 2 +- .../java/org/cyclonedx/schema/BaseSchemaVerificationTest.java | 1 + .../java/org/cyclonedx/schema/JsonSchemaVerificationTest.java | 2 ++ .../java/org/cyclonedx/schema/XmlSchemaVerificationTest.java | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/pom.xml b/tools/pom.xml index d074df4f..78655387 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -55,7 +55,7 @@ 3.6 1.2 1.4.9 - 7.2.0 + 8.0.3 diff --git a/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java b/tools/src/test/java/org/cyclonedx/schema/BaseSchemaVerificationTest.java index ff45bd20..faae872b 100644 --- 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 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 index 55716982..3862bb14 100644 --- 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 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 index 12494921..01434b00 100644 --- 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 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; }