Author: rfscholte
Date: Sat Jul 18 11:37:42 2015
New Revision: 1691719
URL: http://svn.apache.org/r1691719
Log:
[MDEP-494] Remove/replace Maven2 specific code
ArtifactItem implements ArtifactCoordinate, so it can be resolved directly.
Remove call to getArtifactFomReactor(Artifact), according to comments it was a
Maven2 hack.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java?rev=1691719&r1=1691718&r2=1691719&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/GetMojo.java
Sat Jul 18 11:37:42 2015
@@ -40,7 +40,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.util.StringUtils;
@@ -71,7 +71,7 @@ public class GetMojo
@Component( role = ArtifactRepositoryLayout.class )
private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
- private ArtifactCoordinate coordinate = new ArtifactCoordinate();
+ private DefaultArtifactCoordinate coordinate = new
DefaultArtifactCoordinate();
/**
* The groupId of the artifact to download. Ignored if {@link #artifact}
is used.
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1691719&r1=1691718&r2=1691719&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
Sat Jul 18 11:37:42 2015
@@ -24,16 +24,14 @@ import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
-import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
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.Parameter;
import org.apache.maven.plugins.dependency.AbstractDependencyMojo;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.plugins.dependency.utils.filters.ArtifactItemFilter;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -204,41 +202,6 @@ public abstract class AbstractFromConfig
{
Artifact artifact;
- // Map managedVersions = createManagedVersionMap( factory,
project.getId(), project.getDependencyManagement() );
- VersionRange vr;
- try
- {
- vr = VersionRange.createFromVersionSpec( artifactItem.getVersion()
);
- }
- catch ( InvalidVersionSpecificationException e1 )
- {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- vr = VersionRange.createFromVersion( artifactItem.getVersion() );
- }
-
- if ( StringUtils.isEmpty( artifactItem.getClassifier() ) )
- {
- artifact =
- getFactory().createDependencyArtifact(
artifactItem.getGroupId(), artifactItem.getArtifactId(), vr,
- artifactItem.getType(),
null, Artifact.SCOPE_COMPILE );
- }
- else
- {
- artifact =
- getFactory().createDependencyArtifact(
artifactItem.getGroupId(), artifactItem.getArtifactId(), vr,
- artifactItem.getType(),
artifactItem.getClassifier(),
- Artifact.SCOPE_COMPILE
);
- }
-
- // Maven 3 will search the reactor for the artifact but Maven 2 does
not
- // to keep consistent behaviour, we search the reactor ourselves.
- Artifact result = getArtifactFomReactor( artifact );
- if ( result != null )
- {
- return result;
- }
-
try
{
// mdep-50 - rolledback for now because it's breaking some
functionality.
@@ -264,7 +227,7 @@ public abstract class AbstractFromConfig
buildingRequest = new DefaultProjectBuildingRequest(
session.getProjectBuildingRequest() );
}
- artifact = artifactResolver.resolveArtifact( buildingRequest,
artifact ).getArtifact();
+ artifact = artifactResolver.resolveArtifact( buildingRequest,
artifactItem ).getArtifact();
}
catch ( ArtifactResolverException e )
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java?rev=1691719&r1=1691718&r2=1691719&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
Sat Jul 18 11:37:42 2015
@@ -23,6 +23,7 @@ import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
+import org.apache.maven.shared.artifact.ArtifactCoordinate;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -33,7 +34,7 @@ import org.codehaus.plexus.util.StringUt
* @author <a href="mailto:bri...@apache.org";>Brian Fox</a>
* @version $Id$
*/
-public class ArtifactItem
+public class ArtifactItem implements ArtifactCoordinate
{
/**
* Group Id of Artifact
