Skip to content

Commit ee5cbce

Browse files
authored
Merge pull request #4480 from nscuro/issue-4478
2 parents 0e7ee36 + 332e0d4 commit ee5cbce

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/main/java/org/dependencytrack/persistence/ComponentQueryManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ public Component cloneComponent(Component sourceComponent, Project destinationPr
370370
component.setCpe(sourceComponent.getCpe());
371371
component.setPurl(sourceComponent.getPurl());
372372
component.setPurlCoordinates(sourceComponent.getPurlCoordinates());
373+
component.setSwidTagId(sourceComponent.getSwidTagId());
373374
component.setInternal(sourceComponent.isInternal());
374375
component.setDescription(sourceComponent.getDescription());
375376
component.setCopyright(sourceComponent.getCopyright());

src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1907,6 +1907,7 @@ public void cloneProjectTest() {
19071907
componentA.setProject(project);
19081908
componentA.setName("acme-lib-a");
19091909
componentA.setVersion("2.0.0");
1910+
componentA.setSwidTagId("swidTagId");
19101911
componentA.setSupplier(componentSupplier);
19111912
qm.persist(componentA);
19121913

@@ -1976,7 +1977,8 @@ public void cloneProjectTest() {
19761977
"objectType": "COMPONENT",
19771978
"uuid": "${json-unit.matches:notSourceComponentUuid}",
19781979
"name": "acme-lib-a",
1979-
"version": "2.0.0"
1980+
"version": "2.0.0",
1981+
"swidTagId":"swidTagId"
19801982
}
19811983
]
19821984
""");
@@ -2006,6 +2008,7 @@ public void cloneProjectTest() {
20062008
assertThat(clonedComponent.getUuid()).isNotEqualTo(componentA.getUuid());
20072009
assertThat(clonedComponent.getName()).isEqualTo("acme-lib-a");
20082010
assertThat(clonedComponent.getVersion()).isEqualTo("2.0.0");
2011+
assertThat(clonedComponent.getSwidTagId()).isEqualTo("swidTagId");
20092012
assertThat(clonedComponent.getSupplier()).isNotNull();
20102013
assertThat(clonedComponent.getSupplier().getName()).isEqualTo("componentSupplier");
20112014
assertThatJson(clonedComponent.getDirectDependencies())

0 commit comments

Comments
 (0)