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 5796E200C76 for ; Fri, 28 Apr 2017 12:32:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 55A8A160B8C; Fri, 28 Apr 2017 10:32:05 +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 899C8160BC2 for ; Fri, 28 Apr 2017 12:32:04 +0200 (CEST) Received: (qmail 60406 invoked by uid 500); 28 Apr 2017 10:32:03 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 60145 invoked by uid 99); 28 Apr 2017 10:32:03 -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; Fri, 28 Apr 2017 10:32:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AF550E965E; Fri, 28 Apr 2017 10:32:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: geomacy@apache.org To: commits@brooklyn.apache.org Date: Fri, 28 Apr 2017 10:32:10 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/13] brooklyn-server git commit: use bundle metadata from BOM file archived-at: Fri, 28 Apr 2017 10:32:05 -0000 use bundle metadata from BOM file Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/99dfb6f9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/99dfb6f9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/99dfb6f9 Branch: refs/heads/master Commit: 99dfb6f98837dd04c7a18a5767c8537af9e3b949 Parents: c9fd077 Author: Alex Heneveld Authored: Mon Apr 24 15:19:53 2017 +0100 Committer: Alex Heneveld Committed: Mon Apr 24 15:21:45 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/rest/resources/CatalogResource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/99dfb6f9/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 24bd47e..f1d8638 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -209,7 +209,8 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat throw new IllegalArgumentException("JAR MANIFEST symbolic-name '"+bundleNameInMF+"' does not match '"+vn.getSymbolicName()+"' defined in BOM"); } } else { - mf.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, vn.getSymbolicName()); + bundleNameInMF = vn.getSymbolicName(); + mf.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, bundleNameInMF); } String bundleVersionInMF = mf.getMainAttributes().getValue(Constants.BUNDLE_VERSION); @@ -218,7 +219,8 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat throw new IllegalArgumentException("JAR MANIFEST version '"+bundleVersionInMF+"' does not match '"+vn.getVersion()+"' defined in BOM"); } } else { - mf.getMainAttributes().putValue(Constants.BUNDLE_VERSION, vn.getVersion().toString()); + bundleVersionInMF = vn.getVersion().toString(); + mf.getMainAttributes().putValue(Constants.BUNDLE_VERSION, bundleVersionInMF); } if (mf.getMainAttributes().getValue(Attributes.Name.MANIFEST_VERSION)==null) { mf.getMainAttributes().putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");