Author: krosenvold Date: Tue Jun 16 18:26:29 2015 New Revision: 1685886 URL: http://svn.apache.org/r1685886 Log: Upgraded to plexus-archiver 3.0.1
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?rev=1685886&r1=1685885&r2=1685886&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Tue Jun 16 18:26:29 2015 @@ -128,7 +128,7 @@ under the License. <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-archiver</artifactId> - <version>2.10.2</version> + <version>3.0.1</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java?rev=1685886&r1=1685885&r2=1685886&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java Tue Jun 16 18:26:29 2015 @@ -146,9 +146,8 @@ public class AssemblyProxyArchiver inPublicApi.set( Boolean.TRUE ); try { - final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(); + final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile ); - fs.setArchive( archiveFile ); fs.setIncludes( includes ); fs.setExcludes( excludes ); fs.setPrefix( rootPrefix + prefix ); @@ -180,9 +179,8 @@ public class AssemblyProxyArchiver inPublicApi.set( Boolean.TRUE ); try { - final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(); + final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile ); - fs.setArchive( archiveFile ); fs.setPrefix( rootPrefix + prefix ); fs.setFileSelectors( selectors ); @@ -204,9 +202,8 @@ public class AssemblyProxyArchiver inPublicApi.set( Boolean.TRUE ); try { - final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(); + final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile ); - fs.setArchive( archiveFile ); fs.setIncludes( includes ); fs.setExcludes( excludes ); fs.setPrefix( rootPrefix ); @@ -230,9 +227,8 @@ public class AssemblyProxyArchiver inPublicApi.set( Boolean.TRUE ); try { - final DefaultArchivedFileSet fs = new DefaultArchivedFileSet(); + final DefaultArchivedFileSet fs = new DefaultArchivedFileSet( archiveFile ); - fs.setArchive( archiveFile ); fs.setPrefix( rootPrefix ); fs.setFileSelectors( selectors ); Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java?rev=1685886&r1=1685885&r2=1685886&view=diff ============================================================================== --- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java (original) +++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/format/ReaderFormatterTest.java Tue Jun 16 18:26:29 2015 @@ -117,7 +117,7 @@ public class ReaderFormatterTest private PlexusIoVirtualFileResource dummyResource() { - return new PlexusIoVirtualFileResource( new File( "fud" ) ) + return new PlexusIoVirtualFileResource( new File( "fud" ), "fud" ) { }; }