From e67ba91a9238f69b214174ac4fc0f9015b441beb Mon Sep 17 00:00:00 2001
From: Zelin Hao <87548827+zelinh@users.noreply.github.com>
Date: Mon, 3 Jan 2022 17:49:09 -0800
Subject: [PATCH] Change whitesource integration to scan on 1.x branch (#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>
---
 .whitesource       |  4 ++--
 whitesource.config | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.whitesource b/.whitesource
index 7dd2131e7c7..81bf84f97dd 100644
--- a/.whitesource
+++ b/.whitesource
@@ -3,7 +3,7 @@
     "configMode": "LOCAL",
     "configExternalURL": "",
     "projectToken": "",
-    "baseBranches": []
+    "baseBranches": ["1.x"]
   },
   "checkRunSettings": {
     "vulnerableCheckRunConclusionLevel": "failure",
@@ -12,4 +12,4 @@
   "issueSettings": {
     "minSeverityLevel": "LOW"
   }
-}
\ No newline at end of file
+}
diff --git a/whitesource.config b/whitesource.config
index 35889821a9c..256540415f6 100644
--- a/whitesource.config
+++ b/whitesource.config
@@ -88,9 +88,9 @@ resolveAllDependencies=false
 #npm.resolveMainPackageJsonOnly=true
 #npm.removeDuplicateDependencies=false
 #npm.resolveAdditionalDependencies=true
-#npm.failOnNpmLsErrors = 
+#npm.failOnNpmLsErrors =
 #npm.projectNameFromDependencyFile = true
-#npm.resolveGlobalPackages=true							   
+#npm.resolveGlobalPackages=true
 #npm.resolveLockFile=true
 
 #bower.resolveDependencies=false
@@ -118,13 +118,13 @@ resolveAllDependencies=false
 #python.runPipenvPreStep=true
 #python.pipenvDevDependencies=true
 #python.IgnorePipenvInstallErrors=true
-#python.resolveGlobalPackages=true	
-#python.localPackagePathsToInstall=/path/to/local/dependency.egg, /path/to/local/dependency.zip	
+#python.resolveGlobalPackages=true
+#python.localPackagePathsToInstall=/path/to/local/dependency.egg, /path/to/local/dependency.zip
 #python.resolvePipEditablePackages
 #python.path=/path/to/python
 #python.pipPath=/path/to/pip
 #python.runPoetryPreStep=true
-#python.includePoetryDevDependencies=true					  
+#python.includePoetryDevDependencies=true
 
 #maven.ignoredScopes=test provided
 #maven.resolveDependencies=false
@@ -137,7 +137,7 @@ resolveAllDependencies=false
 #maven.m2RepositoryPath=
 #maven.downloadMissingDependencies=false
 #maven.additionalArguments=
-#maven.projectNameFromDependencyFile=true										 
+#maven.projectNameFromDependencyFile=true
 
 resolveAllDependencies=false
 archiveExtractionDepth=7
@@ -145,6 +145,7 @@ followSymbolicLinks=true
 gradle.resolveDependencies=true
 gradle.aggregateModules=true
 gradle.preferredEnvironment=wrapper
+gradle.excludeModules=./qa/*
 maven.resolveDependencies=true
 maven.runPreStep=true
 maven.aggregateModules=true
@@ -155,7 +156,7 @@ npm.runPreStep=true
 npm.yarnProject=true
 go.resolveDependencies=true
 go.collectDependenciesAtRuntime=true
-go.dependencyManager= 
+go.dependencyManager=
 python.resolveDependencies=true
 python.ignoreSourceFiles=true
 python.runPipenvPreStep=true
@@ -254,7 +255,7 @@ ruby.ignoreSourceFiles=false
 ###########################################################################################
 # Includes/Excludes Glob patterns - Please use only one exclude line and one include line #
 ###########################################################################################
-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 
+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
 #includes=**/*.m **/*.mm  **/*.js **/*.php
 #includes=**/*.jar
 #includes=**/*.gem **/*.rb
@@ -369,4 +370,4 @@ followSymbolicLinks=true
 #scm.tag=
 #scm.npmInstall=
 #scm.npmInstallTimeoutMinutes=
-#scm.repositoriesFile=
\ No newline at end of file
+#scm.repositoriesFile=