sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject [sling-org-apache-sling-karaf-distribution] branch master updated: SLING-7546 Take requirements for services into account
Date Sun, 06 May 2018 10:56:56 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new 8b82033  SLING-7546 Take requirements for services into account
8b82033 is described below

commit 8b82033aa876359ab2e92f50f57f688b5bfd6cb2
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Sun May 6 12:48:21 2018 +0200

    SLING-7546 Take requirements for services into account
    
    remove custom features configuration with disabled service requirements
---
 pom.xml                                            |  6 --
 .../resources/etc/org.apache.karaf.features.cfg    | 87 ----------------------
 2 files changed, 93 deletions(-)

diff --git a/pom.xml b/pom.xml
index f031044..476e747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -373,12 +373,6 @@
   </dependencies>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/src/main/resources/etc/org.apache.karaf.features.cfg b/src/main/resources/etc/org.apache.karaf.features.cfg
deleted file mode 100755
index 564a4e5..0000000
--- a/src/main/resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,87 +0,0 @@
-################################################################################
-#
-#    Licensed to the Apache Software Foundation (ASF) under one or more
-#    contributor license agreements.  See the NOTICE file distributed with
-#    this work for additional information regarding copyright ownership.
-#    The ASF licenses this file to You under the Apache License, Version 2.0
-#    (the "License"); you may not use this file except in compliance with
-#    the License.  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-################################################################################
-
-#
-# Comma separated list of features repositories to register by default
-#
-featuresRepositories = \
-    mvn:org.apache.sling/org.apache.sling.karaf-features/${project.version}/xml/features,
\
-    mvn:org.apache.karaf.features/framework/${org.apache.karaf.version}/xml/features, \
-    mvn:org.apache.karaf.features/standard/${org.apache.karaf.version}/xml/features
-
-#
-# Comma separated list of features to install at startup
-#
-featuresBoot = \
-    instance, \
-    package, \
-    log, \
-    ssh, \
-    framework, \
-    system, \
-    feature, \
-    shell, \
-    management, \
-    service, \
-    jaas, \
-    deployer, \
-    diagnostic, \
-    bundle, \
-    config, \
-    eventadmin, \
-    http, \
-    http-whiteboard, \
-    webconsole, \
-    scr
-
-#
-# Resource repositories (OBR) that the features resolver can use
-# to resolve requirements/capabilities
-#
-# The format of the resourceRepositories is
-# resourceRepositories=[xml:url|json:url],...
-# for Instance:
-#
-#resourceRepositories=xml:http://host/path/to/index.xml
-# or
-#resourceRepositories=json:http://host/path/to/index.json
-#
-
-#
-# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
-#
-featuresBootAsynchronous=false
-
-#
-# Service requirements enforcement
-#
-# By default, the feature resolver checks the service requirements/capabilities of
-# bundles for new features (xml schema >= 1.3.0) in order to automatically installs
-# the required bundles.
-# The following flag can have those values:
-#   - disable: service requirements are completely ignored
-#   - default: service requirements are ignored for old features
-#   - enforce: service requirements are always verified
-#
-serviceRequirements=disable
-
-#
-# Store cfg file for config element in feature
-#
-#configCfgStore=true

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

Mime
View raw message