[MRESOURCES-207] Change package to org.apache.maven.plugins to prevent conflict with Maven Core
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1720006 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java
rename to src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
index 4407c02..66375ec 100644
--- a/src/main/java/org/apache/maven/plugin/resources/CopyResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/resources/Resource.java b/src/main/java/org/apache/maven/plugins/resources/Resource.java
similarity index 95%
rename from src/main/java/org/apache/maven/plugin/resources/Resource.java
rename to src/main/java/org/apache/maven/plugins/resources/Resource.java
index e01dd19..696b550 100644
--- a/src/main/java/org/apache/maven/plugin/resources/Resource.java
+++ b/src/main/java/org/apache/maven/plugins/resources/Resource.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
rename to src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
index c57e672..f3badbd 100644
--- a/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
rename to src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
index b11ec1b..36af47e 100644
--- a/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java b/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java
rename to src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
index 65d86c9..06b2062 100644
--- a/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java b/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java
rename to src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
index 2af43d0..d7c8aa0 100644
--- a/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java b/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
similarity index 93%
rename from src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java
rename to src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
index c60f950..5d12f90 100644
--- a/src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
@@ -1,11 +1,12 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
import java.io.File;
import java.util.Collections;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.resources.stub.MavenProjectResourcesStub;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.resources.ResourcesMojo;
+import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.codehaus.plexus.util.FileUtils;
/*
diff --git a/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
rename to src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
index 31f62f5..569cbbf 100644
--- a/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,9 @@
*/
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.resources.stub.MavenProjectResourcesStub;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.resources.ResourcesMojo;
+import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
diff --git a/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java b/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
similarity index 93%
rename from src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java
rename to src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
index 23140ce..cd8b179 100644
--- a/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java
+++ b/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources;
+package org.apache.maven.plugins.resources;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +23,10 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.plugin.resources.stub.MavenProjectResourcesStub;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.resources.ResourcesMojo;
+import org.apache.maven.plugins.resources.TestResourcesMojo;
+import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
import org.codehaus.plexus.util.FileUtils;
public class TestResourcesTest
diff --git a/src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java b/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java
rename to src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
index bff7f42..9fb95ae 100644
--- a/src/test/java/org/apache/maven/plugin/resources/filters/ItFilter.java
+++ b/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.resources.filters;
+package org.apache.maven.plugins.resources.filters;
import java.io.File;
import java.io.IOException;
diff --git a/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java
rename to src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
index e44b06c..af9e4e9 100644
--- a/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java
+++ b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources.stub;
+package org.apache.maven.plugins.resources.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java
rename to src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
index 2bd7649..d6efb1b 100644
--- a/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java
+++ b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources.stub;
+package org.apache.maven.plugins.resources.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java
rename to src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
index b006058..c3c26f2 100644
--- a/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java
+++ b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.resources.stub;
+package org.apache.maven.plugins.resources.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
