Author: olamy
Date: Sat Nov 13 15:07:18 2010
New Revision: 1034777
URL: http://svn.apache.org/viewvc?rev=1034777&view=rev
Log:
upgrade parent version
some other librairies p-u maven-archiver to prepare to add @threadSafe
Modified:
maven/plugins/trunk/maven-rar-plugin/pom.xml
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
Modified: maven/plugins/trunk/maven-rar-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/pom.xml?rev=1034777&r1=1034776&r2=1034777&view=diff
==============================================================================
--- maven/plugins/trunk/maven-rar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-rar-plugin/pom.xml Sat Nov 13 15:07:18 2010
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>17</version>
+ <version>18</version>
</parent>
<artifactId>maven-rar-plugin</artifactId>
@@ -49,32 +49,41 @@ under the License.
<system>JIRA</system>
<url>http://jira.codehaus.org/browse/MRAR</url>
</issueManagement>
+
+ <properties>
+ <mavenVersion>2.0.6</mavenVersion>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.4</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.2</version>
+ <version>2.4.1</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java?rev=1034777&r1=1034776&r2=1034777&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java
Sat Nov 13 15:07:18 2010
@@ -21,6 +21,8 @@ package org.apache.maven.plugin.rar.stub
import java.io.File;
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
/**
@@ -110,4 +112,58 @@ public class RarArtifactStub
{
return getVersion();
}
+
+ public VersionRange getVersionRange()
+ {
+ return VersionRange.createFromVersion( this.version );
+ }
+
+ public ArtifactHandler getArtifactHandler()
+ {
+ return new ArtifactHandler()
+ {
+
+ public boolean isIncludesDependencies()
+ {
+ return false;
+ }
+
+ public boolean isAddedToClasspath()
+ {
+ return false;
+ }
+
+ public String getPackaging()
+ {
+ return null;
+ }
+
+ public String getLanguage()
+ {
+ return null;
+ }
+
+ public String getExtension()
+ {
+ return null;
+ }
+
+ public String getDirectory()
+ {
+ return null;
+ }
+
+ public String getClassifier()
+ {
+ return null;
+ }
+ };
+ }
+
+ public String getType()
+ {
+ return "rar";
+ }
+
+
}
Modified:
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java?rev=1034777&r1=1034776&r2=1034777&view=diff
==============================================================================
---
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java
Sat Nov 13 15:07:18 2010
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
import org.apache.maven.project.MavenProject;
@@ -139,10 +140,14 @@ public class RarMavenProjectStub
artifact.setOptional( optional );
+ artifact.setVersionRange( VersionRange.createFromVersion( "1.0" ) );
+
artifact.setFile( new File ( getBasedir() + "/src/test/remote-repo/" +
artifact.getGroupId().replace( '.', '/' ) +
"/" + artifact.getArtifactId() + "/" +
artifact.getVersion() +
"/" + artifact.getArtifactId() + "-" +
artifact.getVersion() + ".jar" ) ) ;
return artifact;
}
+
+
}
