Add the debian.hasPackageVersion property in the installed poms when the...

Add the debian.hasPackageVersion property in the installed poms when the --has-package-version option is specified (Closes: #862894)

Add the debian.hasPackageVersion property in the installed poms when the...
1908dd0a · Emmanuel Bourg · 41743067 · 1908dd0a · 1908dd0a
Commit 1908dd0a authored 8 years ago by Emmanuel Bourg
--- a/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
+++ b/debian-maven-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
@@ -730,6 +730,10 @@ public class SysInstallMojo extends AbstractMojo {

        List<String> params = new ArrayList<String>();
        params.add("--keep-pom-version");
+        boolean hasPackageVersion = pomOption != null && pomOption.getHasPackageVersion();
+        if (hasPackageVersion) {
+            params.add("--has-package-version");
+        }

        params.add("--package=" + destPackage);
        String mavenRulesPath = new File(debianDir, mavenRules).getAbsolutePath();
@@ -740,7 +744,7 @@ public class SysInstallMojo extends AbstractMojo {
        params.add("--published-rules=" + mavenPublishedRulesPath);

        getLog().info("Cleaning pom file: " + pomFile + " with options:");
-        getLog().info("\t--keep-pom-version --package=" + destPackage);
+        getLog().info("\t--keep-pom-version --package=" + destPackage + (hasPackageVersion ? " --has-package-version" : ""));
        getLog().info("\t--rules=" + mavenRulesPath);
        getLog().info("\t--ignore-rules=" + mavenIgnoreRulesPath);
        getLog().info("\t--published-rules=" + mavenPublishedRulesPath);

--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ maven-debian-helper (2.1.4) UNRELEASED; urgency=medium
  * Update verbiage in copyright holder prompt to be gender-neutral.
    Thanks to Tom Mable for the bug report. (Closes: #859012)

+  [ Emmanuel Bourg ]
+  * Add the debian.hasPackageVersion property in the installed poms when
+    the --has-package-version option is specified (Closes: #862894)
+
 -- Christopher Hoskin <mans0954@debian.org>  Sun, 08 Jan 2017 21:32:55 +0000

 maven-debian-helper (2.1.3) unstable; urgency=medium