karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-4658] Allow defaultTargetFile to be overridden for any kind of packaging. This closes #178
Date Mon, 22 Aug 2016 12:58:15 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x e8f1b7a38 -> 5cca72ffa


[KARAF-4658] Allow defaultTargetFile to be overridden for any kind of packaging. This closes
#178


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5cca72ff
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5cca72ff
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5cca72ff

Branch: refs/heads/karaf-4.0.x
Commit: 5cca72ffa5df8fe2ad1aab31422e91041753e202
Parents: e8f1b7a
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Aug 22 14:56:52 2016 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Aug 22 14:58:06 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/karaf/tooling/ArchiveMojo.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/5cca72ff/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
index efbf370..a906dae 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/ArchiveMojo.java
@@ -151,7 +151,7 @@ public class ArchiveMojo extends MojoSupport {
     public File archive(File source, File dest, Artifact artifact) throws //ArchiverException,
             IOException {
         String serverName = null;
-        if (targetFile != null && project.getPackaging().equals("karaf-assembly"))
{
+        if (targetFile != null) {
             serverName = targetFile.getName();
         } else {
            serverName = artifact.getArtifactId() + "-" + artifact.getVersion();


Mime
View raw message