svn commit: r1636726 - in /maven/plugins/trunk/maven-jar-plugin: pom.xml src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java

[khmarbaise]

Author: khmarbaise
Date: Tue Nov  4 20:11:52 2014
New Revision: 1636726

URL: http://svn.apache.org/r1636726
Log:
[MJAR-190] Upgrade to maven-plugins version 25 to 26
 - Upgrade maven-plugins from 25 to 26.
 - Cleaned up pom file.
 - Fixed formatting issues.

Modified:
    maven/plugins/trunk/maven-jar-plugin/pom.xml
    
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
    
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java

Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1636726&r1=1636725&r2=1636726&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Tue Nov  4 20:11:52 2014
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>25</version>
+    <version>26</version>
     <relativePath>../maven-plugins/pom.xml</relativePath>
   </parent>
 
@@ -72,7 +72,7 @@ under the License.
   <properties>
     <mavenArchiverVersion>2.6</mavenArchiverVersion>
     <mavenVersion>2.2.1</mavenVersion>
-    <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
+    <mavenPluginPluginVersion>3.3</mavenPluginPluginVersion>
   </properties>
 
   <dependencies>
@@ -137,22 +137,6 @@ under the License.
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>${mavenPluginPluginVersion}</version>
-          <configuration>
-            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-          </configuration>
-          <executions>
-            <execution>
-              <id>mojo-descriptor</id>
-              <goals>
-                <goal>descriptor</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
           <configuration>

Modified: 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java?rev=1636726&r1=1636725&r2=1636726&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java
 Tue Nov  4 20:11:52 2014
@@ -242,7 +242,7 @@ public abstract class AbstractJarMojo
     public void execute()
         throws MojoExecutionException
     {
-        if ( skipIfEmpty && (!getClassesDirectory().exists() || 
getClassesDirectory().list().length < 1 ) )
+        if ( skipIfEmpty && ( !getClassesDirectory().exists() || 
getClassesDirectory().list().length < 1 ) )
         {
             getLog().info( "Skipping packaging of the " + getType() );
         }

Modified: 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java?rev=1636726&r1=1636725&r2=1636726&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/TestJarMojo.java
 Tue Nov  4 20:11:52 2014
@@ -72,7 +72,7 @@ public class TestJarMojo
         return testClassesDirectory;
     }
 
-       public void execute()
+    public void execute()
         throws MojoExecutionException
     {
         if ( skip )