|
 |
ec8d1a |
diff --git a/pom.xml b/pom.xml
|
|
|
ec8d1a |
index 31f4600..2f149da 100644
|
|
|
ec8d1a |
--- a/pom.xml
|
|
|
ec8d1a |
+++ b/pom.xml
|
|
|
ec8d1a |
@@ -56,7 +56,7 @@
|
|
|
ec8d1a |
<dependency>
|
|
|
ec8d1a |
<groupId>org.apache.maven</groupId>
|
|
|
ec8d1a |
<artifactId>maven-core</artifactId>
|
|
|
ec8d1a |
- <version>3.0.4</version>
|
|
|
ec8d1a |
+ <version>3.1.0</version>
|
|
|
ec8d1a |
<scope>provided</scope>
|
|
|
ec8d1a |
</dependency>
|
|
|
ec8d1a |
<dependency>
|
|
|
ec8d1a |
@@ -65,10 +65,21 @@
|
|
|
ec8d1a |
<version>1.5.5</version>
|
|
|
ec8d1a |
</dependency>
|
|
|
ec8d1a |
<dependency>
|
|
|
ec8d1a |
- <groupId>org.sonatype.aether</groupId>
|
|
|
ec8d1a |
+ <groupId>org.eclipse.aether</groupId>
|
|
|
ec8d1a |
<artifactId>aether-api</artifactId>
|
|
|
ec8d1a |
- <version>1.13.1</version>
|
|
|
ec8d1a |
<optional>true</optional>
|
|
|
ec8d1a |
+ <version>0.9.0.M2</version>
|
|
|
ec8d1a |
+ </dependency>
|
|
|
ec8d1a |
+ <dependency>
|
|
|
ec8d1a |
+ <groupId>org.eclipse.aether</groupId>
|
|
|
ec8d1a |
+ <artifactId>aether-util</artifactId>
|
|
|
ec8d1a |
+ <version>0.9.0.M2</version>
|
|
|
ec8d1a |
+ <exclusions>
|
|
|
ec8d1a |
+ <exclusion>
|
|
|
ec8d1a |
+ <groupId>org.eclipse.aether</groupId>
|
|
|
ec8d1a |
+ <artifactId>aether-api</artifactId>
|
|
|
ec8d1a |
+ </exclusion>
|
|
|
ec8d1a |
+ </exclusions>
|
|
|
ec8d1a |
</dependency>
|
|
|
ec8d1a |
|
|
|
ec8d1a |
<dependency>
|
|
|
ec8d1a |
diff --git a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
|
|
|
ec8d1a |
index 9527f72..8b7b025 100644
|
|
|
ec8d1a |
--- a/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
|
|
|
ec8d1a |
+++ b/src/main/java/org/apache/maven/shared/dependency/graph/internal/Maven3DependencyGraphBuilder.java
|
|
|
ec8d1a |
@@ -40,8 +40,8 @@ import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
|
|
|
ec8d1a |
import org.apache.maven.shared.dependency.graph.DependencyNode;
|
|
|
ec8d1a |
import org.codehaus.plexus.component.annotations.Component;
|
|
|
ec8d1a |
import org.codehaus.plexus.component.annotations.Requirement;
|
|
|
ec8d1a |
-import org.sonatype.aether.graph.Dependency;
|
|
|
ec8d1a |
-import org.sonatype.aether.version.VersionConstraint;
|
|
|
ec8d1a |
+import org.eclipse.aether.graph.Dependency;
|
|
|
ec8d1a |
+import org.eclipse.aether.version.VersionConstraint;
|
|
|
ec8d1a |
|
|
|
ec8d1a |
/**
|
|
|
ec8d1a |
* Wrapper around Maven 3 dependency resolver.
|
|
|
ec8d1a |
@@ -101,7 +101,7 @@ public class Maven3DependencyGraphBuilder
|
|
|
ec8d1a |
|
|
|
ec8d1a |
private Artifact getDependencyArtifact( Dependency dep )
|
|
|
ec8d1a |
{
|
|
|
ec8d1a |
- org.sonatype.aether.artifact.Artifact artifact = dep.getArtifact();
|
|
|
ec8d1a |
+ org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
|
|
|
ec8d1a |
|
|
|
ec8d1a |
return factory.createDependencyArtifact( artifact.getGroupId(), artifact.getArtifactId(),
|
|
|
ec8d1a |
VersionRange.createFromVersion( artifact.getVersion() ),
|
|
|
ec8d1a |
@@ -109,15 +109,15 @@ public class Maven3DependencyGraphBuilder
|
|
|
ec8d1a |
dep.isOptional() );
|
|
|
ec8d1a |
}
|
|
|
ec8d1a |
|
|
|
ec8d1a |
- private DependencyNode buildDependencyNode( DependencyNode parent, org.sonatype.aether.graph.DependencyNode node,
|
|
|
ec8d1a |
+ private DependencyNode buildDependencyNode( DependencyNode parent, org.eclipse.aether.graph.DependencyNode node,
|
|
|
ec8d1a |
Artifact artifact, ArtifactFilter filter )
|
|
|
ec8d1a |
{
|
|
|
ec8d1a |
DefaultDependencyNode current =
|
|
|
ec8d1a |
- new DefaultDependencyNode( parent, artifact, node.getPremanagedVersion(), node.getPremanagedScope(),
|
|
|
ec8d1a |
+ new DefaultDependencyNode( parent, artifact, null /*node.getPremanagedVersion()*/, null /*node.getPremanagedScope()*/,
|
|
|
ec8d1a |
getVersionSelectedFromRange( node.getVersionConstraint() ) );
|
|
|
ec8d1a |
|
|
|
ec8d1a |
List<DependencyNode> nodes = new ArrayList<DependencyNode>( node.getChildren().size() );
|
|
|
ec8d1a |
- for ( org.sonatype.aether.graph.DependencyNode child : node.getChildren() )
|
|
|
ec8d1a |
+ for ( org.eclipse.aether.graph.DependencyNode child : node.getChildren() )
|
|
|
ec8d1a |
{
|
|
|
ec8d1a |
Artifact childArtifact = getDependencyArtifact( child.getDependency() );
|
|
|
ec8d1a |
|
|
|
ec8d1a |
@@ -140,7 +140,8 @@ public class Maven3DependencyGraphBuilder
|
|
|
ec8d1a |
}
|
|
|
ec8d1a |
|
|
|
ec8d1a |
StringBuilder sb = new StringBuilder();
|
|
|
ec8d1a |
- for ( org.sonatype.aether.version.VersionRange range : constraint.getRanges() )
|
|
|
ec8d1a |
+ org.eclipse.aether.version.VersionRange range = constraint.getRange();
|
|
|
ec8d1a |
+ if ( range != null )
|
|
|
ec8d1a |
{
|
|
|
ec8d1a |
if ( sb.length() > 0 )
|
|
|
ec8d1a |
{
|