[maven-debian-helper] 01/08: Add the debian.hasPackageVersion property in the installed poms when the --has-package-version option is specified (Closes: #862894)

[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 1908dd0a9f2d3ddd975c31402f8196ca1ebb4100
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 10:54:56 2017 +0200

    Add the debian.hasPackageVersion property in the installed poms when the --has-package-version option is specified (Closes: #862894)
---
 .../src/main/java/org/debian/maven/plugin/SysInstallMojo.java       | 6 +++++-
 debian/changelog                                                    | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git 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
index 3ff1e24..2b9e68a 100644
--- 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);
diff --git a/debian/changelog b/debian/changelog
index d89be08..fa8b470 100644
--- 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 at debian.org>  Sun, 08 Jan 2017 21:32:55 +0000
 
 maven-debian-helper (2.1.3) unstable; urgency=medium

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