Author: ebourg-guest Date: 2013-12-17 17:02:59 +0000 (Tue, 17 Dec 2013) New Revision: 17587
Removed: trunk/maven-assembly-plugin/debian/patches/plexus-archiver-compatibility.patch Modified: trunk/maven-assembly-plugin/debian/changelog trunk/maven-assembly-plugin/debian/patches/descriptors.patch trunk/maven-assembly-plugin/debian/patches/series Log: New upstream release (2.2) Modified: trunk/maven-assembly-plugin/debian/changelog =================================================================== --- trunk/maven-assembly-plugin/debian/changelog 2013-12-17 16:23:06 UTC (rev 17586) +++ trunk/maven-assembly-plugin/debian/changelog 2013-12-17 17:02:59 UTC (rev 17587) @@ -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 Modified: trunk/maven-assembly-plugin/debian/patches/descriptors.patch =================================================================== --- trunk/maven-assembly-plugin/debian/patches/descriptors.patch 2013-12-17 16:23:06 UTC (rev 17586) +++ trunk/maven-assembly-plugin/debian/patches/descriptors.patch 2013-12-17 17:02:59 UTC (rev 17587) @@ -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; - + Deleted: trunk/maven-assembly-plugin/debian/patches/plexus-archiver-compatibility.patch =================================================================== --- trunk/maven-assembly-plugin/debian/patches/plexus-archiver-compatibility.patch 2013-12-17 16:23:06 UTC (rev 17586) +++ trunk/maven-assembly-plugin/debian/patches/plexus-archiver-compatibility.patch 2013-12-17 17:02:59 UTC (rev 17587) @@ -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 ); -+ } - } - Modified: trunk/maven-assembly-plugin/debian/patches/series =================================================================== --- trunk/maven-assembly-plugin/debian/patches/series 2013-12-17 16:23:06 UTC (rev 17586) +++ trunk/maven-assembly-plugin/debian/patches/series 2013-12-17 17:02:59 UTC (rev 17587) @@ -1,2 +1 @@ descriptors.patch -plexus-archiver-compatibility.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
