[maven-plugin-tools] 06/08: Removed 01-maven2-api-compatibility.patch

[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 881b47869700ddbce2d713cf72d07b1a179781a1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 28 10:01:59 2016 +0100

    Removed 01-maven2-api-compatibility.patch
---
 debian/changelog                                 |  1 +
 debian/patches/01-maven2-api-compatibility.patch | 25 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9797e66..4321c2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ 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 01-maven2-api-compatibility.patch
   * Removed 02-plexus-archiver1-compatibility.patch and require
     libplexus-archiver-java (>= 2.0)
   * Removed 03-plexus-utils2-compatibility.patch
diff --git a/debian/patches/01-maven2-api-compatibility.patch b/debian/patches/01-maven2-api-compatibility.patch
deleted file mode 100644
index 3d7e887..0000000
--- a/debian/patches/01-maven2-api-compatibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: ResolutionScope uses constant values from the Artifact class that
- only exist in Maven 3. This patches replaces them with the equivalent
- literals to preserve the compatibility with Maven 2.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
-+++ b/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/ResolutionScope.java
-@@ -43,7 +43,7 @@
-      * <code>compile+runtime</code> resolution scope (Maven 3 only)
-      * = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> dependencies
-      */
--    COMPILE_PLUS_RUNTIME( Artifact.SCOPE_COMPILE_PLUS_RUNTIME ),
-+    COMPILE_PLUS_RUNTIME( "compile+runtime" ),
-     /**
-      * <code>runtime</code> resolution scope
-      * = <code>compile</code> + <code>runtime</code> dependencies
-@@ -53,7 +53,7 @@
-      * <code>runtime+system</code> resolution scope (Maven 3 only)
-      * = <code>compile</code> + <code>system</code> + <code>runtime</code> dependencies
-      */
--    RUNTIME_PLUS_SYSTEM( Artifact.SCOPE_RUNTIME_PLUS_SYSTEM ),
-+    RUNTIME_PLUS_SYSTEM( "runtime+system" ),
-     /**
-      * <code>test</code> resolution scope
-      * = <code>compile</code> + <code>system</code> + <code>provided</code> + <code>runtime</code> + <code>test</code>
diff --git a/debian/patches/series b/debian/patches/series
index bbcd6e6..2a15c13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-maven2-api-compatibility.patch
 04-reproducible-plugin-descriptor.patch
 05-fix-plugin-annotation.patch
 06-plexus-component-metadata-version.patch

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