[maven-war-plugin] 09/12: Depend on libmaven3-core-java instead of libmaven2-core-java

[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-war-plugin.

commit a6cd8283362f7a455aa415d18dabdbe8ad5b25f6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 15:59:32 2017 +0200

    Depend on libmaven3-core-java instead of libmaven2-core-java
---
 debian/changelog                             |  1 +
 debian/control                               |  2 +-
 debian/maven.rules                           |  4 ++++
 debian/patches/01-aether-compatibility.patch | 21 +++++++++++++++++++++
 debian/patches/series                        |  1 +
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 09a1263..2bbde87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-war-plugin (3.1.0-1) UNRELEASED; urgency=medium
     - Removed MWAR-269.diff (fixed upstream)
     - New dependency on libmaven-mapping-java
     - Build depend on junit4 instead of junit
+    - Depend on libmaven3-core-java instead of libmaven2-core-java
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index a751861..db45c84 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep: junit4,
                      libmaven-mapping-java,
                      libmaven-plugin-testing-java,
                      libmaven-plugin-tools-java,
-                     libmaven2-core-java,
+                     libmaven3-core-java,
                      libplexus-archiver-java,
                      libplexus-io-java,
                      libplexus-utils-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 87ee27a..6a01a49 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,3 +21,7 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
+
+org.apache.maven maven-compat     * s/.*/3.x/ * *
+org.apache.maven maven-core       * s/.*/3.x/ * *
+org.apache.maven maven-plugin-api * s/.*/3.x/ * *
diff --git a/debian/patches/01-aether-compatibility.patch b/debian/patches/01-aether-compatibility.patch
new file mode 100644
index 0000000..b2be7fb
--- /dev/null
+++ b/debian/patches/01-aether-compatibility.patch
@@ -0,0 +1,21 @@
+Description: Fixes the compatibility with the version of Aether/Maven Resolver in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
++++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
+@@ -37,7 +37,7 @@
+ import org.codehaus.plexus.archiver.ArchiverException;
+ import org.codehaus.plexus.archiver.jar.JarArchiver;
+ import org.codehaus.plexus.util.FileUtils;
+-import org.sonatype.aether.RepositorySystemSession;
++import org.eclipse.aether.RepositorySystemSession;
+ 
+ public abstract class AbstractWarMojoTest
+     extends AbstractMojoTestCase
+@@ -332,4 +332,4 @@
+         }
+     }
+ 
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4951e63
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-aether-compatibility.patch

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