[maven-dependency-tree] 02/05: Refreshed the patch

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Dec 9 11:41:14 UTC 2015


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 2a94992f5e4edc7244afc719e6494ba03c2d0f9d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 9 12:33:22 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index caac3e3..bc3a4b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maven-dependency-tree (2.1-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patch
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 30 Oct 2015 14:11:15 +0100
+
 maven-dependency-tree (2.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01-maven3-compatibility.patch b/debian/patches/01-maven3-compatibility.patch
index 8ae0f22..21b4f28 100644
--- a/debian/patches/01-maven3-compatibility.patch
+++ b/debian/patches/01-maven3-compatibility.patch
@@ -23,8 +23,8 @@ Forwarded: not-needed
  
          return factory.createDependencyArtifact( artifact.getGroupId(), artifact.getArtifactId(),
                                                   VersionRange.createFromVersion( artifact.getVersion() ),
-@@ -109,15 +109,15 @@
-                                                  dep.isOptional() );
+@@ -109,7 +109,7 @@
+                                                  artifact.getClassifier(), dep.getScope(), dep.isOptional() );
      }
  
 -    private DependencyNode buildDependencyNode( DependencyNode parent, org.sonatype.aether.graph.DependencyNode node,
@@ -32,8 +32,7 @@ Forwarded: not-needed
                                                  Artifact artifact, ArtifactFilter filter )
      {
          DefaultDependencyNode current =
--            new DefaultDependencyNode( parent, artifact, node.getPremanagedVersion(), node.getPremanagedScope(),
-+            new DefaultDependencyNode( parent, artifact, null, null,
+@@ -117,7 +117,7 @@
                                         getVersionSelectedFromRange( node.getVersionConstraint() ) );
  
          List<DependencyNode> nodes = new ArrayList<DependencyNode>( node.getChildren().size() );

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



More information about the pkg-java-commits mailing list