[maven-debian-helper] 03/06: Fixed the --no-usj-versionless option (Closes: #766392)

[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 a64158333a0341523e6c11c304108f3d9f51a497
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 27 09:39:15 2016 +0100

    Fixed the --no-usj-versionless option (Closes: #766392)
---
 .../src/main/java/org/debian/maven/plugin/SysInstallMojo.java         | 4 ++--
 debian/changelog                                                      | 1 +
 2 files changed, 3 insertions(+), 2 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 1b2b996..080d3e7 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
@@ -620,10 +620,10 @@ public class SysInstallMojo extends AbstractMojo {
         if (jarFile.exists()) {
             System.out.println("Install jar for " + artifactId + " into /usr/share/java");
             mkdir(compatSharePath());
-            FileUtils.copyFile(jarFile, new File(fullCompatPath()));
             if (noUsjVersionless) {
-                link(destUsjJarName(), versionedFullCompatPath());
+                FileUtils.copyFile(jarFile, new File(versionedFullCompatPath()));
             } else {
+                FileUtils.copyFile(jarFile, new File(fullCompatPath()));
                 link(destUsjJarName(), fullCompatPath());
                 link(destUsjJarName(), versionedFullCompatPath());
             }
diff --git a/debian/changelog b/debian/changelog
index f9d1c0d..149cea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 maven-debian-helper (2.0.3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the --no-usj-versionless option (Closes: #766392)
   * Build the plugin metadata for the org.codehaus.plexus group
     when copying the Maven repository.
   * Fixed the test failure with testSolvePlexusActiveCollectionsDependencies

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