From commits-return-66313-archive-asf-public=cust-asf.ponee.io@sling.apache.org  Mon Apr  9 10:37:11 2018
Return-Path: <commits-return-66313-archive-asf-public=cust-asf.ponee.io@sling.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 8D495180780
	for <archive-asf-public@cust-asf.ponee.io>; Mon,  9 Apr 2018 10:37:10 +0200 (CEST)
Received: (qmail 88625 invoked by uid 500); 9 Apr 2018 08:37:09 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 88268 invoked by uid 99); 9 Apr 2018 08:37:09 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Apr 2018 08:37:09 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 0A60A8091E; Mon,  9 Apr 2018 08:37:08 +0000 (UTC)
Date: Mon, 09 Apr 2018 08:37:11 +0000
To: "commits@sling.apache.org" <commits@sling.apache.org>
Subject: [sling-org-apache-sling-karaf-distribution] 04/05: align features
 with Karaf distribution
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: olli@apache.org
In-Reply-To: <152326302792.11330.17903322117353023550@gitbox.apache.org>
References: <152326302792.11330.17903322117353023550@gitbox.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: sling-org-apache-sling-karaf-distribution
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 24c85a8ec32cbec9d495b1631c812914fad20ca0
X-Git-NotificationType: diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
Message-Id: <20180409083708.0A60A8091E@gitbox.apache.org>

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git

commit 24c85a8ec32cbec9d495b1631c812914fad20ca0
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Sun Apr 8 15:13:53 2018 +0200

    align features with Karaf distribution
---
 pom.xml | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d48fdc..478a027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,6 +59,14 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>enterprise</artifactId>
+      <version>4.2.0.M2</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.karaf-features</artifactId>
       <version>0.1.1-SNAPSHOT</version>
@@ -401,10 +409,13 @@
         </executions>
         <configuration>
           <installedFeatures>
-            <!-- Apache Karaf -->
+            <!-- Apache Karaf (default) -->
             <feature>wrapper</feature>
-            <feature>wrap</feature>
-            <feature>kar</feature>
+            <!-- Apache Karaf (additional for Sling)-->
+            <feature>http</feature>
+            <feature>http-whiteboard</feature>
+            <feature>scr</feature>
+            <feature>webconsole</feature>
             <!-- Apache Sling -->
             <feature>sling</feature>
             <!-- Apache Sling Auth -->
@@ -493,9 +504,10 @@
             <feature>composum</feature>
           </installedFeatures>
           <startupFeatures>
+            <feature>eventadmin</feature>
           </startupFeatures>
           <bootFeatures>
-            <feature>eventadmin</feature>
+            <feature>wrap</feature>
             <feature>shell</feature>
             <feature>feature</feature>
             <feature>jaas</feature>
@@ -505,15 +517,13 @@
             <feature>config</feature>
             <feature>deployer</feature>
             <feature>diagnostic</feature>
+            <feature>feature</feature>
             <feature>instance</feature>
+            <feature>kar</feature>
             <feature>log</feature>
             <feature>package</feature>
             <feature>service</feature>
             <feature>system</feature>
-            <feature>scr</feature>
-            <feature>http</feature>
-            <feature>http-whiteboard</feature>
-            <feature>webconsole</feature>
           </bootFeatures>
           <libraries>
           </libraries>

-- 
To stop receiving notification emails like this one, please contact
olli@apache.org.