[maven-dependency-tree] 09/17: Refreshed the patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-dependency-tree.

commit d0e5586ecd59e2f67fa0e8bd184ec64c749b1dc0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 4 12:41:34 2017 +0200

    Refreshed the patch
---
 debian/changelog                             |  2 +-
 debian/patches/01-maven3-compatibility.patch | 35 +++++++++++++++++-----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b88397..b8677e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven-dependency-tree (2.2-1) UNRELEASED; urgency=medium
+maven-dependency-tree (3.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/01-maven3-compatibility.patch b/debian/patches/01-maven3-compatibility.patch
index c3743f8..c351da7 100644
--- a/debian/patches/01-maven3-compatibility.patch
+++ b/debian/patches/01-maven3-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- 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
-@@ -36,8 +36,8 @@
+@@ -42,8 +42,8 @@
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.annotations.Requirement;
  import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -12,19 +12,28 @@ Forwarded: not-needed
 +import org.eclipse.aether.graph.Dependency;
 +import org.eclipse.aether.version.VersionConstraint;
  
- import java.util.ArrayList;
- import java.util.Collection;
-@@ -173,7 +173,7 @@
+ /**
+  * Wrapper around Maven 3 dependency resolver.
+@@ -141,7 +141,7 @@
+         return result;
+     }
  
-     private Artifact getDependencyArtifact( Dependency dep )
+-    private List<org.sonatype.aether.graph.Dependency> getReactorDependencies( Collection<MavenProject> reactorProjects,
++    private List<org.eclipse.aether.graph.Dependency> getReactorDependencies( Collection<MavenProject> reactorProjects,
+                                                                                List<?> dependencies )
      {
--        org.sonatype.aether.artifact.Artifact artifact = dep.getArtifact();
-+        org.eclipse.aether.artifact.Artifact artifact = dep.getArtifact();
+         Set<ArtifactKey> reactorProjectsIds = new HashSet<ArtifactKey>();
+@@ -154,7 +154,7 @@
+         for ( Object untypedDependency : dependencies )
+         {
+             Dependency dependency = (Dependency) untypedDependency;
+-            org.sonatype.aether.artifact.Artifact depArtifact = dependency.getArtifact();
++            org.eclipse.aether.artifact.Artifact depArtifact = dependency.getArtifact();
  
-         return factory.createDependencyArtifact( artifact.getGroupId(), artifact.getArtifactId(),
-                                                  VersionRange.createFromVersion( artifact.getVersion() ),
-@@ -181,7 +181,7 @@
-                                                  artifact.getClassifier(), dep.getScope(), dep.isOptional() );
+             ArtifactKey key =
+                 new ArtifactKey( depArtifact.getGroupId(), depArtifact.getArtifactId(), depArtifact.getVersion() );
+@@ -177,7 +177,7 @@
+         return mavenArtifact; 
      }
  
 -    private DependencyNode buildDependencyNode( DependencyNode parent, org.sonatype.aether.graph.DependencyNode node,
@@ -32,7 +41,7 @@ Forwarded: not-needed
                                                  Artifact artifact, ArtifactFilter filter )
      {
          DefaultDependencyNode current =
-@@ -191,7 +191,7 @@
+@@ -187,7 +187,7 @@
                                         getVersionSelectedFromRange( node.getVersionConstraint() ) );
  
          List<DependencyNode> nodes = new ArrayList<DependencyNode>( node.getChildren().size() );
@@ -41,7 +50,7 @@ Forwarded: not-needed
          {
              Artifact childArtifact = getDependencyArtifact( child.getDependency() );
  
-@@ -213,16 +213,6 @@
+@@ -209,16 +209,6 @@
              return null;
          }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-dependency-tree.git