From 94bee47cfe364b6c732f1812ad43199994382303 Mon Sep 17 00:00:00 2001 From: Maxime Desrosiers Date: Tue, 30 Aug 2022 20:04:41 -0400 Subject: [PATCH 1/2] allow ws filesystem scan property override for sbt project --- pkg/whitesource/configHelper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/whitesource/configHelper.go b/pkg/whitesource/configHelper.go index a7e446fb30..0c61bd3c32 100644 --- a/pkg/whitesource/configHelper.go +++ b/pkg/whitesource/configHelper.go @@ -233,7 +233,7 @@ func (c *ConfigOptions) addBuildToolDefaults(config *ScanOptions, utils Utils) e {Name: "excludes", Value: "**/*sources.jar **/*javadoc.jar"}, }, "sbt": { - {Name: "fileSystemScan", Value: false, Force: true}, + {Name: "fileSystemScan", Value: false}, {Name: "ignoreSourceFiles", Value: true, Force: true}, {Name: "sbt.resolveDependencies", Value: true, Force: true}, {Name: "sbt.ignoreSourceFiles", Value: true, Force: true}, @@ -305,7 +305,7 @@ func mvnProjectExcludes(buildDescriptorExcludeList []string, utils Utils) []stri return []string{} } -//ToDo: Check if we want to optionally allow auto generation for unknown projects +// ToDo: Check if we want to optionally allow auto generation for unknown projects func autoGenerateWhitesourceConfig(config *ScanOptions, utils Utils) error { // TODO: Should we rely on -detect, or set the parameters manually? if err := utils.RunExecutable("java", "-jar", config.AgentFileName, "-d", ".", "-detect"); err != nil { From 46c07e80ab407e0e180e757853616e6f8b51ebbb Mon Sep 17 00:00:00 2001 From: Maxime Desrosiers Date: Wed, 14 Dec 2022 16:43:30 -0500 Subject: [PATCH 2/2] allow ws sbt.aggregateModules property override for sbt project --- pkg/whitesource/configHelper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/whitesource/configHelper.go b/pkg/whitesource/configHelper.go index 0c61bd3c32..35946f8ecf 100644 --- a/pkg/whitesource/configHelper.go +++ b/pkg/whitesource/configHelper.go @@ -237,7 +237,7 @@ func (c *ConfigOptions) addBuildToolDefaults(config *ScanOptions, utils Utils) e {Name: "ignoreSourceFiles", Value: true, Force: true}, {Name: "sbt.resolveDependencies", Value: true, Force: true}, {Name: "sbt.ignoreSourceFiles", Value: true, Force: true}, - {Name: "sbt.aggregateModules", Value: false, Force: true}, + {Name: "sbt.aggregateModules", Value: false}, {Name: "sbt.runPreStep", Value: true}, {Name: "includes", Value: "**/*.jar"}, {Name: "excludes", Value: "**/*sources.jar **/*javadoc.jar"},