You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/03/08 20:58:36 UTC
svn commit: r1734135 [1/2] - in /maven/plugins/trunk/maven-war-plugin/src:
main/java/org/apache/maven/plugin/ main/java/org/apache/maven/plugins/
main/java/org/apache/maven/plugins/war/
main/java/org/apache/maven/plugins/war/overlay/ main/java/org/apac...
Author: khmarbaise
Date: Tue Mar 8 19:58:34 2016
New Revision: 1734135
URL: http://svn.apache.org/viewvc?rev=1734135&view=rev
Log:
[MWAR-366] Change package to org.apache.maven.plugins to prevent conflict with Maven Core
Added:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/Overlay.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/
- copied from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/
- copied from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/
- copied from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/util/
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarZipTest.java
- copied, changed from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/overlay/
- copied from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/
- copied from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/
- copied from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/
Removed:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/PathSet.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml
maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java?p2=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,19 +34,19 @@ import org.apache.maven.plugin.AbstractM
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.war.overlay.OverlayManager;
-import org.apache.maven.plugin.war.packaging.CopyUserManifestTask;
-import org.apache.maven.plugin.war.packaging.DependenciesAnalysisPackagingTask;
-import org.apache.maven.plugin.war.packaging.OverlayPackagingTask;
-import org.apache.maven.plugin.war.packaging.SaveWebappStructurePostPackagingTask;
-import org.apache.maven.plugin.war.packaging.WarPackagingContext;
-import org.apache.maven.plugin.war.packaging.WarPackagingTask;
-import org.apache.maven.plugin.war.packaging.WarPostPackagingTask;
-import org.apache.maven.plugin.war.packaging.WarProjectPackagingTask;
-import org.apache.maven.plugin.war.util.WebappStructure;
-import org.apache.maven.plugin.war.util.WebappStructureSerializer;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.war.overlay.OverlayManager;
+import org.apache.maven.plugins.war.packaging.CopyUserManifestTask;
+import org.apache.maven.plugins.war.packaging.DependenciesAnalysisPackagingTask;
+import org.apache.maven.plugins.war.packaging.OverlayPackagingTask;
+import org.apache.maven.plugins.war.packaging.SaveWebappStructurePostPackagingTask;
+import org.apache.maven.plugins.war.packaging.WarPackagingContext;
+import org.apache.maven.plugins.war.packaging.WarPackagingTask;
+import org.apache.maven.plugins.war.packaging.WarPostPackagingTask;
+import org.apache.maven.plugins.war.packaging.WarProjectPackagingTask;
+import org.apache.maven.plugins.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.WebappStructureSerializer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
@@ -507,7 +507,7 @@ public abstract class AbstractWarMojo
}
/**
- * Returns a <tt>List</tt> of the {@link org.apache.maven.plugin.war.packaging.WarPackagingTask} instances to invoke
+ * Returns a <tt>List</tt> of the {@link org.apache.maven.plugins.war.packaging.WarPackagingTask} instances to invoke
* to perform the packaging.
*
* @param overlayManager the overlay manager
@@ -544,7 +544,7 @@ public abstract class AbstractWarMojo
}
/**
- * Returns a <tt>List</tt> of the {@link org.apache.maven.plugin.war.packaging.WarPostPackagingTask} instances to
+ * Returns a <tt>List</tt> of the {@link org.apache.maven.plugins.war.packaging.WarPostPackagingTask} instances to
* invoke to perform the post-packaging.
*
* @return the list of post packaging tasks
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/Overlay.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/Overlay.java?p2=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/Overlay.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/Overlay.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/Overlay.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java?p2=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java?p2=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java?p2=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java?p2=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java&p1=maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/WarMojo.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,12 +28,12 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.util.ClassesPackager;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.war.util.ClassesPackager;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@ package org.apache.maven.plugin.war.over
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.war.Overlay;
+import org.apache.maven.plugins.war.Overlay;
/**
* A default overlay implementation based on an {@link Artifact}.
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.war.Overlay;
+import org.apache.maven.plugins.war.Overlay;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
@@ -176,7 +176,7 @@ public class OverlayManager
*
* @param overlay an overlay
* @return the artifact associated to the overlay
- * @throws org.apache.maven.plugin.war.overlay.InvalidOverlayConfigurationException if the overlay does not have an
+ * @throws org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException if the overlay does not have an
* associated artifact
*/
Artifact getAssociatedArtifact( final Overlay overlay )
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@ import java.io.IOException;
import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.util.PathSet;
-import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.PathSet;
+import org.apache.maven.plugins.war.util.WebappStructure;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.mapping.MappingUtils;
import org.codehaus.plexus.archiver.ArchiverException;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.Overlay;
+import org.apache.maven.plugins.war.Overlay;
import org.codehaus.plexus.interpolation.InterpolationException;
/**
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,9 +22,9 @@ package org.apache.maven.plugin.war.pack
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.util.ClassesPackager;
-import org.apache.maven.plugin.war.util.PathSet;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.util.ClassesPackager;
+import org.apache.maven.plugins.war.util.PathSet;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.interpolation.InterpolationException;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ import org.apache.maven.artifact.Artifac
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.WebappStructure;
import java.io.File;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.apache.maven.plugin.war.pack
*/
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.util.PathSet;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.util.PathSet;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.war.pack
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.util.WebappStructureSerializer;
+import org.apache.maven.plugins.war.util.WebappStructureSerializer;
import java.io.File;
import java.io.IOException;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@ import org.apache.maven.archiver.MavenAr
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.WebappStructure;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@ import java.io.IOException;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.util.PathSet;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.util.PathSet;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import org.apache.maven.archiver.MavenAr
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.packaging.AbstractWarPackagingTask;
+import org.apache.maven.plugins.war.packaging.AbstractWarPackagingTask;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/PathSet.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/PathSet.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/PathSet.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/PathSet.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@ package org.apache.maven.plugin.war;
*/
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.WarExplodedMojo;
+import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,8 +28,9 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.WarOverlayStub;
+import org.apache.maven.plugins.war.AbstractWarMojo;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.WarOverlayStub;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.archiver.Archiver;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.war;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.JarArtifactStub;
+import org.apache.maven.plugins.war.stub.JarArtifactStub;
import java.io.File;
import java.io.FileFilter;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@ import java.io.StringReader;
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.ResourceStub;
import org.codehaus.plexus.util.FileUtils;
/**
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,20 +21,20 @@ package org.apache.maven.plugin.war;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.AarArtifactStub;
-import org.apache.maven.plugin.war.stub.EJBArtifactStub;
-import org.apache.maven.plugin.war.stub.EJBArtifactStubWithClassifier;
-import org.apache.maven.plugin.war.stub.EJBClientArtifactStub;
-import org.apache.maven.plugin.war.stub.IncludeExcludeWarArtifactStub;
-import org.apache.maven.plugin.war.stub.JarArtifactStub;
-import org.apache.maven.plugin.war.stub.MarArtifactStub;
-import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.PARArtifactStub;
-import org.apache.maven.plugin.war.stub.ResourceStub;
-import org.apache.maven.plugin.war.stub.TLDArtifactStub;
-import org.apache.maven.plugin.war.stub.WarArtifactStub;
-import org.apache.maven.plugin.war.stub.XarArtifactStub;
+import org.apache.maven.plugins.war.stub.AarArtifactStub;
+import org.apache.maven.plugins.war.stub.EJBArtifactStub;
+import org.apache.maven.plugins.war.stub.EJBArtifactStubWithClassifier;
+import org.apache.maven.plugins.war.stub.EJBClientArtifactStub;
+import org.apache.maven.plugins.war.stub.IncludeExcludeWarArtifactStub;
+import org.apache.maven.plugins.war.stub.JarArtifactStub;
+import org.apache.maven.plugins.war.stub.MarArtifactStub;
+import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.PARArtifactStub;
+import org.apache.maven.plugins.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.stub.TLDArtifactStub;
+import org.apache.maven.plugins.war.stub.WarArtifactStub;
+import org.apache.maven.plugins.war.stub.XarArtifactStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java Tue Mar 8 19:58:34 2016
@@ -1,26 +1,8 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.WarInPlaceMojo;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.ResourceStub;
import java.io.File;
import java.util.LinkedList;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.war;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.war.WarManifestMojo;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,9 +30,10 @@ import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
-import org.apache.maven.plugin.war.stub.ProjectHelperStub;
-import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
+import org.apache.maven.plugins.war.WarMojo;
+import org.apache.maven.plugins.war.stub.MavenProject4CopyConstructor;
+import org.apache.maven.plugins.war.stub.ProjectHelperStub;
+import org.apache.maven.plugins.war.stub.WarArtifact4CCStub;
import org.codehaus.plexus.util.IOUtil;
/**
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@ package org.apache.maven.plugin.war;
*/
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.overlay.DefaultOverlay;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarZipTest.java (from r1734132, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarZipTest.java?p2=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarZipTest.java&p1=maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java&r1=1734132&r2=1734135&rev=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarZipTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,10 +21,12 @@ package org.apache.maven.plugin.war;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.plugin.war.overlay.DefaultOverlay;
-import org.apache.maven.plugin.war.stub.MavenZipProject;
-import org.apache.maven.plugin.war.stub.WarArtifactStub;
-import org.apache.maven.plugin.war.stub.ZipArtifactStub;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.WarMojo;
+import org.apache.maven.plugins.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.stub.MavenZipProject;
+import org.apache.maven.plugins.war.stub.WarArtifactStub;
+import org.apache.maven.plugins.war.stub.ZipArtifactStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,12 @@ package org.apache.maven.plugin.war.over
*/
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
-import org.apache.maven.plugin.war.stub.WarArtifactStub;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException;
+import org.apache.maven.plugins.war.overlay.OverlayManager;
+import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.stub.WarArtifactStub;
import org.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
import org.apache.maven.artifact.handler.ArtifactHandler;
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@ package org.apache.maven.plugin.war.util
*/
import junit.framework.TestCase;
+
+import org.apache.maven.plugins.war.util.PathSet;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.war.util
import junit.framework.TestCase;
import org.apache.maven.model.Dependency;
+import org.apache.maven.plugins.war.util.WarUtils;
/**
* Test the WarUtils.
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java?rev=1734135&r1=1734132&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java Tue Mar 8 19:58:34 2016
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.war.util
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
+import org.apache.maven.plugins.war.util.WebappStructure;
import java.util.ArrayList;
import java.util.List;
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml?rev=1734135&r1=1734134&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml Tue Mar 8 19:58:34 2016
@@ -24,7 +24,7 @@ under the License.
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub" />
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectBasicStub" />
<warSourceDirectory>${basedir}/target/test-classes/unit/manifest/basic-manifest-test/src/main</warSourceDirectory>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml?rev=1734135&r1=1734134&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml Tue Mar 8 19:58:34 2016
@@ -24,7 +24,7 @@ under the License.
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub"/>
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub"/>
<warSourceDirectory>
${basedir}/target/test-classes/unit/manifest/manifest-with-classpath/src/main</warSourceDirectory>
<archive>
Modified: maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml?rev=1734135&r1=1734134&r2=1734135&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml Tue Mar 8 19:58:34 2016
@@ -24,7 +24,7 @@ under the License.
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub"/>
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectBasicStub"/>
<warSourceDirectory>
${basedir}/target/test-classes/unit/manifest/manifest-with-custom-attrs/src/main</warSourceDirectory>
<archive>