diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/license/management/report/v2.rb | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 | ||||
| -rw-r--r-- | test/results/java-maven-v2.json | 8 | ||||
| -rw-r--r-- | test/results/js-npm-v2.json | 4 |
6 files changed, 13 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index abc4af2..664d0ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v2.1.1 + +- Sort license identifiers associated with each dependency + ## v2.1.0 - Bump LicenseFinder to 5.9.2 diff --git a/Gemfile.lock b/Gemfile.lock index 5d5dd20..bb6624d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - license-management (2.0.2) + license-management (2.1.1) license_finder (= 5.6.2) GEM diff --git a/lib/license/management/report/v2.rb b/lib/license/management/report/v2.rb index 87c4a78..6ab6b99 100644 --- a/lib/license/management/report/v2.rb +++ b/lib/license/management/report/v2.rb @@ -30,7 +30,7 @@ module License end def map_from(dependency) - licenses = dependency.licenses.map { |license| data_for(license)['id'] } + licenses = dependency.licenses.map { |license| data_for(license)['id'] }.sort log_info [dependency.name, dependency.version, licenses].inspect { diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index f3a71d3..a787ab5 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '2.0.2' + VERSION = '2.1.1' end end diff --git a/test/results/java-maven-v2.json b/test/results/java-maven-v2.json index 5875bc4..ce83702 100644 --- a/test/results/java-maven-v2.json +++ b/test/results/java-maven-v2.json @@ -219,9 +219,9 @@ "." ], "licenses": [ - "MPL-1.1", + "Apache-2.0", "LGPL-2.1", - "Apache-2.0" + "MPL-1.1" ] }, { @@ -265,8 +265,8 @@ "." ], "licenses": [ - "LGPL-2.1", - "Apache-2.0" + "Apache-2.0", + "LGPL-2.1" ] }, { diff --git a/test/results/js-npm-v2.json b/test/results/js-npm-v2.json index 1e5f634..76b97fb 100644 --- a/test/results/js-npm-v2.json +++ b/test/results/js-npm-v2.json @@ -1948,10 +1948,10 @@ "." ], "licenses": [ - "MIT", "Apache-2.0", + "BSD-3-Clause", "ISC", - "BSD-3-Clause" + "MIT" ] }, { |