Merge pull request #322 from CycloneDX/1.5_support

1.5 support
CycloneDX · Sep 6, 2023 · 5629a91 · 5629a91
2 parents f35e970 + 87b2af3
commit 5629a91
Show file tree

Hide file tree

Showing 291 changed files with 29,338 additions and 2,864 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.cyclonedx</groupId>
     <artifactId>cyclonedx-core-java</artifactId>
     <packaging>jar</packaging>
-    <version>7.3.3-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
 
     <name>CycloneDX Core (Java)</name>
     <description>The CycloneDX core module provides a model representation of the BOM along with utilities to assist in creating, parsing, and validating BOMs.</description>

diff --git a/src/main/java/org/cyclonedx/BomGeneratorFactory.java b/src/main/java/org/cyclonedx/BomGeneratorFactory.java
@@ -21,12 +21,14 @@
 import org.cyclonedx.generators.json.BomJsonGenerator12;
 import org.cyclonedx.generators.json.BomJsonGenerator13;
 import org.cyclonedx.generators.json.BomJsonGenerator14;
+import org.cyclonedx.generators.json.BomJsonGenerator15;
 import org.cyclonedx.generators.xml.BomXmlGenerator;
 import org.cyclonedx.generators.xml.BomXmlGenerator10;
 import org.cyclonedx.generators.xml.BomXmlGenerator11;
 import org.cyclonedx.generators.xml.BomXmlGenerator12;
 import org.cyclonedx.generators.xml.BomXmlGenerator13;
 import org.cyclonedx.generators.xml.BomXmlGenerator14;
+import org.cyclonedx.generators.xml.BomXmlGenerator15;
 import org.cyclonedx.model.Bom;
 import org.cyclonedx.generators.json.BomJsonGenerator;
 
@@ -50,8 +52,10 @@ public static BomXmlGenerator createXml(CycloneDxSchema.Version version, Bom bom
                 return new BomXmlGenerator12(bom);
             case VERSION_13:
                 return new BomXmlGenerator13(bom);
-            default:
+            case VERSION_14:
                 return new BomXmlGenerator14(bom);
+            default:
+                return new BomXmlGenerator15(bom);
         }
     }
 
@@ -61,8 +65,10 @@ public static BomJsonGenerator createJson(final CycloneDxSchema.Version version,
                 return new BomJsonGenerator12(bom);
             case VERSION_13:
                 return new BomJsonGenerator13(bom);
-            default:
+            case VERSION_14:
                 return new BomJsonGenerator14(bom);
+            default:
+                return new BomJsonGenerator15(bom);
         }
     }
 }