[plexus-archiver] 39/44: Fixed a build failure with the version of plexus-utils in Debian

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository plexus-archiver.

commit d69f6b5159b23cba1cd8d33844ebcfff7b547c16
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 14:04:07 2017 +0200

    Fixed a build failure with the version of plexus-utils in Debian
---
 debian/changelog                                   |  1 +
 debian/patches/03-plexus-utils-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 19e8f9d..0dc89b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ plexus-archiver (3.5-1) UNRELEASED; urgency=medium
     - New dependency on libsnappy-java and libcommons-compress-java
     - New build dependency on libplexus-component-metadata-java and junit4
     - Depend on libplexus-utils2-java instead of libplexus-utils-java
+    - Fixed a build failure with the version of plexus-utils in Debian
   * Build with maven-debian-helper instead of maven-ant-helper
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/patches/03-plexus-utils-compatibility.patch b/debian/patches/03-plexus-utils-compatibility.patch
new file mode 100644
index 0000000..ecde7c6
--- /dev/null
+++ b/debian/patches/03-plexus-utils-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of plexus-utils in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/codehaus/plexus/archiver/jar/JdkManifestFactory.java
++++ b/src/main/java/org/codehaus/plexus/archiver/jar/JdkManifestFactory.java
+@@ -62,7 +62,7 @@
+                        : null;
+ 
+         }
+-        catch ( final IOException e )
++        catch ( final Throwable e )
+         {
+             throw new AssertionError( e );
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 18c6302..f6be460 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 02-snappy-compatibility.patch
+03-plexus-utils-compatibility.patch

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