This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-plugin-tools.
commit 6044333282382036087174ae91d6f3dbd5dba61d Author: Emmanuel Bourg <[email protected]> Date: Mon Jun 26 09:31:17 2017 +0200 Refreshed the patches --- debian/changelog | 5 ++++- debian/patches/04-reproducible-plugin-descriptor.patch | 10 ++++------ debian/patches/05-fix-plugin-annotation.patch | 16 ---------------- debian/patches/07-MPLUGIN-238.patch | 15 --------------- debian/patches/series | 2 -- 5 files changed, 8 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76b2e28..26cb9ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -maven-plugin-tools (3.3-6) UNRELEASED; urgency=medium +maven-plugin-tools (3.4-1) UNRELEASED; urgency=medium + * Team upload. + * New upstream release + - Refreshed the patches * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/debian/patches/04-reproducible-plugin-descriptor.patch b/debian/patches/04-reproducible-plugin-descriptor.patch index c675411..48d7c00 100644 --- a/debian/patches/04-reproducible-plugin-descriptor.patch +++ b/debian/patches/04-reproducible-plugin-descriptor.patch @@ -2,11 +2,9 @@ Author: Reiner Herrmann <[email protected]> Description: Don't include the date in xml files Embedding the current date will result in unreproducible files. -Index: maven-plugin-tools-3.3/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java -=================================================================== ---- maven-plugin-tools-3.3.orig/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java -+++ maven-plugin-tools-3.3/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java -@@ -24,8 +24,6 @@ import java.io.FileOutputStream; +--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java ++++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +@@ -24,8 +24,6 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; @@ -15,7 +13,7 @@ Index: maven-plugin-tools-3.3/maven-plugin-tools-generators/src/main/java/org/ap import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; -@@ -132,8 +130,7 @@ public class PluginDescriptorGenerator +@@ -129,8 +127,7 @@ XMLWriter w = new PrettyPrintXMLWriter( writer, encoding, null ); diff --git a/debian/patches/05-fix-plugin-annotation.patch b/debian/patches/05-fix-plugin-annotation.patch deleted file mode 100644 index 311cef9..0000000 --- a/debian/patches/05-fix-plugin-annotation.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Replace the @Component annotation with @Parameter for the 'project' - field in PluginReport to fix a build failure. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed -Bug-Debian: https://bugs.debian.org/796445 ---- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java -+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java -@@ -85,7 +85,7 @@ - /** - * The Maven Project. - */ -- @Component -+ @Parameter( defaultValue = "${project}", required = true, readonly = true ) - private MavenProject project; - - /** diff --git a/debian/patches/07-MPLUGIN-238.patch b/debian/patches/07-MPLUGIN-238.patch deleted file mode 100644 index 4cc4d9d..0000000 --- a/debian/patches/07-MPLUGIN-238.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Avoid HelpMojo failure when using java-annotations without any configuration -Origin: backport, http://svn.apache.org/r1599050 -Bug: https://issues.apache.org/jira/browse/MPLUGIN-238 ---- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java -+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java -@@ -85,6 +85,9 @@ - public void execute() - throws MojoExecutionException - { -+ // force value for this plugin -+ skipErrorNoDescriptorsFound = true; -+ - super.execute(); - - if ( !project.getCompileSourceRoots().contains( outputDirectory.getAbsolutePath() ) && !skip ) diff --git a/debian/patches/series b/debian/patches/series index 1224eb8..93b80e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ 04-reproducible-plugin-descriptor.patch -05-fix-plugin-annotation.patch -07-MPLUGIN-238.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-plugin-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
