Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-1099 

Submitted by: Dan Tran
Reviewed by:  Brett Porter
only attempt to unpack known dependencies

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@306505 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-06 03:01:50 +00:00
parent 24a5bf4525
commit fa968c9a87
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AbstractUnpackingMojo.java
View File

@ -18,7 +18,6 @@ package org.apache.maven.plugin.assembly;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager; import org.codehaus.plexus.archiver.manager.ArchiverManager;
@ -90,25 +89,16 @@ public abstract class AbstractUnpackingMojo
*/ */
protected void unpack( File file, File location ) protected void unpack( File file, File location )
throws MojoExecutionException, MojoFailureException throws MojoExecutionException, NoSuchArchiverException
{ {
String archiveExt = FileUtils.getExtension( file.getAbsolutePath() ).toLowerCase(); String archiveExt = FileUtils.getExtension( file.getAbsolutePath() ).toLowerCase();
this.getLog().info( "Look up archiver type: " + archiveExt ); try
{
UnArchiver unArchiver; UnArchiver unArchiver;
try
{
unArchiver = this.archiverManager.getUnArchiver( archiveExt ); unArchiver = this.archiverManager.getUnArchiver( archiveExt );
}
catch ( NoSuchArchiverException e )
{
throw new MojoFailureException( "Unable to obtain unarchiver for extension '" + archiveExt + "'" );
}
try
{
unArchiver.setSourceFile( file ); unArchiver.setSourceFile( file );
unArchiver.setDestDirectory( location ); unArchiver.setDestDirectory( location );

8
maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
View File

@ -293,9 +293,17 @@ public class AssemblyMojo
} }
if ( process ) if ( process )
{
try
{ {
unpack( artifact.getFile(), tempLocation ); unpack( artifact.getFile(), tempLocation );
} }
catch ( NoSuchArchiverException e )
{
throw new MojoExecutionException(
"Unable to obtain unarchiver for file '" + artifact.getFile() + "'" );
}
}
archiver.addDirectory( tempLocation, null, archiver.addDirectory( tempLocation, null,
(String[]) getDefaultExcludes().toArray( EMPTY_STRING_ARRAY ) ); (String[]) getDefaultExcludes().toArray( EMPTY_STRING_ARRAY ) );
} }

9
maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/UnpackMojo.java
View File

@ -19,6 +19,7 @@ package org.apache.maven.plugin.assembly;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import java.io.File; import java.io.File;
import java.util.Iterator; import java.util.Iterator;
@ -62,9 +63,17 @@ public class UnpackMojo
if ( process ) if ( process )
{ {
File file = artifact.getFile(); File file = artifact.getFile();
try
{
unpack( file, tempLocation ); unpack( file, tempLocation );
} }
catch ( NoSuchArchiverException e )
{
this.getLog().info( "Skip unpacking dependency file with unknown extension: " + file.getPath() );
}
}
} }
} }
} }