This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository easymock.
commit b578045a54202273975ebd42dcd42c50620da9c8 Author: Markus Koschany <[email protected]> Date: Sat Jul 22 15:28:41 2017 +0200 Update maven-jar-plugin-compatibility.patch --- .../patches/maven-jar-plugin-compatibility.patch | 68 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 69 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..986eb6a --- /dev/null +++ b/debian/patches/maven-jar-plugin-compatibility.patch @@ -0,0 +1,68 @@ +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 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 _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
