diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-03-20 10:31:37 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-03-20 10:31:37 +0000 |
| commit | d9ddfb4662dc3d9ba283e7832f6d1ec0e1451d25 (patch) | |
| tree | 417c4a313b1d6428c1a43f38278d2c828a36b293 /lib/license/management | |
| parent | df97efaccfc0a5d4e3ef564e74c60987f65ff6fa (diff) | |
| parent | 43fec0e1e3151371929139c4f67c43e7f81f1a80 (diff) | |
Merge branch 'java-maven-multimodules' into 'master'v3.1.2
Detect all licenses for maven multi-module projects.
See merge request gitlab-org/security-products/license-management!123
Diffstat (limited to 'lib/license/management')
| -rw-r--r-- | lib/license/management/loggable.rb | 6 | ||||
| -rw-r--r-- | lib/license/management/report/base.rb | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/license/management/loggable.rb b/lib/license/management/loggable.rb index 165d8ca..0122018 100644 --- a/lib/license/management/loggable.rb +++ b/lib/license/management/loggable.rb @@ -4,15 +4,15 @@ module License module Management module Loggable def logger - ::LicenseFinder::Core.default_logger + License::Management.logger end def log_info(message) - logger.info(self.class, message) + logger.info(message) end def log_error(message) - logger.info(self.class, message, color: :red) + logger.error(message) end end end diff --git a/lib/license/management/report/base.rb b/lib/license/management/report/base.rb index 2d49341..0155c15 100644 --- a/lib/license/management/report/base.rb +++ b/lib/license/management/report/base.rb @@ -26,7 +26,7 @@ module License paths = dependency.aggregate_paths return [] if blank?(paths) - paths.map { |x| x.gsub(Dir.pwd, '.') } + paths.map { |x| x.gsub(Dir.pwd, '.') }.sort end def description_for(dependency) diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 308a738..9b8fdc3 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.1.1' + VERSION = '3.1.2' end end |
