Merge pull request #4142 from Gepardgame/feat/set-to-empty-version-wh…

…en-non-given Use empty string instead of `SNAPSHOT` as version in BOM download if project doesn't have a version
DependencyTrack · Sep 12, 2024 · edb95ce · edb95ce
2 parents eb3e74e + e7eda8c
commit edb95ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/dependencytrack/parser/cyclonedx/util/ModelConverter.java b/src/main/java/org/dependencytrack/parser/cyclonedx/util/ModelConverter.java
@@ -708,7 +708,7 @@ public static org.cyclonedx.model.Metadata createMetadata(final Project project)
             cycloneComponent.setGroup(StringUtils.trimToNull(project.getGroup()));
             cycloneComponent.setName(StringUtils.trimToNull(project.getName()));
             if (StringUtils.trimToNull(project.getVersion()) == null) {
-                cycloneComponent.setVersion("SNAPSHOT"); // Version is required per CycloneDX spec
+                cycloneComponent.setVersion(""); // Version is required per CycloneDX spec
             } else {
                 cycloneComponent.setVersion(StringUtils.trimToNull(project.getVersion()));
             }

diff --git a/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java
@@ -252,7 +252,7 @@ public void exportProjectAsCycloneDxInventoryTest() {
                               "name": "projectSupplier"
                             },
                             "name": "acme-app",
-                            "version": "SNAPSHOT"
+                            "version": ""
                         },
                         "manufacture": {
                           "name": "projectManufacturer"
@@ -492,7 +492,7 @@ public void exportProjectAsCycloneDxInventoryWithVulnerabilitiesTest() {
                             "type": "application",
                             "bom-ref": "${json-unit.matches:projectUuid}",
                             "name": "acme-app",
-                            "version": "SNAPSHOT"
+                            "version": ""
                         },
                         "tools": [
                             {
@@ -686,7 +686,7 @@ public void exportProjectAsCycloneDxVdrTest() {
                             "type": "application",
                             "bom-ref": "${json-unit.matches:projectUuid}",
                             "name": "acme-app",
-                            "version": "SNAPSHOT"
+                            "version": ""
                         },
                         "tools": [
                             {