[jruby] 01/02: Bump dependency on maven-assembly-plugin to 3.0.0

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository jruby.

commit 1f9eac15a88f426dc35ba5ae35bba8124061cf4f
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Jul 27 20:14:09 2017 +0100

    Bump dependency on maven-assembly-plugin to 3.0.0
---
 debian/changelog                                                | 7 +++++++
 debian/control                                                  | 2 +-
 debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a6b8d9..610d51a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jruby (9.1.8.0-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS caused by an unresolved dependency on an outdated version
+    of libmaven-assembly-plugin-java.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Thu, 27 Jul 2017 19:32:12 +0100
+
 jruby (9.1.8.0-1) unstable; urgency=medium
 
   * Upload to unstable. (Closes: #867652).
diff --git a/debian/control b/debian/control
index 825b213..4c46605 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Build-Depends: ant-optional,
                libjruby-joni-java,
                libjzlib-java,
                liblivetribe-jsr223-java,
-               libmaven-assembly-plugin-java,
+               libmaven-assembly-plugin-java (>= 3.0.0~),
                libmaven-antrun-plugin-java,
                libmaven-bundle-plugin-java,
                libmaven-dependency-plugin-java,
diff --git a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
index 192b0e6..9ea22cf 100644
--- a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
+++ b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
@@ -199,7 +199,7 @@ Last-Update: 2017-03-08
 +      </plugin>
 +      <plugin>
 +        <artifactId>maven-assembly-plugin</artifactId>
-+        <version>2.4.1</version>
++        <version>3.0.0</version>
 +        <executions>
 +          <execution>
 +            <id>bin.tar.gz and bin.zip</id>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git