summaryrefslogtreecommitdiff
path: root/lib/license
diff options
context:
space:
mode:
authormo khan <mo.khan@gmail.com>2019-12-11 20:27:44 +0000
committermo khan <mo.khan@gmail.com>2019-12-11 20:27:44 +0000
commit1decc44a7ae62d9bc713c7b9696638a5be1df563 (patch)
tree9bef5510d79acaa898e80969077b0a57e8187418 /lib/license
parentdaf6c9d460938ff58ba910cf4b518082f34378f6 (diff)
parent5d7913bc966544adba62fe108ac98b496788d795 (diff)
Merge branch 'sort-licenses' into 'master'v2.1.1
Sort license identifiers See merge request gitlab-org/security-products/license-management!91
Diffstat (limited to 'lib/license')
-rw-r--r--lib/license/management/report/v2.rb2
-rw-r--r--lib/license/management/version.rb2
2 files changed, 2 insertions, 2 deletions
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