[maven-debian-helper] 03/03: Use a unique method in SysInstallMojo to build the name of a pom file

[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 71d4782db1e85873f9dbdf7a11f966766fc87b10
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 30 10:00:54 2016 +0200

    Use a unique method in SysInstallMojo to build the name of a pom file
---
 .../java/org/debian/maven/plugin/SysInstallMojo.java    | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

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 a28b6a3..3ba4a42 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
@@ -432,18 +432,13 @@ public class SysInstallMojo extends AbstractMojo {
         return packagePath() + "/usr/share/maven-repo" + debianRepoPath();
     }
 
-    protected String pomName() {
+    /**
+     * Name of the pom file in the repository.
+     */
+    protected String pomName(String artifactId, String version) {
         return artifactId + "-" + version + ".pom";
     }
 
-    protected String destPomName() {
-        return destArtifactId + "-" + version + ".pom";
-    }
-
-    protected String debianPomName() {
-        return destArtifactId + "-" + debianVersion + ".pom";
-    }
-
     private String pomSrcPath() {
         return basedir.getAbsolutePath() + "/pom.xml";
     }
@@ -465,11 +460,11 @@ public class SysInstallMojo extends AbstractMojo {
     }
 
     private String pomDestPath() {
-        return fullRepoPath() + destPomName();
+        return fullRepoPath() + pomName(destArtifactId, version);
     }
 
     private String debianPomDestPath() {
-        return debianFullRepoPath() + debianPomName();
+        return debianFullRepoPath() + pomName(destArtifactId, debianVersion);
     }
 
     protected String jarName() {

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