[maven-archiver] 11/13: Fixed an incompatibility with the version of Aether used by Maven 3.5

[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-archiver.

commit f0c468e672d040541e65c1bb109f86bb330735d3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 15:00:32 2017 +0200

    Fixed an incompatibility with the version of Aether used by Maven 3.5
---
 debian/changelog                             |  1 +
 debian/patches/03-aether-compatibility.patch | 16 ++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b2c045f..908750c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ maven-archiver (3.1.1-1) UNRELEASED; urgency=medium
     - Refreshed the patch
     - Depend on libmaven3-core-java instead of libmaven2-core-java
     - New build dependency on libassertj-core-java
+    - Fixed an incompatibility with the version of Aether used by Maven 3.5
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/patches/03-aether-compatibility.patch b/debian/patches/03-aether-compatibility.patch
new file mode 100644
index 0000000..12df0dc
--- /dev/null
+++ b/debian/patches/03-aether-compatibility.patch
@@ -0,0 +1,16 @@
+Description: Fixes the compatibility with the version of Aether used by Maven
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
++++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+@@ -67,8 +67,8 @@
+ import org.codehaus.plexus.archiver.jar.JarArchiver;
+ import org.codehaus.plexus.archiver.jar.ManifestException;
+ import org.junit.Test;
+-import org.sonatype.aether.RepositorySystemSession;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
++import org.eclipse.aether.RepositorySystemSession;
++import org.eclipse.aether.DefaultRepositorySystemSession;
+ 
+ 
+ public class MavenArchiverTest
diff --git a/debian/patches/series b/debian/patches/series
index 85fc734..c841bfc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 #01-maven-artifact-compatibility.patch
 02-use-changelog-date-as-pom.properties-timestamp.patch
+03-aether-compatibility.patch

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