You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/12 19:08:48 UTC
svn commit: r1748037 - in
/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency:
./ fromConfiguration/ fromDependencies/ resolvers/
Author: rfscholte
Date: Sun Jun 12 19:08:48 2016
New Revision: 1748037
URL: http://svn.apache.org/viewvc?rev=1748037&view=rev
Log:
Fix for new maven-artifact-transfer
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/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromConfiguration/ArtifactItem.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.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=1748037&r1=1748036&r2=1748037&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 Sun Jun 12 19:08:48 2016
@@ -40,9 +40,9 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.dependency.DefaultDependencyCoordinate;
-import org.apache.maven.shared.dependency.resolve.DependencyResolver;
-import org.apache.maven.shared.dependency.resolve.DependencyResolverException;
+import org.apache.maven.shared.dependencies.DefaultDependableCoordinate;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -77,7 +77,7 @@ public class GetMojo
@Component( role = ArtifactRepositoryLayout.class )
private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
- private DefaultDependencyCoordinate coordinate = new DefaultDependencyCoordinate();
+ private DefaultDependableCoordinate coordinate = new DefaultDependableCoordinate();
/**
* 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/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java?rev=1748037&r1=1748036&r2=1748037&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/PurgeLocalRepositoryMojo.java Sun Jun 12 19:08:48 2016
@@ -42,9 +42,10 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.dependency.TransferUtils;
-import org.apache.maven.shared.dependency.resolve.DependencyResolver;
-import org.apache.maven.shared.dependency.resolve.DependencyResolverException;
+import org.apache.maven.shared.dependencies.TransferUtils;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.project.DefaultProjectCoordinate;
import org.apache.maven.shared.artifact.filter.resolve.AbstractFilter;
import org.apache.maven.shared.artifact.filter.resolve.AndFilter;
import org.apache.maven.shared.artifact.filter.resolve.Node;
@@ -488,10 +489,15 @@ public class PurgeLocalRepositoryMojo
{
try
{
+ DefaultProjectCoordinate coordinate = new DefaultProjectCoordinate();
+ coordinate.setGroupId( project.getGroupId() );
+ coordinate.setArtifactId( project.getArtifactId() );
+ coordinate.setVersion( project.getVersion() );
+ coordinate.setPackaging( project.getPackaging() );
Iterable<ArtifactResult> results =
dependencyResolver.resolveDependencies( session.getProjectBuildingRequest(),
- TransferUtils.toDependencyCoordinate( project ), filter );
+ coordinate, filter );
Set<Artifact> resolvedArtifacts = new HashSet<Artifact>();
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=1748037&r1=1748036&r2=1748037&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 Sun Jun 12 19:08:48 2016
@@ -24,7 +24,7 @@ import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
-import org.apache.maven.shared.dependency.DependencyCoordinate;
+import org.apache.maven.shared.dependencies.DependableCoordinate;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -35,7 +35,7 @@ import org.codehaus.plexus.util.StringUt
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
* @version $Id$
*/
-public class ArtifactItem implements DependencyCoordinate
+public class ArtifactItem implements DependableCoordinate
{
/**
* Group Id of Artifact
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java?rev=1748037&r1=1748036&r2=1748037&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java Sun Jun 12 19:08:48 2016
@@ -53,7 +53,7 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.repository.RepositoryManager;
import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
-import org.apache.maven.shared.dependency.resolve.DependencyResolver;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
import org.codehaus.plexus.util.StringUtils;
/**
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java?rev=1748037&r1=1748036&r2=1748037&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/AbstractResolveMojo.java Sun Jun 12 19:08:48 2016
@@ -36,8 +36,8 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
import org.apache.maven.shared.artifact.resolve.ArtifactResult;
-import org.apache.maven.shared.dependency.DependencyCoordinate;
-import org.apache.maven.shared.dependency.resolve.DependencyResolverException;
+import org.apache.maven.shared.dependencies.DependableCoordinate;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -152,7 +152,7 @@ public abstract class AbstractResolveMoj
* @return resolved set of dependencies
* @throws DependencyResolverException
*/
- protected Set<Artifact> resolveArtifactDependencies( final DependencyCoordinate artifact )
+ protected Set<Artifact> resolveArtifactDependencies( final DependableCoordinate artifact )
throws DependencyResolverException
{
ProjectBuildingRequest buildingRequest =
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java?rev=1748037&r1=1748036&r2=1748037&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java Sun Jun 12 19:08:48 2016
@@ -25,9 +25,11 @@ import org.apache.maven.plugins.dependen
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.shared.dependency.collect.CollectorResult;
-import org.apache.maven.shared.dependency.collect.DependencyCollector;
-import org.apache.maven.shared.dependency.collect.DependencyCollectorException;
+import org.apache.maven.shared.dependencies.collect.CollectorResult;
+import org.apache.maven.shared.dependencies.collect.DependencyCollector;
+import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.project.DefaultProjectCoordinate;
+import org.apache.maven.shared.project.ProjectCoordinate;
/**
* Goal that resolves all project dependencies and then lists the repositories
@@ -58,9 +60,15 @@ public class ListRepositoriesMojo
{
try
{
+ DefaultProjectCoordinate coordinate = new DefaultProjectCoordinate();
+ coordinate.setGroupId( getProject().getGroupId() );
+ coordinate.setArtifactId( getProject().getArtifactId() );
+ coordinate.setVersion( getProject().getVersion() );
+ coordinate.setPackaging( getProject().getPackaging() );
+
CollectorResult collectResult =
dependencyCollector.collectDependencies( session.getProjectBuildingRequest(),
- getProject().getArtifact() );
+ coordinate );
this.getLog().info( "Repositories Used by this build:" );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java?rev=1748037&r1=1748036&r2=1748037&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolvePluginsMojo.java Sun Jun 12 19:08:48 2016
@@ -39,8 +39,8 @@ import org.apache.maven.shared.artifact.
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
-import org.apache.maven.shared.dependency.DefaultDependencyCoordinate;
-import org.apache.maven.shared.dependency.resolve.DependencyResolverException;
+import org.apache.maven.shared.dependencies.DefaultDependableCoordinate;
+import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
import org.codehaus.plexus.util.IOUtil;
/**
@@ -108,7 +108,7 @@ public class ResolvePluginsMojo
if ( !excludeTransitive )
{
- DefaultDependencyCoordinate pluginCoordinate = new DefaultDependencyCoordinate();
+ DefaultDependableCoordinate pluginCoordinate = new DefaultDependableCoordinate();
pluginCoordinate.setGroupId( plugin.getGroupId() );
pluginCoordinate.setArtifactId( plugin.getArtifactId() );
pluginCoordinate.setVersion( plugin.getVersion() );