Skip to content

fix(maven): exclude test-scoped deps in component analysis #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
a-oren wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −18
Open

fix(maven): exclude test-scoped deps in component analysis #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/main/java/io/github/guacsec/trustifyda/providers/JavaMavenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,14 @@ private Content generateSbomFromEffectivePom() throws IOException {
.filter(d -> d.ignored)
.map(DependencyAggregator::toPurl)
.collect(Collectors.toSet());
var testsDeps =
dependencies.stream()
.filter(DependencyAggregator::isTestDependency)
.collect(Collectors.toSet());
var deps = getDependencies(tmpEffPom);
deps = resolveVersionRanges(deps);
var sbom = SbomFactory.newInstance().addRoot(getRoot(tmpEffPom), readLicenseFromManifest());
deps.stream()
.filter(dep -> !testsDeps.contains(dep))
// exclude test-scoped deps by their own effective-pom scope (version-independent),
// mirroring the JS client. Parent/BOM-managed test deps have no version in the source
// pom, so the version-sensitive equals() match against the original pom would miss them.
.filter(dep -> !dep.isTestDependency())
.map(DependencyAggregator::toPurl)
.filter(dep -> ignored.stream().noneMatch(artifact -> artifact.isCoordinatesEquals(dep)))
.forEach(d -> sbom.addDependency(sbom.getRoot(), d, null));
Expand Down
13 changes: 0 additions & 13 deletions ...ces/tst_manifests/maven/pom_deps_with_no_ignore_common_paths/expected_component_sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@
"version" : "2.3.5.RELEASE",
"purl" : "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE",
"group" : "org.springframework.boot",
"name" : "spring-boot-starter-test",
"version" : "2.3.5.RELEASE",
"purl" : "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE"
},
{
"type" : "library",
"bom-ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE",
Expand Down Expand Up @@ -76,7 +68,6 @@
"ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-parent@2.3.5.RELEASE",
"dependsOn" : [
"pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE",
"pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE",
"pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE",
"pkg:maven/io.quarkus/quarkus-resteasy@2.7.7.Final",
"pkg:maven/org.keycloak/keycloak-saml-core@1.8.1.Final",
Expand All @@ -88,10 +79,6 @@
"ref" : "pkg:maven/org.springframework.boot/spring-boot-starter@2.3.5.RELEASE",
"dependsOn" : [ ]
},
{
"ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-test@2.3.5.RELEASE",
"dependsOn" : [ ]
},
{
"ref" : "pkg:maven/org.springframework.boot/spring-boot-starter-web@2.3.5.RELEASE",
"dependsOn" : [ ]
Expand Down
Loading