Package: maven-debian-helper
Version: 2.0.6
Severity: normal
Tags: patch
Dear Maintainer,
Prior to commit 21a777b4f8147270f09f0238be2757bb14a58c45, DependancySolver
would display the relative paths to a pom, followed by the error contained in
the pom. Subsequently, DependancySolver just displays the name of the pom file
which is usually (always?) pom.xml. The original behaviour was much more useful
when investigating issues.
The attached patch reverts commit 21a777b4f8147270f09f0238be2757bb14a58c45 and
restores the original behaviour.
Thank you.
Christopher Hoskin
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.5.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages maven-debian-helper depends on:
ii default-jdk 2:1.8-57
ii libmaven-clean-plugin-java 2.5-1
ii libmaven-compiler-plugin-java 3.2-5
ii libmaven-jar-plugin-java 2.4-1
ii libmaven-resources-plugin-java 2.6-1
ii libmaven-site-plugin-java 2.1-4
ii libplexus-velocity-java 1.1.8-1
ii libsurefire-java 2.17-2
ii libxml2-utils 2.9.3+dfsg1-1
ii maven 3.3.9-4
ii maven-repo-helper 1.8.12
ii unzip 6.0-20
ii velocity 1.7-4
maven-debian-helper recommends no packages.
Versions of packages maven-debian-helper suggests:
ii apt-file 3.0
ii devscripts 2.16.4
ii libmaven-javadoc-plugin-java 2.10.3-2
ii subversion 1.9.4-1
-- no debconf information
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 7042552..f8d1777 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
@@ -544,7 +544,10 @@ public class DependenciesSolver {
return dependency;
}
- String sourcePomLoc = sourcePom.getName();
+ String sourcePomLoc = sourcePom.getAbsolutePath();
+ String baseDirPath = baseDir.getAbsolutePath();
+ sourcePomLoc = sourcePomLoc.substring(baseDirPath.length() + 1, sourcePomLoc.length());
+
if (verbose) {
System.out.println("Resolving " + dependency + (dependency.getScope() == null ? "" : " of scope " + dependency.getScope()) + "...");
}
