Author: rfscholte
Date: Wed Jul 29 18:46:27 2015
New Revision: 1693331
URL: http://svn.apache.org/r1693331
Log:
add managedDependencies arg to resolveDependencies, which should help with
groupVersionAlignment of assembly-plugin
upgrade parent to maven-shared-components 21
Fix errors reported by checkstyle
Modified:
maven/shared/trunk/maven-artifact-transfer/pom.xml
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/DefaultDependencyCollector.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30ArtifactRepositoryAdapter.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30CollectorResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30DependencyCollector.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31ArtifactRepositoryAdapter.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31CollectorResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31DependencyCollector.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
Modified: maven/shared/trunk/maven-artifact-transfer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/pom.xml?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-transfer/pom.xml Wed Jul 29 18:46:27 2015
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
Wed Jul 29 18:46:27 2015
@@ -26,6 +26,12 @@ import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
+/**
+ * Utility class
+ *
+ * @author Robert Scholte
+ *
+ */
public final class TransferUtils
{
private TransferUtils()
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/CollectorResult.java
Wed Jul 29 18:46:27 2015
@@ -23,6 +23,11 @@ import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
+/**
+ *
+ * @author Robert Scholte
+ *
+ */
public interface CollectorResult
{
List<ArtifactRepository> getRemoteRepositories();
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/DependencyCollectorException.java
Wed Jul 29 18:46:27 2015
@@ -19,6 +19,10 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+/**
+ *
+ * @author Robert Scholte
+ */
public class DependencyCollectorException extends Exception
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/DefaultDependencyCollector.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/DefaultDependencyCollector.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/DefaultDependencyCollector.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/DefaultDependencyCollector.java
Wed Jul 29 18:46:27 2015
@@ -33,6 +33,11 @@ import org.codehaus.plexus.context.Conte
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+/**
+ * This DependencyCollector passes the request to the proper Maven 3.x
implementation
+ *
+ * @author Robert Scholte
+ */
@Component( role = DependencyCollector.class, hint = "default" )
public class DefaultDependencyCollector implements DependencyCollector,
Contextualizable
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30ArtifactRepositoryAdapter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30ArtifactRepositoryAdapter.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30ArtifactRepositoryAdapter.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30ArtifactRepositoryAdapter.java
Wed Jul 29 18:46:27 2015
@@ -31,6 +31,12 @@ import org.apache.maven.repository.Proxy
import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.repository.RepositoryPolicy;
+/**
+ * ArtifactRepository wrapper around {@link RemoteRepository}
+ *
+ * @author Robert Scholte
+ *
+ */
public class Maven30ArtifactRepositoryAdapter implements ArtifactRepository
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30CollectorResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30CollectorResult.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30CollectorResult.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30CollectorResult.java
Wed Jul 29 18:46:27 2015
@@ -31,6 +31,12 @@ import org.sonatype.aether.graph.Depende
import org.sonatype.aether.graph.DependencyVisitor;
import org.sonatype.aether.repository.RemoteRepository;
+/**
+ * CollectorResult wrapper around {@link CollectResult}
+ *
+ * @author Robert Scholte
+ *
+ */
public class Maven30CollectorResult implements CollectorResult
{
private final CollectResult collectResult;
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30DependencyCollector.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30DependencyCollector.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30DependencyCollector.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven30DependencyCollector.java
Wed Jul 29 18:46:27 2015
@@ -39,6 +39,12 @@ import org.sonatype.aether.collection.De
import org.sonatype.aether.graph.Dependency;
import org.sonatype.aether.repository.RemoteRepository;
+/**
+ * Maven 3.0 implementation of the {@link DependencyCollector}
+ *
+ * @author Robert Scholte
+ *
+ */
@Component( role = DependencyCollector.class, hint = "maven3" )
public class Maven30DependencyCollector
implements DependencyCollector
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31ArtifactRepositoryAdapter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31ArtifactRepositoryAdapter.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31ArtifactRepositoryAdapter.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31ArtifactRepositoryAdapter.java
Wed Jul 29 18:46:27 2015
@@ -31,6 +31,12 @@ import org.apache.maven.repository.Proxy
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.repository.RepositoryPolicy;
+/**
+ * ArtifactRepository wrapper around {@link RemoteRepository}
+ *
+ * @author Robert Scholte
+ *
+ */
public class Maven31ArtifactRepositoryAdapter implements ArtifactRepository
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31CollectorResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31CollectorResult.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31CollectorResult.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31CollectorResult.java
Wed Jul 29 18:46:27 2015
@@ -31,7 +31,12 @@ import org.eclipse.aether.graph.Dependen
import org.eclipse.aether.graph.DependencyVisitor;
import org.eclipse.aether.repository.RemoteRepository;
-
+/**
+ * CollectorResult wrapper around {@link CollectResult}
+ *
+ * @author Robert Scholte
+ *
+ */
public class Maven31CollectorResult implements CollectorResult
{
private final CollectResult collectResult;
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31DependencyCollector.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31DependencyCollector.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31DependencyCollector.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/collect/internal/Maven31DependencyCollector.java
Wed Jul 29 18:46:27 2015
@@ -39,6 +39,12 @@ import org.eclipse.aether.collection.Dep
import org.eclipse.aether.graph.Dependency;
import org.eclipse.aether.repository.RemoteRepository;
+/**
+ * Maven 3.1+ implementation of the {@link DependencyCollector}
+ *
+ * @author Robert Scholte
+ *
+ */
@Component( role = DependencyCollector.class, hint = "maven31" )
public class Maven31DependencyCollector
implements DependencyCollector
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
Wed Jul 29 18:46:27 2015
@@ -42,7 +42,7 @@ public interface ArtifactResolver
/**
* This will resolve the dependencies of the coordinate, not resolving the
the artifact of the coordinate itself.
* If the coordinate needs to be resolved too, use
- * {@link #resolveDependencies(ProjectBuildingRequest, Collection,
TransformableFilter)} passing
+ * {@link #resolveDependencies(ProjectBuildingRequest, Collection,
Collection, TransformableFilter)} passing
* {@code Collections.singletonList(coordinate)}
*
* @param buildingRequest
@@ -55,7 +55,18 @@ public interface ArtifactResolver
ArtifactCoordinate
coordinate, TransformableFilter filter )
throws ArtifactResolverException;
+ /**
+ *
+ * @param buildingRequest the project building request, never {@code null}
+ * @param dependencies the dependencies to resolve, never {@code null}
+ * @param managedDependencies managed dependencies, can be {@code null}
+ * @param filter a filter, can be {@code null}
+ * @return
+ * @throws ArtifactResolverException
+ */
Iterable<ArtifactResult> resolveDependencies( ProjectBuildingRequest
buildingRequest,
- Collection<Dependency>
dependencies, TransformableFilter filter )
+ Collection<Dependency>
dependencies,
+ Collection<Dependency>
managedDependencies,
+ TransformableFilter filter )
throws ArtifactResolverException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java
Wed Jul 29 18:46:27 2015
@@ -1,7 +1,5 @@
package org.apache.maven.shared.artifact.resolve;
-import org.apache.maven.artifact.Artifact;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import org.apache.maven.artifact.Artifac
* under the License.
*/
+import org.apache.maven.artifact.Artifact;
+
/**
* The Artifact Result
*
@@ -29,6 +29,5 @@ import org.apache.maven.artifact.Artifac
*/
public interface ArtifactResult
{
-
Artifact getArtifact();
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
Wed Jul 29 18:46:27 2015
@@ -85,6 +85,7 @@ public class DefaultArtifactResolver
@Override
public Iterable<ArtifactResult> resolveDependencies(
ProjectBuildingRequest buildingRequest,
Collection<Dependency> coordinates,
+
Collection<Dependency> managedDependencies,
TransformableFilter
filter )
throws ArtifactResolverException
{
@@ -94,7 +95,7 @@ public class DefaultArtifactResolver
ArtifactResolver effectiveArtifactResolver = container.lookup(
ArtifactResolver.class, hint );
- return effectiveArtifactResolver.resolveDependencies(
buildingRequest, coordinates, filter );
+ return effectiveArtifactResolver.resolveDependencies(
buildingRequest, coordinates, null, filter );
}
catch ( ComponentLookupException e )
{
@@ -103,9 +104,8 @@ public class DefaultArtifactResolver
}
@Override
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
-
ArtifactCoordinate coordinate,
-
TransformableFilter filter )
+ public Iterable<ArtifactResult> resolveDependencies(
ProjectBuildingRequest buildingRequest,
+ ArtifactCoordinate
coordinate, TransformableFilter filter )
throws ArtifactResolverException
{
try
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
Wed Jul 29 18:46:27 2015
@@ -62,13 +62,15 @@ public class Maven30ArtifactResolver
{
@Requirement
private RepositorySystem repositorySystem;
-
+
@Requirement
private ArtifactHandlerManager artifactHandlerManager;
@Override
- public org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest ,
-
org.apache.maven.artifact.Artifact mavenArtifact )
+ // CHECKSTYLE_OFF: LineLength
+ public org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest,
+
org.apache.maven.artifact.Artifact mavenArtifact )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
Artifact aetherArtifact =
@@ -79,21 +81,25 @@ public class Maven30ArtifactResolver
}
@Override
+ // CHECKSTYLE_OFF: LineLength
public org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest,
ArtifactCoordinate coordinate )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke(
RepositoryUtils.class, "newArtifactTypeRegistry",
-
ArtifactHandlerManager.class, artifactHandlerManager );
+ (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
+
ArtifactHandlerManager.class, artifactHandlerManager );
Dependency aetherDependency = toDependency( coordinate, typeRegistry );
-
+
return resolveArtifact( buildingRequest,
aetherDependency.getArtifact() );
}
+ // CHECKSTYLE_OFF: LineLength
private org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest,
Artifact aetherArtifact )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
@SuppressWarnings( "unchecked" )
@@ -126,19 +132,21 @@ public class Maven30ArtifactResolver
throw new ArtifactResolverException( e.getMessage(), e );
}
}
-
+
@Override
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest ,
-
ArtifactCoordinate coordinate ,
- TransformableFilter dependencyFilter )
- throws ArtifactResolverException
+ // CHECKSTYLE_OFF: LineLength
+ public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
+
ArtifactCoordinate coordinate,
+
TransformableFilter dependencyFilter )
+ // CHECKSTYLE_ON: LineLength
+ throws ArtifactResolverException
{
ArtifactTypeRegistry typeRegistry =
- (ArtifactTypeRegistry) Invoker.invoke(
RepositoryUtils.class, "newArtifactTypeRegistry",
-
ArtifactHandlerManager.class, artifactHandlerManager );
+ (ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
+
ArtifactHandlerManager.class, artifactHandlerManager );
Dependency aetherRoot = toDependency( coordinate, typeRegistry );
-
+
@SuppressWarnings( "unchecked" )
List<RemoteRepository> aetherRepositories =
(List<RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
"toRepos", List.class,
@@ -148,12 +156,14 @@ public class Maven30ArtifactResolver
return resolveDependencies( buildingRequest, aetherRepositories,
dependencyFilter, request );
}
-
-
+
@Override
+ // CHECKSTYLE_OFF: LineLength
public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
Collection<org.apache.maven.model.Dependency>
mavenDependencies,
+
Collection<org.apache.maven.model.Dependency>
managedMavenDependencies,
TransformableFilter filter )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
ArtifactTypeRegistry typeRegistry =
@@ -162,45 +172,62 @@ public class Maven30ArtifactResolver
List<Dependency> aetherDependencies = new ArrayList<Dependency>(
mavenDependencies.size() );
- final Class<?>[] argClasses = new Class<?>[] {
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
+ final Class<?>[] argClasses =
+ new Class<?>[] { org.apache.maven.model.Dependency.class,
ArtifactTypeRegistry.class };
for ( org.apache.maven.model.Dependency mavenDependency :
mavenDependencies )
{
- Object[] args = new Object[] {mavenDependency, typeRegistry };
-
- Dependency aetherDependency = (Dependency) Invoker.invoke(
RepositoryUtils.class, "toDependency", argClasses, args );
-
+ Object[] args = new Object[] { mavenDependency, typeRegistry };
+
+ Dependency aetherDependency =
+ (Dependency) Invoker.invoke( RepositoryUtils.class,
"toDependency", argClasses, args );
+
aetherDependencies.add( aetherDependency );
}
+ List<Dependency> aetherManagedDependencies = new
ArrayList<Dependency>( managedMavenDependencies.size() );
+
+ for ( org.apache.maven.model.Dependency mavenDependency :
managedMavenDependencies )
+ {
+ Object[] args = new Object[] { mavenDependency, typeRegistry };
+
+ Dependency aetherDependency =
+ (Dependency) Invoker.invoke( RepositoryUtils.class,
"toDependency", argClasses, args );
+
+ aetherManagedDependencies.add( aetherDependency );
+ }
+
@SuppressWarnings( "unchecked" )
List<RemoteRepository> aetherRepositories =
(List<RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
"toRepos", List.class,
buildingRequest.getRemoteRepositories() );
- CollectRequest request = new CollectRequest( (Dependency) null,
aetherDependencies, aetherRepositories );
+ CollectRequest request = new CollectRequest( aetherDependencies,
aetherManagedDependencies, aetherRepositories );
return resolveDependencies( buildingRequest, aetherRepositories,
filter, request );
}
+ // CHECKSTYLE_OFF: LineLength
private Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
List<RemoteRepository> aetherRepositories,
TransformableFilter dependencyFilter,
CollectRequest request )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
try
{
- DependencyFilter depFilter = null;
+ DependencyFilter depFilter = null;
if ( dependencyFilter != null )
{
depFilter = dependencyFilter.transform( new
SonatypeAetherFilterTransformer() );
}
RepositorySystemSession session =
- (RepositorySystemSession) Invoker.invoke(
buildingRequest, "getRepositorySession" );
+ (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
- List<ArtifactResult> dependencyResults =
repositorySystem.resolveDependencies( session, request, depFilter );
+ List<ArtifactResult> dependencyResults =
+ repositorySystem.resolveDependencies( session,
request, depFilter );
Collection<ArtifactRequest> artifactRequests = new
ArrayList<ArtifactRequest>( dependencyResults.size() );
@@ -218,7 +245,7 @@ public class Maven30ArtifactResolver
public
Iterator<org.apache.maven.shared.artifact.resolve.ArtifactResult> iterator()
{
Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
- new
ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>(
artifactResults.size() );
+ new
ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>(
artifactResults.size() );
for ( ArtifactResult artifactResult : artifactResults )
{
@@ -238,14 +265,13 @@ public class Maven30ArtifactResolver
throw new ArtifactResolverException( e.getMessage(), e );
}
}
-
+
/**
- * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
+ * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
*
* @param coordinate
* @param stereotypes
* @return as Aether Dependency
- *
*/
private static Dependency toDependency( ArtifactCoordinate coordinate,
ArtifactTypeRegistry stereotypes )
{
@@ -258,7 +284,7 @@ public class Maven30ArtifactResolver
Artifact artifact =
new DefaultArtifact( coordinate.getGroupId(),
coordinate.getArtifactId(), coordinate.getClassifier(), null,
coordinate.getVersion(), null, stereotype );
-
+
return new Dependency( artifact, null );
}
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
Wed Jul 29 18:46:27 2015
@@ -25,6 +25,7 @@ import org.sonatype.aether.artifact.Arti
import org.sonatype.aether.resolution.ArtifactResult;
/**
+ * {@link org.apache.maven.shared.artifact.resolve.ArtifactResult} wrapper for
{@link ArtifactResult}
*
* @author Robert Scholte
* @since 3.0
@@ -43,8 +44,8 @@ public class Maven30ArtifactResult imple
{
try
{
- return (org.apache.maven.artifact.Artifact) Invoker.invoke(
RepositoryUtils.class, "toArtifact", Artifact.class,
-
artifactResult.getArtifact() );
+ return (org.apache.maven.artifact.Artifact) Invoker.invoke(
RepositoryUtils.class, "toArtifact",
+
Artifact.class, artifactResult.getArtifact() );
}
catch ( ArtifactResolverException e )
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
Wed Jul 29 18:46:27 2015
@@ -69,8 +69,10 @@ public class Maven31ArtifactResolver
private ArtifactHandlerManager artifactHandlerManager;
@Override
- public org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest ,
-
org.apache.maven.artifact.Artifact mavenArtifact )
+ // CHECKSTYLE_OFF: LineLength
+ public org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest,
+
org.apache.maven.artifact.Artifact mavenArtifact )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
Artifact aetherArtifact =
@@ -81,8 +83,10 @@ public class Maven31ArtifactResolver
}
@Override
+ // CHECKSTYLE_OFF: LineLength
public org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest,
ArtifactCoordinate coordinate )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
ArtifactTypeRegistry typeRegistry =
@@ -94,8 +98,10 @@ public class Maven31ArtifactResolver
return resolveArtifact( buildingRequest,
aetherDependency.getArtifact() );
}
+ // CHECKSTYLE_OFF: LineLength
private org.apache.maven.shared.artifact.resolve.ArtifactResult
resolveArtifact( ProjectBuildingRequest buildingRequest,
Artifact aetherArtifact )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
@SuppressWarnings( "unchecked" )
@@ -129,9 +135,12 @@ public class Maven31ArtifactResolver
}
}
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest ,
-
ArtifactCoordinate coordinate ,
- TransformableFilter dependencyFilter )
+ @Override
+ // CHECKSTYLE_OFF: LineLength
+ public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
+
ArtifactCoordinate coordinate,
+
TransformableFilter dependencyFilter )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
ArtifactTypeRegistry typeRegistry =
@@ -153,60 +162,80 @@ public class Maven31ArtifactResolver
@Override
+ // CHECKSTYLE_OFF: LineLength
public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
Collection<org.apache.maven.model.Dependency>
mavenDependencies,
+
Collection<org.apache.maven.model.Dependency>
managedMavenDependencies,
TransformableFilter filter )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
ArtifactTypeRegistry typeRegistry =
(ArtifactTypeRegistry) Invoker.invoke( RepositoryUtils.class,
"newArtifactTypeRegistry",
ArtifactHandlerManager.class, artifactHandlerManager );
- List<Dependency> aetherDependencies = new ArrayList<Dependency>(
mavenDependencies.size() );
+ List<Dependency> aetherDeps = new ArrayList<Dependency>(
mavenDependencies.size() );
- final Class<?>[] argClasses = new Class<?>[] {
org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class };
+ final Class<?>[] argClasses =
+ new Class<?>[] { org.apache.maven.model.Dependency.class,
ArtifactTypeRegistry.class };
for ( org.apache.maven.model.Dependency mavenDependency :
mavenDependencies )
{
- Object[] args = new Object[] {mavenDependency, typeRegistry };
-
- Dependency aetherDependency = (Dependency) Invoker.invoke(
RepositoryUtils.class, "toDependency", argClasses, args );
-
- aetherDependencies.add( aetherDependency );
+ Object[] args = new Object[] { mavenDependency, typeRegistry };
+
+ Dependency aetherDependency =
+ (Dependency) Invoker.invoke( RepositoryUtils.class,
"toDependency", argClasses, args );
+
+ aetherDeps.add( aetherDependency );
+ }
+
+ List<Dependency> aetherManagedDeps = new ArrayList<Dependency>(
managedMavenDependencies.size() );
+
+ for ( org.apache.maven.model.Dependency mavenDependency :
managedMavenDependencies )
+ {
+ Object[] args = new Object[] { mavenDependency, typeRegistry };
+
+ Dependency aetherDependency =
+ (Dependency) Invoker.invoke( RepositoryUtils.class,
"toDependency", argClasses, args );
+
+ aetherManagedDeps.add( aetherDependency );
}
@SuppressWarnings( "unchecked" )
- List<RemoteRepository> aetherRepositories =
+ List<RemoteRepository> aetherRepos =
(List<RemoteRepository>) Invoker.invoke( RepositoryUtils.class,
"toRepos", List.class,
buildingRequest.getRemoteRepositories() );
- CollectRequest request = new CollectRequest( (Dependency) null,
aetherDependencies, aetherRepositories );
+ CollectRequest request = new CollectRequest( aetherDeps,
aetherManagedDeps, aetherRepos );
- return resolveDependencies( buildingRequest, aetherRepositories,
filter, request );
+ return resolveDependencies( buildingRequest, aetherRepos, filter,
request );
}
-
+
+ // CHECKSTYLE_OFF: LineLength
private Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>
resolveDependencies( ProjectBuildingRequest buildingRequest,
List<RemoteRepository> aetherRepositories,
TransformableFilter dependencyFilter,
CollectRequest request )
+ // CHECKSTYLE_ON: LineLength
throws ArtifactResolverException
{
try
{
- DependencyFilter depFilter = null;
+ DependencyFilter depFilter = null;
if ( dependencyFilter != null )
{
depFilter = dependencyFilter.transform( new
EclipseAetherFilterTransformer() );
}
DependencyRequest depRequest = new DependencyRequest( request,
depFilter );
-
+
RepositorySystemSession session =
- (RepositorySystemSession) Invoker.invoke(
buildingRequest, "getRepositorySession" );
+ (RepositorySystemSession) Invoker.invoke( buildingRequest,
"getRepositorySession" );
DependencyResult dependencyResults =
repositorySystem.resolveDependencies( session, depRequest );
- Collection<ArtifactRequest> artifactRequests = new
ArrayList<ArtifactRequest>( dependencyResults.getArtifactResults().size() );
+ Collection<ArtifactRequest> artifactRequests =
+ new ArrayList<ArtifactRequest>(
dependencyResults.getArtifactResults().size() );
for ( ArtifactResult artifactResult :
dependencyResults.getArtifactResults() )
{
@@ -222,7 +251,7 @@ public class Maven31ArtifactResolver
public
Iterator<org.apache.maven.shared.artifact.resolve.ArtifactResult> iterator()
{
Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
- new
ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>(
artifactResults.size() );
+ new
ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>(
artifactResults.size() );
for ( ArtifactResult artifactResult : artifactResults )
{
@@ -242,14 +271,13 @@ public class Maven31ArtifactResolver
throw new ArtifactResolverException( e.getMessage(), e );
}
}
-
+
/**
- * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
+ * Based on
RepositoryUtils#toDependency(org.apache.maven.model.Dependency,
ArtifactTypeRegistry)
*
* @param coordinate
* @param stereotypes
* @return as Aether Dependency
- *
*/
private static Dependency toDependency( ArtifactCoordinate coordinate,
ArtifactTypeRegistry stereotypes )
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java?rev=1693331&r1=1693330&r2=1693331&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
Wed Jul 29 18:46:27 2015
@@ -25,7 +25,7 @@ import org.eclipse.aether.resolution.Art
import org.eclipse.aether.artifact.Artifact;
/**
- *
+ * {@link org.apache.maven.shared.artifact.resolve.ArtifactResult} wrapper for
{@link ArtifactResult}
*
* @author Robert Scholte
* @since 3.0
@@ -44,8 +44,8 @@ public class Maven31ArtifactResult imple
{
try
{
- return (org.apache.maven.artifact.Artifact) Invoker.invoke(
RepositoryUtils.class, "toArtifact", Artifact.class,
-
artifactResult.getArtifact() );
+ return (org.apache.maven.artifact.Artifact) Invoker.invoke(
RepositoryUtils.class, "toArtifact",
+
Artifact.class, artifactResult.getArtifact() );
}
catch ( ArtifactResolverException e )
{
