Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 88A3B200B6A for ; Mon, 22 Aug 2016 14:58:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 87481160AB3; Mon, 22 Aug 2016 12:58:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CE907160A91 for ; Mon, 22 Aug 2016 14:58:16 +0200 (CEST) Received: (qmail 72833 invoked by uid 500); 22 Aug 2016 12:58:16 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 72824 invoked by uid 99); 22 Aug 2016 12:58:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Aug 2016 12:58:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E70F9DFB92; Mon, 22 Aug 2016 12:58:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org To: commits@karaf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer 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 +0000 (UTC) archived-at: Mon, 22 Aug 2016 12:58:17 -0000 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é Authored: Mon Aug 22 14:56:52 2016 +0200 Committer: Jean-Baptiste Onofré 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();