[MWAR-339] Upgrade plexus-archiver to 2.9
- Upgraded plexus-io to 2.4
- Fixed the usage of ignoring web xml option
using setExpectWebXml instead of setIgnoreWebxml which
is deprecated.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1642463 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/war/WarMojo.java b/src/main/java/org/apache/maven/plugin/war/WarMojo.java
index f5c2fb4..1050ad1 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/war/WarMojo.java
@@ -48,15 +48,9 @@
* @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
-/**
- * @author kama
- *
- */
-@Mojo(
- name = "war",
- defaultPhase = LifecyclePhase.PACKAGE,
- threadSafe = true,
- requiresDependencyResolution = ResolutionScope.RUNTIME )
+// CHECKSTYLE_OFF: LineLength
+@Mojo( name = "war", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true, requiresDependencyResolution = ResolutionScope.RUNTIME )
+//CHECKSTYLE_ON: LineLength
public class WarMojo
extends AbstractWarMojo
{
@@ -210,8 +204,8 @@
* @throws MojoFailureException if a fatal exception occurred
*/
private void performPackaging( File warFile )
- throws IOException, ManifestException, DependencyResolutionRequiredException,
- MojoExecutionException, MojoFailureException
+ throws IOException, ManifestException, DependencyResolutionRequiredException, MojoExecutionException,
+ MojoFailureException
{
getLog().info( "Packaging webapp" );
@@ -243,8 +237,7 @@
if ( !failOnMissingWebXml )
{
getLog().debug( "Build won't fail if web.xml file is missing." );
- // The flag is wrong in plexus-archiver so it will need to be fixed at some point
- warArchiver.setIgnoreWebxml( false );
+ warArchiver.setExpectWebXml( false );
}
// create archive
@@ -295,7 +288,7 @@
/**
* @param basedir The basedir
* @param finalName The finalName
- * @param classifier The classifier.
+ * @param classifier The classifier.
* @param type The type.
* @return {@link File}
*/
@@ -403,7 +396,7 @@
}
/**
- * @param outputDirectory {@link #outputDirectory}
+ * @param outputDirectory {@link #outputDirectory}
*/
public void setOutputDirectory( String outputDirectory )
{