Skip to content

Commit b06209d

Browse files
authored
Merge pull request #5147 from nscuro/issue-5107
2 parents f0ae475 + 4594f82 commit b06209d

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

src/main/java/org/dependencytrack/parser/cyclonedx/CycloneDXExporter.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.dependencytrack.parser.cyclonedx;
2020

21+
import alpine.persistence.ScopedCustomization;
2122
import org.cyclonedx.Version;
2223
import org.cyclonedx.exception.GeneratorException;
2324
import org.cyclonedx.generators.BomGeneratorFactory;
@@ -29,6 +30,7 @@
2930
import org.dependencytrack.parser.cyclonedx.util.ModelConverter;
3031
import org.dependencytrack.persistence.QueryManager;
3132

33+
import javax.jdo.FetchGroup;
3234
import java.util.ArrayList;
3335
import java.util.List;
3436
import java.util.UUID;
@@ -57,8 +59,13 @@ public CycloneDXExporter(final CycloneDXExporter.Variant variant, final QueryMan
5759
}
5860

5961
public Bom create(final Project project) {
60-
final List<Component> components = qm.getAllComponents(project);
61-
final List<ServiceComponent> services = qm.getAllServiceComponents(project);
62+
final List<Component> components;
63+
final List<ServiceComponent> services;
64+
try (final var ignored = new ScopedCustomization(qm.getPersistenceManager())
65+
.withFetchGroup(FetchGroup.ALL)) {
66+
components = qm.getAllComponents(project);
67+
services = qm.getAllServiceComponents(project);
68+
}
6269
final List<Finding> findings = switch (variant) {
6370
case INVENTORY_WITH_VULNERABILITIES, VDR, VEX -> qm.getFindings(project, true);
6471
default -> null;

0 commit comments

Comments
 (0)