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/07 20:48:47 UTC
svn commit: r1733967 - in /maven/plugins/trunk/maven-war-plugin/src:
main/java/org/apache/maven/plugin/war/
main/java/org/apache/maven/plugin/war/overlay/
main/java/org/apache/maven/plugin/war/packaging/
main/java/org/apache/maven/plugins/ main/java/or...
Author: khmarbaise
Date: Mon Mar 7 19:48:47 2016
New Revision: 1733967
URL: http://svn.apache.org/viewvc?rev=1733967&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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, 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 r1733965, maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
Removed:
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/plugin/war/Overlay.java
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/plugin/war/WarInPlaceMojo.java
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/plugin/war/WarMojo.java
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/plugin/war/AbstractWarMojoTest.java
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/plugin/war/WarExplodedMojoFilteringTest.java
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/plugin/war/WarInPlaceMojoTest.java
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/plugin/war/WarMojoTest.java
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/plugin/war/WarZipTest.java
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java Mon Mar 7 19:48:47 2016
@@ -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/plugin/war/overlay/OverlayManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java Mon Mar 7 19:48:47 2016
@@ -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;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java Mon Mar 7 19:48:47 2016
@@ -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/plugin/war/packaging/ClassesPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java Mon Mar 7 19:48:47 2016
@@ -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.project.MavenProject;
import org.codehaus.plexus.interpolation.InterpolationException;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java Mon Mar 7 19:48:47 2016
@@ -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.codehaus.plexus.util.FileUtils;
import java.io.File;
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Mon Mar 7 19:48:47 2016
@@ -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.shared.filtering.MavenFilteringException;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
Copied: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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/Overlay.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java?rev=1733967&r1=1733966&r2=1733967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java Mon Mar 7 19:48:47 2016
@@ -20,9 +20,9 @@ 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.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.WarExplodedMojo;
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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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,6 +30,7 @@ import org.apache.maven.plugin.testing.A
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.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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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.plugin.war.stub.MavenProjectBasicStub;
import org.apache.maven.plugin.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.WarInPlaceMojo;
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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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
@@ -33,6 +33,7 @@ import org.apache.maven.plugin.MojoExecu
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.codehaus.plexus.util.IOUtil;
/**
Copied: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java (from r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugin.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.Overlay;
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 r1733965, 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=1733965&r2=1733967&rev=1733967&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 Mon Mar 7 19:48:47 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,6 +25,8 @@ import org.apache.maven.plugin.war.overl
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.codehaus.plexus.util.FileUtils;
import java.io.File;