diff options
| -rwxr-xr-x | run.sh | 12 | ||||
| -rw-r--r-- | spec/integration/java/maven_spec.rb | 4 |
2 files changed, 9 insertions, 7 deletions
@@ -6,14 +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 LM_RECURSIVE='--no-recursive' 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 @@ -68,13 +69,13 @@ function prepare_golang() { } function prepare_java() { - [[ -f pom.xml ]] && mvn install "${MAVEN_CLI_OPTS:--DskipTests}" + #[[ -f pom.xml ]] && mvn install "${MAVEN_CLI_OPTS}" [[ -f build.gradle ]] && [[ ! -f gradlew ]] && \ gradle build ${GRADLE_CLI_OPTS:+-x test} } function prepare_dotnet() { - [[ $(ls ./*.sln 2> /dev/null) ]] && LM_RECURSIVE="--recursive" + [[ $(ls ./*.sln 2> /dev/null) ]] && RECURSIVE="--recursive" } function prepare_project() { @@ -110,5 +111,6 @@ scan_project "$PREPARE" \ --format=json \ --save="${LM_REPORT_FILE}" \ --python-version="${python_version}" \ - "$LM_RECURSIVE" \ + "$RECURSIVE" \ + --maven-options="$MAVEN_CLI_OPTS" \ "$LICENSE_FINDER_CLI_OPTS" diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index 16edc29..e7d2526 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -18,9 +18,9 @@ RSpec.describe "maven" do runner.add_file('my_settings.xml', fixture_file_content('custom-maven-settings.xml')) report = runner.scan(env: { - 'LICENSE_FINDER_CLI_OPTS' => "--maven-options=--settings my_settings.xml", + 'CI_DEBUG_TRACE' => 'true', 'CI_PROJECT_ID' => 'invalid', - 'CI_DEBUG_TRACE' => 'true' + 'MAVEN_CLI_OPTS' => "--settings my_settings.xml", }) expect(report).to match_schema(version: '2.0') |