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 37f23762c95d60e0081fde688866a87927fae1dc Author: Emmanuel Bourg <[email protected]> Date: Tue Dec 17 17:02:59 2013 +0000 New upstream release (2.2) --- debian/changelog | 4 +- debian/patches/descriptors.patch | 8 ++-- debian/patches/plexus-archiver-compatibility.patch | 44 ---------------------- debian/patches/series | 1 - 4 files changed, 7 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index c0f7385..efcfb02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -maven-assembly-plugin (2.2~beta5-4) UNRELEASED; urgency=medium +maven-assembly-plugin (2.2-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Tue, 17 Dec 2013 17:22:37 +0100 diff --git a/debian/patches/descriptors.patch b/debian/patches/descriptors.patch index f6de7aa..70925f4 100644 --- a/debian/patches/descriptors.patch +++ b/debian/patches/descriptors.patch @@ -1,14 +1,14 @@ --- a/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugin/assembly/mojos/AbstractAssemblyMojo.java -@@ -208,7 +208,7 @@ +@@ -207,7 +207,7 @@ /** * Maven ProjectHelper. - * + * - * @component + * @component role="org.apache.maven.project.MavenProjectHelper" */ private MavenProjectHelper projectHelper; - + @@ -289,12 +289,12 @@ private boolean attach; @@ -23,4 +23,4 @@ + * @component role="org.apache.maven.plugin.assembly.io.AssemblyReader" */ private AssemblyReader assemblyReader; - + diff --git a/debian/patches/plexus-archiver-compatibility.patch b/debian/patches/plexus-archiver-compatibility.patch deleted file mode 100644 index 89f5a9e..0000000 --- a/debian/patches/plexus-archiver-compatibility.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: Ensures the compatibility with the version of plexus-archiver - available in Debian. This patch can be dropped after upgrading to - maven-assembly-plugin 2.2 or later. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java -+++ b/src/main/java/org/apache/maven/plugin/assembly/archive/archiver/AssemblyProxyArchiver.java -@@ -75,6 +75,11 @@ - - private Set seenPaths = new HashSet(); - -+ /** -+ * @since 2.2-beta-6 -+ */ -+ private boolean useJvmChmod; -+ - public AssemblyProxyArchiver( String rootPrefix, Archiver delegate, List containerDescriptorHandlers, - List extraSelectors, List extraFinalizers, Logger logger ) - { -@@ -897,4 +902,23 @@ - } - } - -+ public boolean isUseJvmChmod() -+ { -+ return useJvmChmod; -+ } -+ -+ public void setUseJvmChmod( final boolean useJvmChmod ) -+ { -+ this.useJvmChmod = useJvmChmod; -+ } -+ -+ public boolean isIgnorePermissions() -+ { -+ return delegate.isIgnorePermissions(); -+ } -+ -+ public void setIgnorePermissions( boolean ignorePermissions ) -+ { -+ delegate.setIgnorePermissions( ignorePermissions ); -+ } - } - diff --git a/debian/patches/series b/debian/patches/series index d371bf1..3967a53 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ descriptors.patch -plexus-archiver-compatibility.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
