[easymock] 01/07: Fix FTBFS with the latest version of the maven-jar-plugin.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository easymock.

commit 246c74efe6a301979dc691e4edb7706d7f8ad678
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 22 15:14:50 2017 +0200

    Fix FTBFS with the latest version of the maven-jar-plugin.
    
    Thanks: Lucas Nussbaum for the report.
    Closes: #869018
---
 .../patches/maven-jar-plugin-compatibility.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/maven-jar-plugin-compatibility.patch b/debian/patches/maven-jar-plugin-compatibility.patch
new file mode 100644
index 0000000..6cf2477
--- /dev/null
+++ b/debian/patches/maven-jar-plugin-compatibility.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 22 Jul 2017 15:13:02 +0200
+Subject: maven-jar-plugin compatibility
+
+Remove the useDefaultManifestFile option which has been removed in the latest
+version of the maven-jar-plugin and fix the FTBFS.
+
+Bug-Debian: https://bugs.debian.org/869018
+Forwarded: already fixed upstream but not released yet
+---
+ pom.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index db33e5b..65ad48b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -339,7 +339,6 @@
+       <plugin>
+         <artifactId>maven-jar-plugin</artifactId>
+         <configuration>
+-          <useDefaultManifestFile>true</useDefaultManifestFile>
+           <archive>
+             <addMavenDescriptor>true</addMavenDescriptor>
+             <manifest>
diff --git a/debian/patches/series b/debian/patches/series
index d1d13c1..0021777 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-android.patch
+maven-jar-plugin-compatibility.patch

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