summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-06-08 12:16:35 +0000
committerCan Eldem <celdem@gitlab.com>2020-06-08 12:16:35 +0000
commit5eef2e4c1a5c28f4e2b8e48e4701dae56264a979 (patch)
treef853dc1c8601fb4222908f2ce8d4e03880367db3 /lib
parent12ef778891c4bf9fae19ffdc9d566fc7ab309957 (diff)
parent55d3e5288826e21286054ed7cbaaec15e037f1dd (diff)
Merge branch 'asdf-java-version' into 'master'v3.11.2
Load the configured version of Java/Python See merge request gitlab-org/security-products/license-management!163
Diffstat (limited to 'lib')
-rw-r--r--lib/license/finder/ext/maven.rb6
-rw-r--r--lib/license/management/version.rb2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/license/finder/ext/maven.rb b/lib/license/finder/ext/maven.rb
index d6a08dc..1a3dea8 100644
--- a/lib/license/finder/ext/maven.rb
+++ b/lib/license/finder/ext/maven.rb
@@ -12,7 +12,9 @@ module LicenseFinder
def current_packages
Dir.chdir(project_path) do
- LicenseFinder::SharedHelpers::Cmd.run(detect_licenses_command)
+ _stdout, _stderr, status = shell.execute(detect_licenses_command)
+ return [] unless status.success?
+
resource_files.flat_map { |file| map_from(file.read) }.uniq
end
end
@@ -27,7 +29,7 @@ module LicenseFinder
"-Dlicense.excludedScopes=#{@ignored_groups.to_a.join(',')}",
"-Dorg.slf4j.simpleLogger.log.org.codehaus.mojo.license=debug",
ENV.fetch('MAVEN_CLI_OPTS', '-DskipTests')
- ].join(' ')
+ ]
end
def resource_files
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index bf992e9..5570468 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.11.1'
+ VERSION = '3.11.2'
end
end