From e7439436ee3211692965ac1a1ed1e889be770b36 Mon Sep 17 00:00:00 2001 From: DmitriyLewen Date: Mon, 22 Aug 2022 17:04:22 +0600 Subject: [PATCH] add gradle.lockfile to driver --- pkg/detector/library/driver.go | 2 +- pkg/fanal/analyzer/all/import.go | 1 + pkg/fanal/analyzer/language/java/gradle/lockfile.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/detector/library/driver.go b/pkg/detector/library/driver.go index 5f1e5652fb2..b244023f9ae 100644 --- a/pkg/detector/library/driver.go +++ b/pkg/detector/library/driver.go @@ -37,7 +37,7 @@ func NewDriver(libType string) (Driver, error) { case ftypes.GoBinary, ftypes.GoModule: ecosystem = vulnerability.Go comparer = compare.GenericComparer{} - case ftypes.Jar, ftypes.Pom: + case ftypes.Jar, ftypes.Pom, ftypes.GradleLock: ecosystem = vulnerability.Maven comparer = maven.Comparer{} case ftypes.Npm, ftypes.Yarn, ftypes.Pnpm, ftypes.NodePkg, ftypes.JavaScript: diff --git a/pkg/fanal/analyzer/all/import.go b/pkg/fanal/analyzer/all/import.go index 3fd1b007865..dd3ee0fadee 100644 --- a/pkg/fanal/analyzer/all/import.go +++ b/pkg/fanal/analyzer/all/import.go @@ -7,6 +7,7 @@ import ( _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dotnet/nuget" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/golang/binary" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/golang/mod" + _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/java/gradle" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/java/jar" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/java/pom" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/nodejs/npm" diff --git a/pkg/fanal/analyzer/language/java/gradle/lockfile.go b/pkg/fanal/analyzer/language/java/gradle/lockfile.go index 08663143d99..26608ff4c33 100644 --- a/pkg/fanal/analyzer/language/java/gradle/lockfile.go +++ b/pkg/fanal/analyzer/language/java/gradle/lockfile.go @@ -10,6 +10,7 @@ import ( "github.com/aquasecurity/trivy/pkg/fanal/analyzer" "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language" "github.com/aquasecurity/trivy/pkg/fanal/types" + "golang.org/x/xerrors" )