This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-assembly-plugin.
commit 213f06c0cc9aec5ca2e48e6ac7a90c4acbec0076 Author: Emmanuel Bourg <[email protected]> Date: Mon Nov 2 14:27:27 2015 +0100 Removed descriptors.patch --- debian/changelog | 4 ++-- debian/patches/descriptors.patch | 26 -------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26d8e61..408ca95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -maven-assembly-plugin (2.3-1) UNRELEASED; urgency=medium +maven-assembly-plugin (2.4.1-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - - Refreshed the patches + - Removed descriptors.patch * Fixed the build failure caused by the modello upgrade (Closes: #797245) * Use XZ compression for the upstream tarball * Documented the procedure to update the core Maven plugins in README.source diff --git a/debian/patches/descriptors.patch b/debian/patches/descriptors.patch deleted file mode 100644 index 57a399d..0000000 --- a/debian/patches/descriptors.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java -+++ b/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java -@@ -233,7 +233,7 @@ - /** - * Maven ProjectHelper. - * -- * @component -+ * @component role="org.apache.maven.project.MavenProjectHelper" - */ - private MavenProjectHelper projectHelper; - -@@ -322,12 +322,12 @@ - private boolean attach; - - /** -- * @component -+ * @component role="org.apache.maven.plugin.assembly.archive.AssemblyArchiver" - */ - private AssemblyArchiver assemblyArchiver; - - /** -- * @component -+ * @component role="org.apache.maven.plugin.assembly.io.AssemblyReader" - */ - private AssemblyReader assemblyReader; - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 3967a53..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -descriptors.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-assembly-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
