This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository easymock.
commit 6297bdc807a40a0152d065be3ea9df418246f070 Author: Markus Koschany <[email protected]> Date: Fri Sep 15 07:17:06 2017 +0200 Drop maven-jar-plugin-compatibility.patch --- debian/changelog | 1 + .../patches/maven-jar-plugin-compatibility.patch | 68 ---------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 69 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2419e16..6c8e878 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ easymock (3.5+ds-1) unstable; urgency=medium * New upstream version 3.5+ds. * Declare compliance with Debian Policy 4.1.0. * libeasymock-java.poms: Remove --has-package-version flag. + * Drop maven-jar-plugin-compatibility.patch. -- Markus Koschany <[email protected]> Fri, 15 Sep 2017 07:15:45 +0200 diff --git a/debian/patches/maven-jar-plugin-compatibility.patch b/debian/patches/maven-jar-plugin-compatibility.patch deleted file mode 100644 index 986eb6a..0000000 --- a/debian/patches/maven-jar-plugin-compatibility.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 22 Jul 2017 15:27:49 +0200 -Subject: maven-jar-plugin compatibility - -Bug-Debian: https://bugs.debian.org/869018 -Origin: https://github.com/easymock/easymock/commit/2450ddd7a3386f2b6d49a30d72761738b18413e7 ---- - core/pom.xml | 11 ++++++++++- - pom.xml | 3 +-- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/core/pom.xml b/core/pom.xml -index 00e1575..695bab7 100644 ---- a/core/pom.xml -+++ b/core/pom.xml -@@ -66,6 +66,14 @@ - <build> - <plugins> - <plugin> -+ <artifactId>maven-jar-plugin</artifactId> -+ <configuration> -+ <archive> -+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> -+ </archive> -+ </configuration> -+ </plugin> -+ <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> -@@ -85,6 +93,7 @@ - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> -+ <extensions>true</extensions> - <configuration> - <instructions> - <Export-Package>org.easymock.internal.*;poweruser=true;mandatory:=poweruser,org.easymock,org.easymock.cglib.core,org.easymock.cglib.proxy,org.easymock.cglib.reflect,org.easymock.asm</Export-Package> -@@ -94,7 +103,7 @@ - <executions> - <execution> - <id>bundle-manifest</id> -- <phase>prepare-package</phase> -+ <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> -diff --git a/pom.xml b/pom.xml -index db33e5b..e4b2f1c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -174,7 +174,7 @@ - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> -- <version>2.5</version> -+ <version>3.0.2</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> -@@ -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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
