summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Eldem <celdem@gitlab.com>2020-03-23 10:28:46 +0000
committerCan Eldem <celdem@gitlab.com>2020-03-23 10:28:46 +0000
commit2f7903762a61658aa7d550055aff08560808458f (patch)
treea40f3a7531f13eeec7664beb82459b391c5605e5
parentd9ddfb4662dc3d9ba283e7832f6d1ec0e1451d25 (diff)
parent3f11d475d29b7ebb3222be90fb75e582e3a2afb5 (diff)
Merge branch '211515-load-plugin-from-local' into 'master'v3.1.3
Install maven license plugin into local repository. See merge request gitlab-org/security-products/license-management!124
-rw-r--r--CHANGELOG.md4
-rw-r--r--Dockerfile2
-rw-r--r--Gemfile.lock2
-rw-r--r--lib/license/finder/ext/maven.rb2
-rw-r--r--lib/license/management/version.rb2
5 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc28b9a..9a36aef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v3.1.3
+
+- Install `license-maven-plugin` into local repository. (!124)
+
## v3.1.2
- Use `license-maven-plugin:aggreate-download-licenses` for multi-module projects. (!123)
diff --git a/Dockerfile b/Dockerfile
index c810901..6c0160e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN bash /root/install.sh
FROM tools-builder
ENV LM_HOME=/opt/license-management
-COPY --from=license-maven-plugin-builder /root/.m2/repository/* /root/.m2/repository/
+COPY --from=license-maven-plugin-builder /root/.m2/repository /root/.m2/repository
COPY --from=gem-builder /opt/license-management/*.gem $LM_HOME/pkg/
COPY run.sh /
ENTRYPOINT ["/run.sh"]
diff --git a/Gemfile.lock b/Gemfile.lock
index f0b6004..020f124 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- license-management (3.1.2)
+ license-management (3.1.3)
license_finder (~> 6.0.0)
GEM
diff --git a/lib/license/finder/ext/maven.rb b/lib/license/finder/ext/maven.rb
index 954d18d..00e0d38 100644
--- a/lib/license/finder/ext/maven.rb
+++ b/lib/license/finder/ext/maven.rb
@@ -23,7 +23,7 @@ module LicenseFinder
[
package_management_command,
"-e",
- "org.codehaus.mojo:license-maven-plugin:aggregate-download-licenses",
+ "org.codehaus.mojo:license-maven-plugin:2.0.0:aggregate-download-licenses",
"-Dlicense.excludedScopes=#{@ignored_groups.to_a.join(',')}",
ENV.fetch('MAVEN_CLI_OPTS', '-DskipTests')
].join(' ')
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 9b8fdc3..b26354f 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.1.2'
+ VERSION = '3.1.3'
end
end