Merge branch 'java-maven-multimodules' into 'master'v3.1.2

Detect all licenses for maven multi-module projects.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/run.sh b/run.sh
index af1ed79..4020222 100755
--- a/run.sh
+++ b/run.sh
@@ -6,14 +6,15 @@ set -e
 BUNDLE_JOBS="$(nproc)"
 export BUNDLE_JOBS
 export BUNDLE_WITHOUT="development:test"
+export CI_API_V4_URL="${CI_API_V4_URL:-https://gitlab.com/api/v4}"
 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 MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}"
+export PREPARE="${PREPARE:---prepare-no-fail}"
 export RECURSIVE='--no-recursive'
 export RUBY_GC_HEAP_INIT_SLOTS=800000
 export RUBY_GC_MALLOC_LIMIT=79000000
@@ -42,7 +43,7 @@ function debug_env() {
 }
 
 function scan_project() {
-  gem install --quiet --silent "$LM_HOME/pkg/*.gem"
+  gem install -f --silent "$LM_HOME/pkg/*.gem"
   license_management ignored_groups add development
   license_management ignored_groups add test
   echo license_management report "$@"
@@ -112,5 +113,4 @@ scan_project "$PREPARE" \
   --save="${LM_REPORT_FILE}" \
   --python-version="${python_version}" \
   "$RECURSIVE" \
-  --maven-options="$MAVEN_CLI_OPTS" \
   "$LICENSE_FINDER_CLI_OPTS"