summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2019-12-16 09:20:46 +0000
committerCan Eldem <celdem@gitlab.com>2019-12-16 09:20:46 +0000
commit80f225ab300c0f518a5ef0268468c64505274ed3 (patch)
tree345fedc819a35352965578ae5e0a64babfc736b6
parentfcd3ec047d42a3c5cd44c5c4ce1dd525fe0f52fc (diff)
parent29793dc83d5b49f0e3411472f40d21479bd73c2d (diff)
Merge branch 'prepare-no-fail' into 'master'
Use prepare-no-fail option See merge request gitlab-org/security-products/license-management!92
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/license/management/version.rb2
-rwxr-xr-xrun.sh2
4 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c9d522..1eb8e4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v2.2.1
+
+- Use `--prepare-no-fail` option to try to scan as much as possible. (!92)
+
## v2.2.0
- Update LicenseFinder to 5.11.1 [Diff](https://github.com/pivotal/LicenseFinder/compare/v5.9.2...v5.11.1)
diff --git a/Gemfile.lock b/Gemfile.lock
index 6706fe8..64c1bbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- license-management (2.2.0)
+ license-management (2.2.1)
license_finder (= 5.11.1)
GEM
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 71e79a7..8982b32 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '2.2.0'
+ VERSION = '2.2.1'
end
end
diff --git a/run.sh b/run.sh
index 096447b..11fb99a 100755
--- a/run.sh
+++ b/run.sh
@@ -186,7 +186,7 @@ case "$COMMAND" in
# Run License Finder.
echo "Running license_finder $@ in $PWD"
if [ "$skip_prepare" != true ]; then
- prepare="--prepare"
+ prepare="--prepare-no-fail"
fi
echo "Preparing JSON report..."
license_management report ${prepare} --format=json --save=gl-license-management-report.json ${LICENSE_FINDER_CLI_OPTS}