Skip to content

Commit

Permalink
Remove erroneous Java CPEs from generation (#1918)
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Luhring <[email protected]>
  • Loading branch information
luhring authored Jul 6, 2023
1 parent 8ce88e1 commit 81d8019
Showing 1 changed file with 84 additions and 0 deletions.
84 changes: 84 additions & 0 deletions syft/pkg/cataloger/common/cpe/candidate_by_package_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,90 @@ var defaultCandidateRemovals = buildCandidateRemovalLookup(
candidateKey{PkgName: "docker"},
candidateRemovals{VendorsToRemove: []string{"docker"}},
},
// Java packages
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-builder-support"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-model"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-repository-metadata"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-settings"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-settings-builder"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-api"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-connector-basic"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-impl"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-named-locks"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-spi"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-transport-file"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-transport-http"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-transport-wagon"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-resolver-util"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "maven-shared-utils"},
candidateRemovals{ProductsToRemove: []string{"maven"}},
},
{
pkg.JavaPkg,
candidateKey{PkgName: "gradle-enterprise"},
candidateRemovals{
ProductsToRemove: []string{"gradle-enterprise"},
VendorsToRemove: []string{"gradle"},
},
},
})

// buildCandidateLookup is a convenience function for creating the defaultCandidateAdditions set
Expand Down

0 comments on commit 81d8019

Please sign in to comment.