Author: rfscholte
Date: Sat Jun 20 20:26:53 2015
New Revision: 1686670
URL: http://svn.apache.org/r1686670
Log:
[MDEP-494] Remove/replace Maven2 specific code
Replace ArtifactResolver with the maven-artifact-transfer implementation
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.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=1686670&r1=1686669&r2=1686670&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Sat Jun 20 20:26:53 2015
@@ -120,7 +120,7 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
- <!-- shared -->
+ <!-- reporting -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
@@ -218,6 +218,11 @@ under the License.
<version>3.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-artifact-transfer</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
<version>2.1.1</version>
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1686670&r1=1686669&r2=1686670&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
Sat Jun 20 20:26:53 2015
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.dependen
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -29,19 +28,19 @@ import java.util.regex.Pattern;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.resolver.AbstractArtifactResolutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -54,7 +53,10 @@ public class GetMojo
extends AbstractMojo
{
private static final Pattern ALT_REPO_SYNTAX_PATTERN = Pattern.compile(
"(.+)::(.*)::(.+)" );
-
+
+ @Parameter( defaultValue = "${session}", required = true, readonly = true )
+ private MavenSession session;
+
/**
*
*/
@@ -82,12 +84,6 @@ public class GetMojo
/**
*
*/
- @Component
- private ArtifactMetadataSource source;
-
- /**
- *
- */
@Parameter( defaultValue = "${localRepository}", readonly = true )
private ArtifactRepository localRepository;
@@ -199,8 +195,6 @@ public class GetMojo
Artifact toDownload = classifier == null
? artifactFactory.createBuildArtifact( groupId, artifactId,
version, packaging )
: artifactFactory.createArtifactWithClassifier( groupId,
artifactId, version, packaging, classifier );
- Artifact dummyOriginatingArtifact =
- artifactFactory.createBuildArtifact( "org.apache.maven.plugins",
"maven-downloader-plugin", "1.0", "jar" );
ArtifactRepositoryPolicy always =
new ArtifactRepositoryPolicy( true,
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
@@ -228,16 +222,15 @@ public class GetMojo
if ( transitive )
{
getLog().info( "Resolving " + toDownload + " with transitive
dependencies" );
- artifactResolver.resolveTransitively( Collections.singleton(
toDownload ), dummyOriginatingArtifact,
- repoList,
localRepository, source );
+ artifactResolver.resolveTransitively(
session.getProjectBuildingRequest(), toDownload, repoList );
}
else
{
getLog().info( "Resolving " + toDownload );
- artifactResolver.resolve( toDownload, repoList,
localRepository );
+ artifactResolver.resolveArtifact(
session.getProjectBuildingRequest(), toDownload, repoList );
}
}
- catch ( AbstractArtifactResolutionException e )
+ catch ( ArtifactResolverException e )
{
throw new MojoExecutionException( "Couldn't download artifact: " +
e.getMessage(), e );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java?rev=1686670&r1=1686669&r2=1686670&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestGetMojo.java
Sat Jun 20 20:26:53 2015
@@ -29,7 +29,6 @@ import org.apache.maven.plugin.LegacySup
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
-import org.codehaus.plexus.util.FileUtils;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
@@ -74,6 +73,8 @@ public class TestGetMojo
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession)
legacySupport.getRepositorySession();
repoSession.setLocalRepositoryManager( new
SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+
+ setVariableValueToObject( mojo, "session", legacySupport.getSession()
);
}
/**
