Return-Path: <commits-return-57268-archive-asf-public=cust-asf.ponee.io@camel.apache.org>
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 264C0200CAD
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 28 Jun 2017 13:19:00 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 24E1C160BF7; Wed, 28 Jun 2017 11:19:00 +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 6B601160BE8
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 28 Jun 2017 13:18:59 +0200 (CEST)
Received: (qmail 79784 invoked by uid 500); 28 Jun 2017 11:18:58 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 79775 invoked by uid 99); 28 Jun 2017 11:18:58 -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; Wed, 28 Jun 2017 11:18:58 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 84A54DFAF5; Wed, 28 Jun 2017 11:18:58 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: acosentino@apache.org
To: commits@camel.apache.org
Message-Id: <93b4793ba9264a31b13f3d9be5c586ae@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: camel git commit: CAMEL-11472 - [camel-box] missing Karaf feature
 dependency, thanks to Alexey Markevich for the patch
Date: Wed, 28 Jun 2017 11:18:58 +0000 (UTC)
archived-at: Wed, 28 Jun 2017 11:19:00 -0000

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 53164066b -> d8413a5b3


CAMEL-11472 - [camel-box] missing Karaf feature dependency, thanks to Alexey Markevich for the patch


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

Branch: refs/heads/camel-2.18.x
Commit: d8413a5b3fa9423566395cb73d7076c61038bd3a
Parents: 5316406
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Wed Jun 28 13:18:21 2017 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Wed Jun 28 13:18:21 2017 +0200

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d8413a5b/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index fa4990e..28f90c8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -231,6 +231,8 @@
   </feature>
   <feature name='camel-box' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
+    <!-- pax-jetty feature have condition on pax-http-whiteboard -->
+    <feature>pax-http-whiteboard</feature>
     <feature>jetty</feature>
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>