Author: olamy
Date: Tue Nov 10 21:28:24 2009
New Revision: 834674
URL: http://svn.apache.org/viewvc?rev=834674&view=rev
Log:
upgrade dependencies.
fix compilation failure.
Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
Modified:
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java?rev=834674&r1=834673&r2=834674&view=diff
==============================================================================
---
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
(original)
+++
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
Tue Nov 10 21:28:24 2009
@@ -28,6 +28,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionListener;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
@@ -49,13 +50,11 @@
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact
originatingArtifact,
- Map managedVersions,
ArtifactRepository localRepository,
- List<ArtifactRepository>
remoteRepositories,
+ Map managedVersions,
ArtifactResolutionRequest repositoryRequest,
ArtifactMetadataSource source,
ArtifactFilter filter,
List<ResolutionListener>
listeners,
List<ConflictResolver>
conflictResolvers )
{
- // TODO check if we have to do more here
return new ArtifactResolutionResult();
}
@@ -63,19 +62,19 @@
Map managedVersions,
ArtifactRepository localRepository,
List<ArtifactRepository>
remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List<ResolutionListener>
listeners )
+ List<ResolutionListener>
listeners,
+ List<ConflictResolver>
conflictResolvers )
{
- // TODO check if we have to do more here
return new ArtifactResolutionResult();
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact
originatingArtifact,
- Map managedVersions,
RepositoryRequest repositoryRequest,
+ Map managedVersions,
ArtifactRepository localRepository,
+ List<ArtifactRepository>
remoteRepositories,
ArtifactMetadataSource source,
ArtifactFilter filter,
- List<ResolutionListener>
listeners,
- List<ConflictResolver>
conflictResolvers )
+ List<ResolutionListener>
listeners )
{
- // TODO check if we have to do more here
return new ArtifactResolutionResult();
}
+
}
Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml?rev=834674&r1=834673&r2=834674&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml Tue Nov 10
21:28:24 2009
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>13</version>
+ <version>14</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -114,7 +114,7 @@
</mailingLists>
<prerequisites>
- <maven>2.0.6</maven>
+ <maven>3.0</maven>
</prerequisites>
<modules>
@@ -172,7 +172,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0</version>
</dependency>
<dependency>
@@ -239,6 +239,11 @@
<tagBase>https://svn.apache.org/repos/asf/maven/plugin-testing/tags</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -278,7 +283,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
</plugin>
</plugins>
</pluginManagement>
