Author: khmarbaise
Date: Fri Dec 11 12:42:51 2015
New Revision: 1719401
URL: http://svn.apache.org/viewvc?rev=1719401&view=rev
Log:
[MJAR-203] Change package to org.apache.maven.plugins to prevent conflict with
Maven Core
Added:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/
- copied from r1719186,
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/
- copied from r1719186,
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugin/jar/
Removed:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/JarMojoTest.java
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/MockArtifact.java
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java?rev=1719401&r1=1719186&r2=1719401&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
Fri Dec 11 12:42:51 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jar;
+package org.apache.maven.plugins.jar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/JarMojo.java?rev=1719401&r1=1719186&r2=1719401&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/JarMojo.java
Fri Dec 11 12:42:51 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jar;
+package org.apache.maven.plugins.jar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java?rev=1719401&r1=1719186&r2=1719401&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugins/jar/TestJarMojo.java
Fri Dec 11 12:42:51 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jar;
+package org.apache.maven.plugins.jar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/JarMojoTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/JarMojoTest.java?rev=1719401&r1=1719186&r2=1719401&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/JarMojoTest.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/JarMojoTest.java
Fri Dec 11 12:42:51 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jar;
+package org.apache.maven.plugins.jar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.jar;
import java.io.File;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.jar.JarMojo;
/**
* Test for {@link JarMojo}
Modified:
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/MockArtifact.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/MockArtifact.java?rev=1719401&r1=1719186&r2=1719401&view=diff
==============================================================================
---
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/MockArtifact.java
(original)
+++
maven/plugins/trunk/maven-jar-plugin/src/test/java/org/apache/maven/plugins/jar/MockArtifact.java
Fri Dec 11 12:42:51 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.jar;
+package org.apache.maven.plugins.jar;
/*
* Licensed to the Apache Software Foundation (ASF) under one
