[maven-dependency-tree] 06/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 701485f4bd179e2a7890a2545a522f28b2ca521c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 25 08:55:33 2017 +0200

    Refreshed the patch
---
 debian/changelog                             |  4 +++-
 debian/patches/01-maven3-compatibility.patch | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8351a9..3b88397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven-dependency-tree (2.1-3) UNRELEASED; urgency=medium
+maven-dependency-tree (2.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patch
   * Removed the unused build dependency on libplexus-maven-plugin-java
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/patches/01-maven3-compatibility.patch b/debian/patches/01-maven3-compatibility.patch
index 21b4f28..c3743f8 100644
--- a/debian/patches/01-maven3-compatibility.patch
+++ b/debian/patches/01-maven3-compatibility.patch
@@ -3,18 +3,18 @@ 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
-@@ -40,8 +40,8 @@
- import org.apache.maven.shared.dependency.graph.DependencyNode;
+@@ -36,8 +36,8 @@
  import org.codehaus.plexus.component.annotations.Component;
  import org.codehaus.plexus.component.annotations.Requirement;
+ import org.codehaus.plexus.logging.AbstractLogEnabled;
 -import org.sonatype.aether.graph.Dependency;
 -import org.sonatype.aether.version.VersionConstraint;
 +import org.eclipse.aether.graph.Dependency;
 +import org.eclipse.aether.version.VersionConstraint;
  
- /**
-  * Wrapper around Maven 3 dependency resolver.
-@@ -101,7 +101,7 @@
+ import java.util.ArrayList;
+ import java.util.Collection;
+@@ -173,7 +173,7 @@
  
      private Artifact getDependencyArtifact( Dependency dep )
      {
@@ -23,7 +23,7 @@ Forwarded: not-needed
  
          return factory.createDependencyArtifact( artifact.getGroupId(), artifact.getArtifactId(),
                                                   VersionRange.createFromVersion( artifact.getVersion() ),
-@@ -109,7 +109,7 @@
+@@ -181,7 +181,7 @@
                                                   artifact.getClassifier(), dep.getScope(), dep.isOptional() );
      }
  
@@ -32,7 +32,7 @@ Forwarded: not-needed
                                                  Artifact artifact, ArtifactFilter filter )
      {
          DefaultDependencyNode current =
-@@ -117,7 +117,7 @@
+@@ -191,7 +191,7 @@
                                         getVersionSelectedFromRange( node.getVersionConstraint() ) );
  
          List<DependencyNode> nodes = new ArrayList<DependencyNode>( node.getChildren().size() );
@@ -41,7 +41,7 @@ Forwarded: not-needed
          {
              Artifact childArtifact = getDependencyArtifact( child.getDependency() );
  
-@@ -139,16 +139,6 @@
+@@ -213,16 +213,6 @@
              return null;
          }
  

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