diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-11-15 19:45:09 +0000 |
|---|---|---|
| committer | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-11-15 19:45:09 +0000 |
| commit | a9d6626a63a83f2b4f20d97733dccfe7bdc83306 (patch) | |
| tree | f2498b734f0c421273fb688e5b8d12f1644826d3 | |
| parent | da869dff7b839dbb852e9bb91bf9cf574078da54 (diff) | |
| parent | c18618428030db4ed908f9564054cbcd07563379 (diff) | |
Merge branch '12-5' into 'master'v2.0.0
Change default to report version 2.0
See merge request gitlab-org/security-products/license-management!66
| -rw-r--r-- | .env.12-5-stable | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/.env.12-5-stable b/.env.12-5-stable index 79d7c86..0ee1d53 100644 --- a/.env.12-5-stable +++ b/.env.12-5-stable @@ -1 +1 @@ -LM_REPORT_VERSION '1.1' +LM_REPORT_VERSION '2.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index 79d9eb1..686f4b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v2.0.0 + +- Update the default report version to v2.0 (!66) + ## v1.8.3 - Update java 11 from 11.0.2 to 11.0.5 diff --git a/Gemfile.lock b/Gemfile.lock index 24efd8e..6d92453 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - license-management (1.8.0) + license-management (2.0.0) license_finder (= 5.6.2) GEM diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 4047dff..48f6c19 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '1.8.2' + VERSION = '2.0.0' end end |