Merge pull request #32 from Badya/project-supplier-field

Use root document supplier field value for project modules in SBOM
spdx · Aug 23, 2023 · 87ce3d9 · 87ce3d9
2 parents 2865aec + 6840c0b
commit 87ce3d9
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/main/java/org/spdx/sbom/gradle/utils/SpdxDocumentBuilder.java b/src/main/java/org/spdx/sbom/gradle/utils/SpdxDocumentBuilder.java
@@ -266,12 +266,9 @@ private SpdxPackage createProjectPackage(ResolvedComponentResult resolvedCompone
               + " has no specified version");
       version = "NOASSERTION";
     }
-    var supplier = "NOASSERTION";
-    if (pi == describesProject) {
-      supplier = documentInfo.getPackageSupplier().orElse("NOASSERTION");
-      if (supplier.equals("NOASSERTION")) {
-        logger.warn("supplier not set for project " + pi.getName());
-      }
+    var supplier = documentInfo.getPackageSupplier().orElse("NOASSERTION");
+    if (supplier.equals("NOASSERTION")) {
+      logger.warn("supplier not set for project " + pi.getName());
     }
     SpdxPackageBuilder builder =
         doc.createPackage(