Author: khmarbaise
Date: Mon Dec 14 20:31:54 2015
New Revision: 1720006
URL: http://svn.apache.org/viewvc?rev=1720006&view=rev
Log:
[MRESOURCES-207] Change package to org.apache.maven.plugins to prevent conflict
with Maven Core
Added:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/
- copied from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
- copied, changed from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
- copied, changed from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
- copied, changed from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
- copied, changed from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
- copied, changed from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/filters/
- copied from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/filters/
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/
- copied from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/
Removed:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/Resource.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/CopyResourcesMojo.java
Mon Dec 14 20:31:54 2015
@@ -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
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/Resource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/Resource.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/Resource.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/Resource.java
Mon Dec 14 20:31:54 2015
@@ -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
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/ResourcesMojo.java
Mon Dec 14 20:31:54 2015
@@ -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
Modified:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugins/resources/TestResourcesMojo.java
Mon Dec 14 20:31:54 2015
@@ -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
Copied:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
(from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java?p2=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java&p1=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java&r1=1720004&r2=1720006&rev=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/AbstractPropertyUtilsTest.java
Mon Dec 14 20:31:54 2015
@@ -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
Copied:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
(from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java?p2=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java&p1=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java&r1=1720004&r2=1720006&rev=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/BasicPropertyUtilsTest.java
Mon Dec 14 20:31:54 2015
@@ -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
Copied:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
(from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java?p2=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java&p1=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java&r1=1720004&r2=1720006&rev=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/CopyResourcesMojoTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/CopyResourcesMojoTest.java
Mon Dec 14 20:31:54 2015
@@ -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;
/*
Copied:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
(from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java?p2=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java&p1=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java&r1=1720004&r2=1720006&rev=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
Mon Dec 14 20:31:54 2015
@@ -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 @@ package org.apache.maven.plugin.resource
*/
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;
Copied:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
(from r1720004,
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java?p2=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java&p1=maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java&r1=1720004&r2=1720006&rev=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/TestResourcesTest.java
Mon Dec 14 20:31:54 2015
@@ -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.io.File;
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
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/filters/ItFilter.java
Mon Dec 14 20:31:54 2015
@@ -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;
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBasicStub.java
Mon Dec 14 20:31:54 2015
@@ -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
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
Mon Dec 14 20:31:54 2015
@@ -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
Modified:
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java?rev=1720006&r1=1720004&r2=1720006&view=diff
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
(original)
+++
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectResourcesStub.java
Mon Dec 14 20:31:54 2015
@@ -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
