Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/whitesource-sbt-config-fix' into…
Browse files Browse the repository at this point in the history
… v1.353.0-edp

* origin/whitesource-sbt-config-fix:
  allow ws sbt.aggregateModules  property override for sbt project
  allow ws filesystem scan property override for sbt project
  • Loading branch information
maksd committed Mar 28, 2024
2 parents 8193c44 + 46c07e8 commit a0975d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/whitesource/configHelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ 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},
{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"},
Expand Down

0 comments on commit a0975d8

Please sign in to comment.