summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2019-12-16 10:05:30 +0000
committerCan Eldem <celdem@gitlab.com>2019-12-16 10:05:30 +0000
commit418f6cdb8c756b9b9c1c0c526a3bcb423097e623 (patch)
treecbc0093ed1113b8347d73618660d94b150477d61
parent80f225ab300c0f518a5ef0268468c64505274ed3 (diff)
Revert "Merge branch 'prepare-no-fail' into 'master'"revert-80f225ab
This reverts merge request !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, 3 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1eb8e4f..8c9d522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,5 @@
# 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 64c1bbf..6706fe8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- license-management (2.2.1)
+ license-management (2.2.0)
license_finder (= 5.11.1)
GEM
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 8982b32..71e79a7 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '2.2.1'
+ VERSION = '2.2.0'
end
end
diff --git a/run.sh b/run.sh
index 11fb99a..096447b 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-no-fail"
+ prepare="--prepare"
fi
echo "Preparing JSON report..."
license_management report ${prepare} --format=json --save=gl-license-management-report.json ${LICENSE_FINDER_CLI_OPTS}