[MRAR-48] 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@1719777 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/rar/RarMojo.java b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/rar/RarMojo.java
rename to src/main/java/org/apache/maven/plugins/rar/RarMojo.java
index 8570062..918e420 100644
--- a/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar;
+package org.apache.maven.plugins.rar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/rar/RarResource.java b/src/main/java/org/apache/maven/plugins/rar/RarResource.java
similarity index 95%
rename from src/main/java/org/apache/maven/plugin/rar/RarResource.java
rename to src/main/java/org/apache/maven/plugins/rar/RarResource.java
index 1899850..2749b89 100644
--- a/src/main/java/org/apache/maven/plugin/rar/RarResource.java
+++ b/src/main/java/org/apache/maven/plugins/rar/RarResource.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar;
+package org.apache.maven.plugins.rar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java b/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
rename to src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
index 5985c5a..f66fda6 100644
--- a/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar;
+package org.apache.maven.plugins.rar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,7 @@
import java.util.zip.ZipFile;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.rar.RarMojo;
import org.codehaus.plexus.util.FileUtils;
/**
diff --git a/src/test/java/org/apache/maven/plugin/rar/stubs/ArtifactHandlerStub.java b/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
similarity index 95%
rename from src/test/java/org/apache/maven/plugin/rar/stubs/ArtifactHandlerStub.java
rename to src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
index 5dd7078..c427d46 100644
--- a/src/test/java/org/apache/maven/plugin/rar/stubs/ArtifactHandlerStub.java
+++ b/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar.stubs;
+package org.apache.maven.plugins.rar.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java b/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
index c9d358a..bf3d0bd 100644
--- a/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar.stubs;
+package org.apache.maven.plugins.rar.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
rename to src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
index 7025b70..427d403 100644
--- a/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar.stubs;
+package org.apache.maven.plugins.rar.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub2.java b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
similarity index 95%
rename from src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub2.java
rename to src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
index f124b7d..952cb63 100644
--- a/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub2.java
+++ b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar.stubs;
+package org.apache.maven.plugins.rar.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub3.java b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
similarity index 95%
rename from src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub3.java
rename to src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
index a9abc79..349e878 100644
--- a/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub3.java
+++ b/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.rar.stubs;
+package org.apache.maven.plugins.rar.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/resources/unit/basic-rar-test/plugin-config.xml b/src/test/resources/unit/basic-rar-test/plugin-config.xml
index 2a7f6d3..7f61e56 100644
--- a/src/test/resources/unit/basic-rar-test/plugin-config.xml
+++ b/src/test/resources/unit/basic-rar-test/plugin-config.xml
@@ -30,7 +30,7 @@
<workDirectory>${basedir}/target/unit/basic-rar-test/target/rar-test</workDirectory>
<outputDirectory>${basedir}/target/unit/basic-rar-test/target</outputDirectory>
<finalName>test-rar</finalName>
- <project implementation="org.apache.maven.plugin.rar.stubs.RarMavenProjectStub" />
+ <project implementation="org.apache.maven.plugins.rar.stubs.RarMavenProjectStub" />
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml b/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
index edcf8db..f473ffa 100644
--- a/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
+++ b/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
@@ -30,7 +30,7 @@
<workDirectory>${basedir}/target/unit/basic-rar-with-descriptor/target/rar-test-with-descriptor</workDirectory>
<outputDirectory>${basedir}/target/unit/basic-rar-with-descriptor/target</outputDirectory>
<finalName>test-rar-with-descriptor</finalName>
- <project implementation="org.apache.maven.plugin.rar.stubs.RarMavenProjectStub2" />
+ <project implementation="org.apache.maven.plugins.rar.stubs.RarMavenProjectStub2" />
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml b/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml
index d7c41d7..c86c3c0 100644
--- a/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml
+++ b/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml
@@ -30,7 +30,7 @@
<workDirectory>${basedir}/target/unit/basic-rar-with-manifest/target/rar-test-with-manifest</workDirectory>
<outputDirectory>${basedir}/target/unit/basic-rar-with-manifest/target</outputDirectory>
<finalName>test-rar-with-manifest</finalName>
- <project implementation="org.apache.maven.plugin.rar.stubs.RarMavenProjectStub3" />
+ <project implementation="org.apache.maven.plugins.rar.stubs.RarMavenProjectStub3" />
</configuration>
</plugin>
</plugins>
