[maven-plugin-tools] 04/08: Removed 02-plexus-archiver1-compatibility.patch and require libplexus-archiver-java (>= 2.0)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-plugin-tools.

commit 3b5404e2ea3994c1be251a8f202c6229b911088f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 28 09:49:57 2016 +0100

    Removed 02-plexus-archiver1-compatibility.patch and require libplexus-archiver-java (>= 2.0)
---
 debian/changelog                                       |  2 ++
 debian/control                                         |  1 +
 debian/patches/02-plexus-archiver1-compatibility.patch | 18 ------------------
 debian/patches/series                                  |  1 -
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2cae6ca..d679321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ maven-plugin-tools (3.3-4) UNRELEASED; urgency=medium
   * Backported the fix for MPLUGIN-238 (HelpMojo fails when using
     java-annotations without any configuration)
   * Converted debian/copyright to the Copyright Format 1.0
+  * Removed 02-plexus-archiver1-compatibility.patch and require
+    libplexus-archiver-java (>= 2.0)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 27 Jan 2016 10:08:59 +0100
 
diff --git a/debian/control b/debian/control
index e8bd02a..ef0f421 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends-Indep: ant,
                      libmaven2-core-java (>= 2.2.1-12),
                      libmodello-maven-plugin-java,
                      libplexus-ant-factory-java,
+                     libplexus-archiver-java (>= 2.0),
                      libplexus-bsh-factory-java,
                      libplexus-containers1.5-java,
                      libplexus-container-default-java,
diff --git a/debian/patches/02-plexus-archiver1-compatibility.patch b/debian/patches/02-plexus-archiver1-compatibility.patch
deleted file mode 100644
index b6ded6a..0000000
--- a/debian/patches/02-plexus-archiver1-compatibility.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: ArchiverException became and unchecked exception in the version 2.0
- of plexus-archiver. For now Debian has an earlier version of plexus-archiver
- and the exception has to be catched explicitely.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
-@@ -221,6 +221,10 @@
- 
-             return discoverClasses( request.getEncoding(), Arrays.asList( extractDirectory ) );
-         }
-+        catch ( org.codehaus.plexus.archiver.ArchiverException e )
-+        {
-+            throw new ExtractionException( e.getMessage(), e );
-+        }
-         catch ( ArtifactResolutionException e )
-         {
-             throw new ExtractionException( e.getMessage(), e );
diff --git a/debian/patches/series b/debian/patches/series
index 5c33b2a..95db7a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01-maven2-api-compatibility.patch
-02-plexus-archiver1-compatibility.patch
 03-plexus-utils2-compatibility.patch
 04-reproducible-plugin-descriptor.patch
 05-fix-plugin-annotation.patch

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