maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject svn commit: r1719777 - in /maven/plugins/trunk/maven-rar-plugin/src: main/java/org/apache/maven/plugin/ main/java/org/apache/maven/plugins/ main/java/org/apache/maven/plugins/rar/ test/java/org/apache/maven/plugin/ test/java/org/apache/maven/plugins/ t...
Date Sun, 13 Dec 2015 09:19:11 GMT
Author: khmarbaise
Date: Sun Dec 13 09:19:11 2015
New Revision: 1719777

URL: http://svn.apache.org/viewvc?rev=1719777&view=rev
Log:
[MRAR-48] Change package to org.apache.maven.plugins to prevent conflict with Maven Core

Added:
    maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/
    maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/
      - copied from r1719184, maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
      - copied, changed from r1719184, maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/
      - copied from r1719184, maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/
Removed:
    maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugin/
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/
Modified:
    maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
    maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarResource.java
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
    maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
    maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-test/plugin-config.xml
    maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
    maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml

Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarMojo.java
Sun Dec 13 09:19:11 2015
@@ -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

Modified: maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarResource.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarResource.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarResource.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/main/java/org/apache/maven/plugins/rar/RarResource.java
Sun Dec 13 09:19:11 2015
@@ -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

Copied: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
(from r1719184, maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java?p2=maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java&p1=maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java&r1=1719184&r2=1719777&rev=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/RarMojoTest.java
Sun Dec 13 09:19:11 2015
@@ -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.ZipEntry;
 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;
 
 /**

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/ArtifactHandlerStub.java
Sun Dec 13 09:19:11 2015
@@ -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

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarArtifactStub.java
Sun Dec 13 09:19:11 2015
@@ -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

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub.java
Sun Dec 13 09:19:11 2015
@@ -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

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub2.java
Sun Dec 13 09:19:11 2015
@@ -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

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java?rev=1719777&r1=1719184&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugins/rar/stubs/RarMavenProjectStub3.java
Sun Dec 13 09:19:11 2015
@@ -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

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-test/plugin-config.xml?rev=1719777&r1=1719776&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-test/plugin-config.xml
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-test/plugin-config.xml
Sun Dec 13 09:19:11 2015
@@ -30,7 +30,7 @@ under the License.
 		  <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>

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml?rev=1719777&r1=1719776&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-descriptor/plugin-config.xml
Sun Dec 13 09:19:11 2015
@@ -30,7 +30,7 @@ under the License.
 		  <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>

Modified: maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml?rev=1719777&r1=1719776&r2=1719777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml
(original)
+++ maven/plugins/trunk/maven-rar-plugin/src/test/resources/unit/basic-rar-with-manifest/plugin-config.xml
Sun Dec 13 09:19:11 2015
@@ -30,7 +30,7 @@ under the License.
 		  <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>



Mime
View raw message