[MDEP-494] Remove/replace Maven2 specific code
use new signatures of ArtifactResolver
change version to 3.0
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1689508 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 94f171c..09dcf66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
</parent>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.11-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Dependency Plugin</name>
@@ -91,6 +91,7 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
<!-- maven -->
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
index 1ce262c..01a19c7 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
@@ -266,7 +266,7 @@
buildingRequest.setRemoteRepositories( getRemoteRepos() );
- artifact = artifactResolver.resolveArtifact( buildingRequest, artifact );
+ artifact = artifactResolver.resolveArtifact( buildingRequest, artifact ).getArtifact();
}
catch ( ArtifactResolverException e )
{
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
index 844c36c..e0f6808 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -369,7 +369,8 @@
buildingRequest.setRemoteRepositories( getRemoteRepos() );
- Artifact resolvedArtifact = artifactResolver.resolveArtifact( buildingRequest, project.getArtifact() );
+ Artifact resolvedArtifact =
+ artifactResolver.resolveArtifact( buildingRequest, project.getArtifact() ).getArtifact();
artifacts.add( resolvedArtifact );
}
diff --git a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
index 83f878b..8973f47 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
@@ -302,7 +302,7 @@
buildingRequest.setRemoteRepositories( getRemoteRepos() );
- pomArtifact = getArtifactResolver().resolveArtifact( buildingRequest, pomArtifact );
+ pomArtifact = getArtifactResolver().resolveArtifact( buildingRequest, pomArtifact ).getArtifact();
}
catch ( ArtifactResolverException e )
{
diff --git a/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java b/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
index 3141ed4..1df88e2 100644
--- a/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
+++ b/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
@@ -66,7 +66,7 @@
{
try
{
- artifact = resolver.resolveArtifact( buildingRequest, artifact );
+ artifact = resolver.resolveArtifact( buildingRequest, artifact ).getArtifact();
resolvedArtifacts.add( artifact );
}
catch ( ArtifactResolverException ex )
