diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-03-24 10:49:51 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-03-24 10:49:51 +0000 |
| commit | 4db9ccdf7a07654e7d546b5a6ab7467cf3818c93 (patch) | |
| tree | c2912e3d93d0eb707c892532faa16f67830dd512 | |
| parent | 2f7903762a61658aa7d550055aff08560808458f (diff) | |
| parent | 03a2811bcffa6b4d6673d4229b09cb772bf2589b (diff) | |
Merge branch 'enable-maven-logging' into 'master'v3.1.4
Include debug logs from the license-maven-plugin
See merge request gitlab-org/security-products/license-management!127
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/license/finder/ext/maven.rb | 1 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a36aef..d2c2cd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.1.4 + +- Print `license-maven-plugin` logs to console. (!127) + ## v3.1.3 - Install `license-maven-plugin` into local repository. (!124) diff --git a/Gemfile.lock b/Gemfile.lock index 020f124..8776c4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - license-management (3.1.3) + license-management (3.1.4) license_finder (~> 6.0.0) GEM diff --git a/lib/license/finder/ext/maven.rb b/lib/license/finder/ext/maven.rb index 00e0d38..159f9f9 100644 --- a/lib/license/finder/ext/maven.rb +++ b/lib/license/finder/ext/maven.rb @@ -25,6 +25,7 @@ module LicenseFinder "-e", "org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses", "-Dlicense.excludedScopes=#{@ignored_groups.to_a.join(',')}", + "-Dorg.slf4j.simpleLogger.log.org.codehaus.mojo.license=debug", ENV.fetch('MAVEN_CLI_OPTS', '-DskipTests') ].join(' ') end diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index b26354f..c004a9c 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.1.3' + VERSION = '3.1.4' end end |