[maven-debian-helper] 01/01: Do not add provided dependencies to ${maven:Depends}

[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-debian-helper.

commit 14064dfc35ce9c1dce04beff2973a71a6b0f0897
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jul 13 02:26:08 2014 +0200

    Do not add provided dependencies to ${maven:Depends}
---
 debian/changelog                                                        | 2 ++
 .../src/main/java/org/debian/maven/packager/DependenciesSolver.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d3076d4..4034a69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 maven-debian-helper (1.6.8) UNRELEASED; urgency=medium
 
+  * The provided Maven dependencies are no longer added to the ${maven:Depends}
+    substitution variable
   * Added com.google.code.maven-license-plugin:maven-license-plugin
     to the ignored plugins
   * Use the --download-current-version uscan option in the generated
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
index 4f61099..7042552 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
@@ -802,7 +802,7 @@ public class DependenciesSolver {
                         debianDeps.add(TEST, libraryWithVersionConstraint);
                     } else if (dependency.isOptional()) {
                         debianDeps.add(OPTIONAL, libraryWithVersionConstraint);
-                    } else {
+                    } else if (!"provided".equals(dependency.getScope())) {
                         debianDeps.add(RUNTIME, libraryWithVersionConstraint);
                     }
                 }

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