Skip to content

Commit e67ba91

Browse files
authored
Change whitesource integration to scan on 1.x branch (opensearch-project#1786)
* Change whitesource integration to scan on 1.x branch Signed-off-by: Zelin Hao <zelinhao@amazon.com> * Add parameter to ignore /qa/ folder Signed-off-by: Zelin Hao <zelinhao@amazon.com>
1 parent 385b268 commit e67ba91

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.whitesource

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"configMode": "LOCAL",
44
"configExternalURL": "",
55
"projectToken": "",
6-
"baseBranches": []
6+
"baseBranches": ["1.x"]
77
},
88
"checkRunSettings": {
99
"vulnerableCheckRunConclusionLevel": "failure",
@@ -12,4 +12,4 @@
1212
"issueSettings": {
1313
"minSeverityLevel": "LOW"
1414
}
15-
}
15+
}

whitesource.config

+10-9
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ resolveAllDependencies=false
8888
#npm.resolveMainPackageJsonOnly=true
8989
#npm.removeDuplicateDependencies=false
9090
#npm.resolveAdditionalDependencies=true
91-
#npm.failOnNpmLsErrors =
91+
#npm.failOnNpmLsErrors =
9292
#npm.projectNameFromDependencyFile = true
93-
#npm.resolveGlobalPackages=true
93+
#npm.resolveGlobalPackages=true
9494
#npm.resolveLockFile=true
9595

9696
#bower.resolveDependencies=false
@@ -118,13 +118,13 @@ resolveAllDependencies=false
118118
#python.runPipenvPreStep=true
119119
#python.pipenvDevDependencies=true
120120
#python.IgnorePipenvInstallErrors=true
121-
#python.resolveGlobalPackages=true
122-
#python.localPackagePathsToInstall=/path/to/local/dependency.egg, /path/to/local/dependency.zip
121+
#python.resolveGlobalPackages=true
122+
#python.localPackagePathsToInstall=/path/to/local/dependency.egg, /path/to/local/dependency.zip
123123
#python.resolvePipEditablePackages
124124
#python.path=/path/to/python
125125
#python.pipPath=/path/to/pip
126126
#python.runPoetryPreStep=true
127-
#python.includePoetryDevDependencies=true
127+
#python.includePoetryDevDependencies=true
128128

129129
#maven.ignoredScopes=test provided
130130
#maven.resolveDependencies=false
@@ -137,14 +137,15 @@ resolveAllDependencies=false
137137
#maven.m2RepositoryPath=
138138
#maven.downloadMissingDependencies=false
139139
#maven.additionalArguments=
140-
#maven.projectNameFromDependencyFile=true
140+
#maven.projectNameFromDependencyFile=true
141141

142142
resolveAllDependencies=false
143143
archiveExtractionDepth=7
144144
followSymbolicLinks=true
145145
gradle.resolveDependencies=true
146146
gradle.aggregateModules=true
147147
gradle.preferredEnvironment=wrapper
148+
gradle.excludeModules=./qa/*
148149
maven.resolveDependencies=true
149150
maven.runPreStep=true
150151
maven.aggregateModules=true
@@ -155,7 +156,7 @@ npm.runPreStep=true
155156
npm.yarnProject=true
156157
go.resolveDependencies=true
157158
go.collectDependenciesAtRuntime=true
158-
go.dependencyManager=
159+
go.dependencyManager=
159160
python.resolveDependencies=true
160161
python.ignoreSourceFiles=true
161162
python.runPipenvPreStep=true
@@ -254,7 +255,7 @@ ruby.ignoreSourceFiles=false
254255
###########################################################################################
255256
# Includes/Excludes Glob patterns - Please use only one exclude line and one include line #
256257
###########################################################################################
257-
includes=**/*.cc **/*.zip **/*.cpp **/*.c **/*.swf **/*.tgz **/*.h **/*.js **/*.hpp **/*.py **/*.gzip **/*.cs **/*.rb **/*.exe **/*.gz **/*.pl **/*.cxx **/*.c++ **/*.hxx **/*.jar **/*.java **/*.go **/*.mod **/*.sum **/*.rb
258+
includes=**/*.cc **/*.zip **/*.cpp **/*.c **/*.swf **/*.tgz **/*.h **/*.js **/*.hpp **/*.py **/*.gzip **/*.cs **/*.rb **/*.exe **/*.gz **/*.pl **/*.cxx **/*.c++ **/*.hxx **/*.jar **/*.java **/*.go **/*.mod **/*.sum **/*.rb
258259
#includes=**/*.m **/*.mm **/*.js **/*.php
259260
#includes=**/*.jar
260261
#includes=**/*.gem **/*.rb
@@ -369,4 +370,4 @@ followSymbolicLinks=true
369370
#scm.tag=
370371
#scm.npmInstall=
371372
#scm.npmInstallTimeoutMinutes=
372-
#scm.repositoriesFile=
373+
#scm.repositoriesFile=

0 commit comments

Comments
 (0)