Merge branch 'update-report-name' into 'master'v3.12.0

Update default name of the generated report

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

17 files changed, 20 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fae87c..ac2e94b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # GitLab License management changelog
 
+## v3.12.0
+
+- Update default name of the generated report. (!167)
+
 ## v3.11.2
 
 - Ensure `LM_*_VERSION` variables take precedence over `ASDF_*_VERSION` variables. (!163)
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ea4a44..f9508ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    license-management (3.11.2)
+    license-management (3.12.0)
       license_finder (~> 6.0.0)
 
 GEM
diff --git a/README.md b/README.md
index 908933a..efe41b9 100644
--- a/README.md
+++ b/README.md
@@ -108,6 +108,7 @@ The License Management tool can be customized with environments variables for so
 | LM_JAVA_VERSION      | Java (Maven) | Version of Java. If set to `11`, Maven and Gradle use Java 11 instead of Java 8. |
 | LM_PYTHON_VERSION    | Python       | Version of Python. If set to `3`, dependencies are installed using Python 3 instead of Python 2.7. |
 | LOG_LEVEL    | * | Control the verbosity of the logs. (`debug`, `info`, `warn` (default), `error`, `fatal`)  |
+| LM_REPORT_FILE    | * | Name of the generated report. If not supplied, defaults to `gl-license-scanning-report.json`  |
 
 
 Inject the required environment variables to the docker command using the [`--env` option flag](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file)
diff --git a/config/.env.12-10-stable b/config/.env.12-10-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.12-10-stable
+++ b/config/.env.12-10-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.12-2-stable b/config/.env.12-2-stable
index 835c645..808b2ac 100644
--- a/config/.env.12-2-stable
+++ b/config/.env.12-2-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION 1
diff --git a/config/.env.12-3-stable b/config/.env.12-3-stable
index 835c645..808b2ac 100644
--- a/config/.env.12-3-stable
+++ b/config/.env.12-3-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION 1
diff --git a/config/.env.12-4-stable b/config/.env.12-4-stable
index 79d7c86..86a9c8f 100644
--- a/config/.env.12-4-stable
+++ b/config/.env.12-4-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '1.1'
diff --git a/config/.env.12-5-stable b/config/.env.12-5-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.12-5-stable
+++ b/config/.env.12-5-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.12-6-stable b/config/.env.12-6-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.12-6-stable
+++ b/config/.env.12-6-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.12-7-stable b/config/.env.12-7-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.12-7-stable
+++ b/config/.env.12-7-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.12-8-stable b/config/.env.12-8-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.12-8-stable
+++ b/config/.env.12-8-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.12-9-stable b/config/.env.12-9-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.12-9-stable
+++ b/config/.env.12-9-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.13-0-stable b/config/.env.13-0-stable
index 0ee1d53..da5a244 100644
--- a/config/.env.13-0-stable
+++ b/config/.env.13-0-stable
@@ -1 +1,2 @@
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION '2.0'
diff --git a/config/.env.legacy b/config/.env.legacy
index 996bb9b..7181ab8 100644
--- a/config/.env.legacy
+++ b/config/.env.legacy
@@ -1,2 +1,3 @@
 LM_PYTHON_VERSION 2.7
+LM_REPORT_FILE gl-license-management-report.json
 LM_REPORT_VERSION 1
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 5570468..9c987ed 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.11.2'
+    VERSION = '3.12.0'
   end
 end
diff --git a/run.sh b/run.sh
index 04de6d3..524371f 100755
--- a/run.sh
+++ b/run.sh
@@ -19,7 +19,7 @@ export LANG=C.UTF-8
 export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug}
 export LM_JAVA_VERSION=${LM_JAVA_VERSION:-}
 export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-}
-export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'}
+export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-scanning-report.json'}
 export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}"
 export NO_UPDATE_NOTIFIER=true
 export PIPENV_VENV_IN_PROJECT=1
diff --git a/spec/support/integration_test_helper.rb b/spec/support/integration_test_helper.rb
index f474265..5c9de94 100644
--- a/spec/support/integration_test_helper.rb
+++ b/spec/support/integration_test_helper.rb
@@ -69,7 +69,7 @@ module IntegrationTestHelper
     def scan(env: {})
       return {} unless execute(env, './bin/docker-test', project_path.to_s)
 
-      report_path = project_path.join('gl-license-management-report.json')
+      report_path = project_path.join('gl-license-scanning-report.json')
       return {} unless report_path.exist?
 
       Report.new(report_path.read)