Author: rfscholte
Date: Mon Jul 6 21:45:14 2015
New Revision: 1689508
URL: http://svn.apache.org/r1689508
Log:
[MDEP-494] Remove/replace Maven2 specific code
use new signatures of ArtifactResolver
change version to 3.0
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1689508&r1=1689507&r2=1689508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Mon Jul 6 21:45:14 2015
@@ -30,7 +30,7 @@ under the License.
</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 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
<!-- maven -->
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1689508&r1=1689507&r2=1689508&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
Mon Jul 6 21:45:14 2015
@@ -266,7 +266,7 @@ public abstract class AbstractFromConfig
buildingRequest.setRemoteRepositories( getRemoteRepos() );
- artifact = artifactResolver.resolveArtifact( buildingRequest,
artifact );
+ artifact = artifactResolver.resolveArtifact( buildingRequest,
artifact ).getArtifact();
}
catch ( ArtifactResolverException e )
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java?rev=1689508&r1=1689507&r2=1689508&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/AbstractDependencyFilterMojo.java
Mon Jul 6 21:45:14 2015
@@ -369,7 +369,8 @@ public abstract class AbstractDependency
buildingRequest.setRemoteRepositories( getRemoteRepos() );
- Artifact resolvedArtifact = artifactResolver.resolveArtifact(
buildingRequest, project.getArtifact() );
+ Artifact resolvedArtifact =
+ artifactResolver.resolveArtifact( buildingRequest,
project.getArtifact() ).getArtifact();
artifacts.add( resolvedArtifact );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java?rev=1689508&r1=1689507&r2=1689508&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
Mon Jul 6 21:45:14 2015
@@ -302,7 +302,7 @@ public class CopyDependenciesMojo
buildingRequest.setRemoteRepositories( getRemoteRepos() );
- pomArtifact = getArtifactResolver().resolveArtifact(
buildingRequest, pomArtifact );
+ pomArtifact = getArtifactResolver().resolveArtifact(
buildingRequest, pomArtifact ).getArtifact();
}
catch ( ArtifactResolverException e )
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java?rev=1689508&r1=1689507&r2=1689508&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
Mon Jul 6 21:45:14 2015
@@ -66,7 +66,7 @@ public class DefaultArtifactsResolver
{
try
{
- artifact = resolver.resolveArtifact( buildingRequest, artifact
);
+ artifact = resolver.resolveArtifact( buildingRequest, artifact
).getArtifact();
resolvedArtifacts.add( artifact );
}
catch ( ArtifactResolverException ex )
