[SCM] UNNAMED PROJECT branch, master, updated. debian/1.6.2-16-gc922c94
Emmanuel Bourg
ebourg at apache.org
Tue Jun 11 13:53:14 UTC 2013
The following commit has been merged in the master branch:
commit 2057a1c8d65c9bef71873f07b91eabe27fcd2c33
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 11 15:40:29 2013 +0200
Fixed the information message displayed when resolving dependencies (broken in commit 0551655)
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 d7db3f8..49d8cb1 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
@@ -485,13 +485,17 @@ public class DependenciesSolver {
}
String sourcePomLoc = sourcePom.getName();
- if (verbose) System.out.println("Resolving " + dependency + dependency.getScope() == null ? "" : " of scope " + dependency.getScope() + " ...");
+ if (verbose) {
+ System.out.println("Resolving " + dependency + (dependency.getScope() == null ? "" : " of scope " + dependency.getScope()) + "...");
+ }
// First let the packager mark as ignored those dependencies which should be ignored
if (ignoreDependencyQuestion.askIgnoreUnnecessaryDependency(dependency, sourcePomLoc, runTests, generateJavadoc)) {
ignoredDependencies.add(dependency);
pomTransformer.getRulesFiles().get(IGNORE).add(new DependencyRule(dependency.getGroupId(), dependency.getArtifactId(), "*", "*"));
- if (verbose) System.out.println("[ignored]");
+ if (verbose) {
+ System.out.println("[ignored]");
+ }
return null;
}
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list