diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 20d417a6..9d5cae0e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -17,4 +17,4 @@ jobs: with: language: java repo-url: ${{ github.event.pull_request.head.repo.full_name || github.repository }} - commit-sha: ${{ github.event.pull_request.head.sha || github.sha }} \ No newline at end of file + commit-sha: ${{ github.event.pull_request.head.sha || github.sha }} diff --git a/src/main/java/io/github/guacsec/trustifyda/sbom/CycloneDXSbom.java b/src/main/java/io/github/guacsec/trustifyda/sbom/CycloneDXSbom.java index e7b8f1fa..a0294136 100644 --- a/src/main/java/io/github/guacsec/trustifyda/sbom/CycloneDXSbom.java +++ b/src/main/java/io/github/guacsec/trustifyda/sbom/CycloneDXSbom.java @@ -136,7 +136,6 @@ public Sbom addRoot(PackageURL rootRef, String license) { } } bom.getMetadata().setComponent(rootComponent); - bom.getComponents().add(rootComponent); bom.getDependencies().add(newDependency(rootRef)); return this; } @@ -266,13 +265,12 @@ public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, String s) if (s != null) { scope = Component.Scope.valueOf(s.toUpperCase()); } + String rootCoordinates = root != null ? root.getCoordinates() : null; Component srcComp = newComponent(sourceRef, scope); + boolean isRootSource = srcComp.getBomRef().equals(rootCoordinates); Dependency srcDep; - if (bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(srcComp.getBomRef()))) { - bom.addComponent(srcComp); - srcDep = newDependency(sourceRef); - bom.addDependency(srcDep); - } else { + if (isRootSource + || bom.getComponents().stream().anyMatch(c -> c.getBomRef().equals(srcComp.getBomRef()))) { Optional existingDep = bom.getDependencies().stream() .filter(d -> d.getRef().equals(srcComp.getBomRef())) @@ -283,13 +281,18 @@ public Sbom addDependency(PackageURL sourceRef, PackageURL targetRef, String s) srcDep = newDependency(sourceRef); bom.addDependency(srcDep); } + } else { + bom.addComponent(srcComp); + srcDep = newDependency(sourceRef); + bom.addDependency(srcDep); } Dependency targetDep = newDependency(targetRef); srcDep.addDependency(targetDep); if (bom.getDependencies().stream().noneMatch(d -> d.getRef().equals(targetDep.getRef()))) { bom.addDependency(targetDep); } - if (bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(targetDep.getRef()))) { + if (!targetDep.getRef().equals(rootCoordinates) + && bom.getComponents().stream().noneMatch(c -> c.getBomRef().equals(targetDep.getRef()))) { bom.addComponent(newComponent(targetRef, scope)); } return this; diff --git a/src/test/resources/msc/golang/expected_sbom_ca.json b/src/test/resources/msc/golang/expected_sbom_ca.json index a9c1d82c..88d348fa 100644 --- a/src/test/resources/msc/golang/expected_sbom_ca.json +++ b/src/test/resources/msc/golang/expected_sbom_ca.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:golang/github.com/sample/demo-app@v0.0.0", - "group" : "github.com/sample", - "name" : "demo-app", - "version" : "v0.0.0", - "purl" : "pkg:golang/github.com/sample/demo-app@v0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:golang/github.com/gin-gonic/gin@v1.6.0", diff --git a/src/test/resources/msc/golang/mvs_logic/expected_sbom_stack_analysis.json b/src/test/resources/msc/golang/mvs_logic/expected_sbom_stack_analysis.json index d7c34e32..8a394608 100644 --- a/src/test/resources/msc/golang/mvs_logic/expected_sbom_stack_analysis.json +++ b/src/test/resources/msc/golang/mvs_logic/expected_sbom_stack_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0", - "group": "github.com/rhecosystemappeng/saasi", - "name": "deployer", - "version": "v0.0.0", - "purl": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/cloud.google.com/go@v0.52.0", diff --git a/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_component_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_component_analysis.json index f016e749..fe3f982a 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_component_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_component_analysis.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:golang/golang.org/x/example@v0.0.0", - "group" : "golang.org/x", - "name" : "example", - "version" : "v0.0.0", - "purl" : "pkg:golang/golang.org/x/example@v0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:golang/github.com/spf13/cobra@v0.0.5", diff --git a/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_stack_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_stack_analysis.json index 23ff8c94..4ef6c353 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_stack_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_light_no_ignore/expected_sbom_stack_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/golang.org/x/example@v0.0.0", - "group": "golang.org/x", - "name": "example", - "version": "v0.0.0", - "purl": "pkg:golang/golang.org/x/example@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/spf13/viper@v1.3.2", diff --git a/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_component_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_component_analysis.json index fd874808..a4d48a3d 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_component_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_component_analysis.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0", - "group" : "github.com/rhecosystemappeng/saasi", - "name" : "deployer", - "version" : "v0.0.0", - "purl" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:golang/github.com/davecgh/go-spew@v1.1.1", diff --git a/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_stack_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_stack_analysis.json index df0f44fa..64617c37 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_stack_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_no_ignore/expected_sbom_stack_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0", - "group": "github.com/rhecosystemappeng/saasi", - "name": "deployer", - "version": "v0.0.0", - "purl": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/stretchr/testify@v1.8.3", diff --git a/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_component_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_component_analysis.json index 036b44af..360b6670 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_component_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_component_analysis.json @@ -13,13 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:golang/rhda-test@v0.0.0", - "name" : "rhda-test", - "version" : "v0.0.0", - "purl" : "pkg:golang/rhda-test@v0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:golang/github.com/emicklei/go-restful/v3@v3.0.0", diff --git a/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_stack_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_stack_analysis.json index d311fad9..604f7ce5 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_stack_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_no_path/expected_sbom_stack_analysis.json @@ -12,13 +12,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/rhda-test@v0.0.0", - "name": "rhda-test", - "version": "v0.0.0", - "purl": "pkg:golang/rhda-test@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/json-iterator/go@v1.1.9", diff --git a/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_component_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_component_analysis.json index ef824dfe..36311c56 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_component_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_component_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0", - "group": "github.com/devfile-samples", - "name": "devfile-sample-go-basic", - "version": "v0.0.0", - "purl": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/miekg/dns@v1.1.12", diff --git a/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_stack_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_stack_analysis.json index e609d9c6..3646b82a 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_stack_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_with_all_ignore/expected_sbom_stack_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0", - "group": "github.com/devfile-samples", - "name": "devfile-sample-go-basic", - "version": "v0.0.0", - "purl": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/ipfs/go-verifcid@v0.0.1", diff --git a/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_component_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_component_analysis.json index 81f3fa3f..8cf4dc61 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_component_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_component_analysis.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0", - "group" : "github.com/rhecosystemappeng/saasi", - "name" : "deployer", - "version" : "v0.0.0", - "purl" : "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:golang/github.com/davecgh/go-spew@v1.1.1", diff --git a/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_stack_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_stack_analysis.json index 29cc559c..28eb6c55 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_stack_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_with_ignore/expected_sbom_stack_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0", - "group": "github.com/rhecosystemappeng/saasi", - "name": "deployer", - "version": "v0.0.0", - "purl": "pkg:golang/github.com/rhecosystemappeng/saasi/deployer@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/stretchr/testify@v1.8.3", diff --git a/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_component_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_component_analysis.json index ed19a527..b2891630 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_component_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_component_analysis.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0", - "group" : "github.com/devfile-samples", - "name" : "devfile-sample-go-basic", - "version" : "v0.0.0", - "purl" : "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:golang/github.com/gin-gonic/gin@v1.6.0", diff --git a/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_stack_analysis.json b/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_stack_analysis.json index 96fc4fdb..8e4ccb66 100644 --- a/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_stack_analysis.json +++ b/src/test/resources/tst_manifests/golang/go_mod_with_one_ignored_prefix_go/expected_sbom_stack_analysis.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0", - "group": "github.com/devfile-samples", - "name": "devfile-sample-go-basic", - "version": "v0.0.0", - "purl": "pkg:golang/github.com/devfile-samples/devfile-sample-go-basic@v0.0.0" - }, { "type": "library", "bom-ref": "pkg:golang/github.com/ipfs/go-verifcid@v0.0.1", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_component_sbom.json index ac1cdaf0..96a407e7 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_stack_sbom.json index d9a4fa39..3c53998d 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_different_versions/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_component_sbom.json index ac1cdaf0..96a407e7 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_stack_sbom.json index d9a4fa39..3c53998d 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_duplicate_no_version/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_component_sbom.json index ac1c71c5..a2414bf8 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_component_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_stack_sbom.json index 3cc1bd12..ee3f6884 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_full_specification/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_component_sbom.json index ac1c71c5..a2414bf8 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_component_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_stack_sbom.json index 3cc1bd12..ee3f6884 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_named_params/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_component_sbom.json index 46016d1c..f1199d81 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_stack_sbom.json index d598383e..fdd6894a 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_ignore_notations/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group": "org.acme.dbaas", - "name": "postgresql-orm-quarkus", - "version": "1.0.0-SNAPSHOT", - "purl": "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type": "library", "bom-ref": "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_component_sbom.json index 46016d1c..f1199d81 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_stack_sbom.json index b056c566..d7a877c6 100644 --- a/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-groovy/deps_with_no_ignore_common_paths/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_component_sbom.json index ac1cdaf0..96a407e7 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_stack_sbom.json index d9a4fa39..3c53998d 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_different_versions/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_component_sbom.json index ac1cdaf0..96a407e7 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_stack_sbom.json index d9a4fa39..3c53998d 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_duplicate_no_version/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_component_sbom.json index ac1c71c5..a2414bf8 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_component_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_stack_sbom.json index 3cc1bd12..ee3f6884 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_full_specification/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_component_sbom.json index ac1c71c5..a2414bf8 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_component_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_stack_sbom.json index 3cc1bd12..ee3f6884 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_named_params/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_component_sbom.json index 46016d1c..f1199d81 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_stack_sbom.json index d598383e..fdd6894a 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_ignore_notations/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components": [ - { - "type": "application", - "bom-ref": "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group": "org.acme.dbaas", - "name": "postgresql-orm-quarkus", - "version": "1.0.0-SNAPSHOT", - "purl": "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type": "library", "bom-ref": "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_component_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_component_sbom.json index 46016d1c..f1199d81 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_stack_sbom.json b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_stack_sbom.json index b056c566..d7a877c6 100644 --- a/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/gradle-kotlin/deps_with_no_ignore_common_paths/expected_stack_sbom.json @@ -13,14 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_component_sbom.json index aa045138..7e42a8c7 100644 --- a/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-no-trivial-with-deps-and-ignore/demo@0.0.1", - "group" : "pom-no-trivial-with-deps-and-ignore", - "name" : "demo", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-no-trivial-with-deps-and-ignore/demo@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-web@3.1.3", diff --git a/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_stack_sbom.json index 72a808ca..7fdfe160 100644 --- a/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_no_trivial_with_ignore/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-no-trivial-with-deps-and-ignore/demo@0.0.1", - "group" : "pom-no-trivial-with-deps-and-ignore", - "name" : "demo", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-no-trivial-with-deps-and-ignore/demo@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-web@3.1.3", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_component_sbom.json index 8a3ec1fe..cb6d5594 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_component_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_stack_sbom.json index efe51671..116d77e8 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_artifact/expected_stack_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_component_sbom.json index 8a3ec1fe..cb6d5594 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_component_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_stack_sbom.json index efe51671..116d77e8 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_dependency/expected_stack_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_component_sbom.json index 8a3ec1fe..cb6d5594 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_component_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_stack_sbom.json index efe51671..116d77e8 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_group/expected_stack_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_component_sbom.json index 8a3ec1fe..cb6d5594 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_component_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_stack_sbom.json index efe51671..116d77e8 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_version/expected_stack_sbom.json @@ -13,16 +13,6 @@ "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" } }, - "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-and-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - } - ], "dependencies" : [ { "ref" : "pkg:maven/pom-with-deps-and-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_component_sbom.json index da902d08..bd368415 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-no-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_stack_sbom.json index 3fc277db..aae6e1f4 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_ignore_on_wrong/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-no-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_component_sbom.json index da902d08..bd368415 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-no-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_stack_sbom.json index 3fc277db..aae6e1f4 100644 --- a/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/deps_with_no_ignore/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1", - "group" : "pom-with-deps-no-ignore", - "name" : "pom-with-dependency-not-ignored-for-tests", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-for-tests@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/log4j/log4j@1.2.17", diff --git a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_component_sbom.json index c559054e..af869455 100644 --- a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-parent@2.3.5.RELEASE", - "group" : "org.springframework.boot", - "name" : "spring-boot-starter-parent", - "version" : "2.3.5.RELEASE", - "purl" : "pkg:maven/org.springframework.boot/spring-boot-starter-parent@2.3.5.RELEASE" - }, { "type" : "library", "bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", diff --git a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_stack_sbom.json index c40280a2..be16d02c 100644 --- a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1", - "group" : "pom-with-deps-no-ignore", - "name" : "pom-with-dependency-not-ignored-common-paths", - "version" : "0.0.1", - "purl" : "pkg:maven/pom-with-deps-no-ignore/pom-with-dependency-not-ignored-common-paths@0.0.1" - }, { "type" : "library", "bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE", diff --git a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_component_sbom.json b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_component_sbom.json index cdbed7a0..ecc42930 100644 --- a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_component_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_stack_sbom.json b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_stack_sbom.json index 5e208916..dbcf5e17 100644 --- a/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/maven/pom_deps_with_no_ignore_provided_scope/expected_stack_sbom.json @@ -14,14 +14,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT", - "group" : "org.acme.dbaas", - "name" : "postgresql-orm-quarkus", - "version" : "1.0.0-SNAPSHOT", - "purl" : "pkg:maven/org.acme.dbaas/postgresql-orm-quarkus@1.0.0-SNAPSHOT" - }, { "type" : "library", "bom-ref" : "pkg:maven/io.quarkus/quarkus-hibernate-orm@2.13.5.Final", diff --git a/src/test/resources/tst_manifests/npm/common/deps_with_ignore/expected_component_sbom.json b/src/test/resources/tst_manifests/npm/common/deps_with_ignore/expected_component_sbom.json index 660a1dbb..3553b0f6 100644 --- a/src/test/resources/tst_manifests/npm/common/deps_with_ignore/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/npm/common/deps_with_ignore/expected_component_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/joi@17.1.1", diff --git a/src/test/resources/tst_manifests/npm/common/deps_with_no_ignore/expected_component_sbom.json b/src/test/resources/tst_manifests/npm/common/deps_with_no_ignore/expected_component_sbom.json index 59713d73..9ad18ccb 100644 --- a/src/test/resources/tst_manifests/npm/common/deps_with_no_ignore/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/npm/common/deps_with_no_ignore/expected_component_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/joi@17.1.1", diff --git a/src/test/resources/tst_manifests/npm/deps_with_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/npm/deps_with_ignore/expected_stack_sbom.json index 318aeb4c..ad396a90 100644 --- a/src/test/resources/tst_manifests/npm/deps_with_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/npm/deps_with_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/joi@17.1.1", diff --git a/src/test/resources/tst_manifests/npm/deps_with_no_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/npm/deps_with_no_ignore/expected_stack_sbom.json index 6d9d4340..eecb0d0c 100644 --- a/src/test/resources/tst_manifests/npm/deps_with_no_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/npm/deps_with_no_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/joi@17.1.1", diff --git a/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_component_sbom.json b/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_component_sbom.json index 302e802a..2e9ffb29 100644 --- a/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_component_sbom.json @@ -13,13 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:pypi/default-pip-root@0.0.0", - "name" : "default-pip-root", - "version" : "0.0.0", - "purl" : "pkg:pypi/default-pip-root@0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:pypi/anyio@3.6.2", diff --git a/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_stack_sbom.json index 11a70d2e..ebb2fa64 100644 --- a/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/pip/pip_requirements_txt_ignore/expected_stack_sbom.json @@ -13,13 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:pypi/default-pip-root@0.0.0", - "name" : "default-pip-root", - "version" : "0.0.0", - "purl" : "pkg:pypi/default-pip-root@0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:pypi/anyio@3.6.2", diff --git a/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_component_sbom.json b/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_component_sbom.json index 1317bf67..25404878 100644 --- a/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_component_sbom.json +++ b/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_component_sbom.json @@ -13,13 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:pypi/default-pip-root@0.0.0", - "name" : "default-pip-root", - "version" : "0.0.0", - "purl" : "pkg:pypi/default-pip-root@0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:pypi/anyio@3.6.2", diff --git a/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_stack_sbom.json index 428175f4..3b110c03 100644 --- a/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/pip/pip_requirements_txt_no_ignore/expected_stack_sbom.json @@ -13,13 +13,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:pypi/default-pip-root@0.0.0", - "name" : "default-pip-root", - "version" : "0.0.0", - "purl" : "pkg:pypi/default-pip-root@0.0.0" - }, { "type" : "library", "bom-ref" : "pkg:pypi/anyio@3.6.2", diff --git a/src/test/resources/tst_manifests/pnpm/deps_with_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/pnpm/deps_with_ignore/expected_stack_sbom.json index 3c73dab7..1d66915e 100644 --- a/src/test/resources/tst_manifests/pnpm/deps_with_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/pnpm/deps_with_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/backend@0.0.0", diff --git a/src/test/resources/tst_manifests/pnpm/deps_with_no_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/pnpm/deps_with_no_ignore/expected_stack_sbom.json index a33a02e0..ad7f6014 100644 --- a/src/test/resources/tst_manifests/pnpm/deps_with_no_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/pnpm/deps_with_no_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/backend@0.0.0", diff --git a/src/test/resources/tst_manifests/yarn-berry/deps_with_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/yarn-berry/deps_with_ignore/expected_stack_sbom.json index 9c59b375..2ce01bdb 100644 --- a/src/test/resources/tst_manifests/yarn-berry/deps_with_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/yarn-berry/deps_with_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/address@4.1.0", diff --git a/src/test/resources/tst_manifests/yarn-berry/deps_with_no_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/yarn-berry/deps_with_no_ignore/expected_stack_sbom.json index ed3617e6..741aec17 100644 --- a/src/test/resources/tst_manifests/yarn-berry/deps_with_no_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/yarn-berry/deps_with_no_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/address@4.1.0", diff --git a/src/test/resources/tst_manifests/yarn-classic/deps_with_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/yarn-classic/deps_with_ignore/expected_stack_sbom.json index 35d0066f..5d0aec74 100644 --- a/src/test/resources/tst_manifests/yarn-classic/deps_with_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/yarn-classic/deps_with_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/joi@17.1.1", diff --git a/src/test/resources/tst_manifests/yarn-classic/deps_with_no_ignore/expected_stack_sbom.json b/src/test/resources/tst_manifests/yarn-classic/deps_with_no_ignore/expected_stack_sbom.json index fe78dfcb..36cdcb1c 100644 --- a/src/test/resources/tst_manifests/yarn-classic/deps_with_no_ignore/expected_stack_sbom.json +++ b/src/test/resources/tst_manifests/yarn-classic/deps_with_no_ignore/expected_stack_sbom.json @@ -24,24 +24,6 @@ } }, "components" : [ - { - "type" : "application", - "bom-ref" : "pkg:npm/backend@1.0.0", - "name" : "backend", - "version" : "1.0.0", - "licenses" : [ { - "license" : { - "id" : "ISC", - "text" : { - "contentType" : "text/plain", - "encoding" : "base64", - "content" : "SVNDIExpY2Vuc2U6CgpDb3B5cmlnaHQgKGMpIDIwMDQtMjAxMCBieSBJbnRlcm5ldCBTeXN0ZW1zIENvbnNvcnRpdW0sIEluYy4gKCJJU0MiKQpDb3B5cmlnaHQgKGMpIDE5OTUtMjAwMyBieSBJbnRlcm5ldCBTb2Z0d2FyZSBDb25zb3J0aXVtCgpQZXJtaXNzaW9uIHRvIHVzZSwgY29weSwgbW9kaWZ5LCBhbmQvb3IgZGlzdHJpYnV0ZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSB3aXRoIG9yIHdpdGhvdXQgZmVlIGlzIGhlcmVieSBncmFudGVkLCBwcm92aWRlZCB0aGF0IHRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIGFwcGVhciBpbiBhbGwgY29waWVzLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIgQU5EIElTQyBESVNDTEFJTVMgQUxMIFdBUlJBTlRJRVMgV0lUSCBSRUdBUkQgVE8gVEhJUyBTT0ZUV0FSRSBJTkNMVURJTkcgQUxMIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MuIElOIE5PIEVWRU5UIFNIQUxMIElTQyBCRSBMSUFCTEUgRk9SIEFOWSBTUEVDSUFMLCBESVJFQ1QsIElORElSRUNULCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgT1IgQU5ZIERBTUFHRVMgV0hBVFNPRVZFUiBSRVNVTFRJTkcgRlJPTSBMT1NTIE9GIFVTRSwgREFUQSBPUiBQUk9GSVRTLCBXSEVUSEVSIElOIEFOIEFDVElPTiBPRiBDT05UUkFDVCwgTkVHTElHRU5DRSBPUiBPVEhFUiBUT1JUSU9VUyBBQ1RJT04sIEFSSVNJTkcgT1VUIE9GIE9SIElOIENPTk5FQ1RJT04gV0lUSCBUSEUgVVNFIE9SIFBFUkZPUk1BTkNFIE9GIFRISVMgU09GVFdBUkUuCg==" - }, - "url" : "https://www.isc.org/licenses/" - } - } ], - "purl" : "pkg:npm/backend@1.0.0" - }, { "type" : "library", "bom-ref" : "pkg:npm/%40hapi/joi@17.1.1",