Merge branch '33727-airgap' into 'master'v3.1.0

Scan maven projects with dependencies from a custom repository

See merge request gitlab-org/security-products/license-management!120

1 files changed, 9 insertions, 5 deletions

diff --git a/run.sh b/run.sh
index c4c98e7..e18ae43 100755
--- a/run.sh
+++ b/run.sh
@@ -6,12 +6,15 @@ set -e
 BUNDLE_JOBS="$(nproc)"
 export BUNDLE_JOBS
 export BUNDLE_WITHOUT="development:test"
-export CI_DEBUG_TRACE=${CI_DEBUG_TRACE:-}
+export CI_DEBUG_TRACE=${CI_DEBUG_TRACE:='false'}
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export HISTFILESIZE=0
 export HISTSIZE=0
+export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:='--no-debug'}
 export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
+export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:='-DskipTests'}"
 export PREPARE="--prepare-no-fail"
+export RECURSIVE='--no-recursive'
 export RUBY_GC_HEAP_INIT_SLOTS=800000
 export RUBY_GC_MALLOC_LIMIT=79000000
 export RUBY_HEAP_FREE_MIN=100000
@@ -66,14 +69,12 @@ function prepare_golang() {
 }
 
 function prepare_java() {
-  [[ -f pom.xml ]] && mvn install "${MAVEN_CLI_OPTS:--DskipTests}"
   [[ -f build.gradle ]] && [[ ! -f gradlew ]] && \
     gradle build ${GRADLE_CLI_OPTS:+-x test}
 }
 
 function prepare_dotnet() {
-  [[ $(ls ./*.sln 2> /dev/null) ]] && \
-    LICENSE_FINDER_CLI_OPTS="--recursive=true ${LICENSE_FINDER_CLI_OPTS:-}"
+  [[ $(ls ./*.sln 2> /dev/null) ]] && RECURSIVE="--recursive"
 }
 
 function prepare_project() {
@@ -104,8 +105,11 @@ switch_to java "adopt-openjdk-${LM_JAVA_VERSION:-8}"
 
 prepare_project
 [[ $CI_DEBUG_TRACE == 'true' ]] && debug_env
+
 scan_project "$PREPARE" \
   --format=json \
   --save="${LM_REPORT_FILE}" \
   --python-version="${python_version}" \
-  ${LICENSE_FINDER_CLI_OPTS:+--no-debug $LICENSE_FINDER_CLI_OPTS}
+  "$RECURSIVE" \
+  --maven-options="$MAVEN_CLI_OPTS" \
+  "$LICENSE_FINDER_CLI_OPTS"