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

PR: MNG-1274 

Submitted By: Jerome Lacoste
Reviewed By: John Casey

Applied patch. Thanks, Jerome!



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@344424 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-11-15 20:00:37 +00:00
parent 8b824565b6
commit ba7249b692
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-plugins/maven-assembly-plugin/pom.xml
View File

@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId> <artifactId>plexus-archiver</artifactId>
<version>1.0-alpha-3</version> <version>1.0-alpha-4-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>

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

@ -34,6 +34,7 @@ import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException; import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
import org.codehaus.plexus.archiver.tar.TarArchiver; import org.codehaus.plexus.archiver.tar.TarArchiver;
import org.codehaus.plexus.archiver.war.WarArchiver;
import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.IOUtil;
@ -358,6 +359,11 @@ public class AssemblyMojo
evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), artifact ) ); evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), artifact ) );
} }
} }
else {
// would be better to have a way to find out when a specified include or exclude
// is never triggered and warn() it.
getLog().debug( "artifact: " + artifact + " not included" );
}
} }
} }
} }
@ -591,6 +597,12 @@ public class AssemblyMojo
tarArchiver.setCompression( tarCompressionMethod ); tarArchiver.setCompression( tarCompressionMethod );
} }
} }
else if ( format.equals( "war" ) )
{
WarArchiver warArchiver = (WarArchiver) this.archiverManager.getArchiver( "war" );
warArchiver.setIgnoreWebxml( false ); // See MNG-1274
archiver = warArchiver;
}
else else
{ {
archiver = this.archiverManager.getArchiver( format ); archiver = this.archiverManager.getArchiver( format );