[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.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1630168 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 6804895..42ced24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<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 @@
<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>
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java b/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
index 0f23fd1..8d60163 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
@@ -69,7 +69,7 @@
/*
* 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;
