svn commit: r942334 - in /maven/shared/trunk/maven-archiver: pom.xml src/test/java/org/apache/maven/archiver/MavenArchiverTest.java src/test/java/org/apache/maven/archiver/MockArtifact.java

[de...@apache.org]

Author: dennisl
Date: Sat May  8 07:40:53 2010
New Revision: 942334

URL: http://svn.apache.org/viewvc?rev=942334&view=rev
Log:
[MSHARED-150]  Upgrade Maven prerequisite to version 2.0.6

o This required a couple of changes to the testing framework

Modified:
    maven/shared/trunk/maven-archiver/pom.xml
    maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
    maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java

Modified: maven/shared/trunk/maven-archiver/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=942334&r1=942333&r2=942334&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/pom.xml (original)
+++ maven/shared/trunk/maven-archiver/pom.xml Sat May  8 07:40:53 2010
@@ -32,6 +32,10 @@
   <name>Maven Archiver</name>
   <description>Provides utility methods for creating JARs and other archive files from a Maven project.</description>
 
+  <prerequisites>
+    <maven>${mavenVersion}</maven>
+  </prerequisites>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver</developerConnection>
@@ -43,7 +47,7 @@
   </issueManagement>
 
   <properties>
-    <mavenVersion>2.0</mavenVersion>
+    <mavenVersion>2.0.6</mavenVersion>
   </properties>
 
   <dependencies>

Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=942334&r1=942333&r2=942334&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java Sat May  8 07:40:53 2010
@@ -38,6 +38,7 @@ import junit.framework.TestCase;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Organization;
@@ -880,6 +881,7 @@ public class MavenArchiverTest
         artifact.setArtifactId( "dummy" );
         artifact.setVersion( "0.1" );
         artifact.setType( "jar" );
+        artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
         project.setArtifact( artifact );
 
         ArtifactHandler artifactHandler = new ArtifactHandler()
@@ -992,6 +994,7 @@ public class MavenArchiverTest
         artifact.setArtifactId( "dummy" );
         artifact.setVersion( "0.1" );
         artifact.setType( "jar" );
+        artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
         project.setArtifact( artifact );
 
         ArtifactHandler artifactHandler = new ArtifactHandler()

Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java?rev=942334&r1=942333&r2=942334&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java Sat May  8 07:40:53 2010
@@ -209,8 +209,7 @@ class MockArtifact
 
     public VersionRange getVersionRange()
     {
-        // TODO
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+        return VersionRange.createFromVersion( version );
     }
 
     public void setVersionRange( VersionRange versionRange )