[easymock] 06/07: Drop maven-jar-plugin-compatibility.patch

[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 5942221c6e11bcb784d1d8f7ce61259fcdadbbfd
Author: Markus Koschany <apo at debian.org>
Date:   Sat Jul 22 15:26:50 2017 +0200

    Drop maven-jar-plugin-compatibility.patch
---
 .../patches/maven-jar-plugin-compatibility.patch   | 25 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 26 deletions(-)

diff --git a/debian/patches/maven-jar-plugin-compatibility.patch b/debian/patches/maven-jar-plugin-compatibility.patch
deleted file mode 100644
index 6cf2477..0000000
--- a/debian/patches/maven-jar-plugin-compatibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 0021777..d1d13c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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