svn commit: r1630168 - in /maven/plugins/trunk/maven-war-plugin: pom.xml src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java

[kh...@apache.org]

Author: khmarbaise
Date: Wed Oct  8 16:35:01 2014
New Revision: 1630168

URL: http://svn.apache.org/r1630168
Log:
[MWAR-317]
 - Upgrade to Maven 2.2.1
   Needed to upgrade maven-plugin-testing-harness from 1.2 to 1.3
   as well. Otherwise all the unit tests would fail.

Modified:
    maven/plugins/trunk/maven-war-plugin/pom.xml
    maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java

Modified: maven/plugins/trunk/maven-war-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/pom.xml?rev=1630168&r1=1630167&r2=1630168&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/pom.xml Wed Oct  8 16:35:01 2014
@@ -59,7 +59,7 @@ under the License.
   <properties>
     <mavenArchiverVersion>2.5</mavenArchiverVersion>
     <mavenFilteringVersion>1.2</mavenFilteringVersion>
-    <mavenVersion>2.0.6</mavenVersion>
+    <mavenVersion>2.2.1</mavenVersion>
     <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion>
   </properties>
 
@@ -181,7 +181,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.2</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java?rev=1630168&r1=1630167&r2=1630168&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java Wed Oct  8 16:35:01 2014
@@ -69,7 +69,7 @@ public abstract class AbstractArtifactSt
     /*
      * TODO: Coppied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging...
      */
-    public int compareTo( Object o )
+    public int compareTo( Artifact o )
     {
         Artifact a = (Artifact) o;