You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/12/18 12:03:10 UTC
svn commit: r1774882 - in /sling/trunk/karaf: ./
org.apache.sling.karaf-distribution/
org.apache.sling.karaf-distribution/src/main/resources/etc/
org.apache.sling.karaf-features/ org.apache.sling.karaf-integration-tests/
org.apache.sling.karaf-integrat...
Author: olli
Date: Sun Dec 18 12:03:10 2016
New Revision: 1774882
URL: http://svn.apache.org/viewvc?rev=1774882&view=rev
Log:
SLING-6411 Upgrade Karaf to 4.1
use Karaf 4.1.0-SNAPSHOT
Added:
sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/org.apache.karaf.features.cfg (with props)
Removed:
sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/custom.properties
Modified:
sling/trunk/karaf/README.md
sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml
sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
Modified: sling/trunk/karaf/README.md
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/README.md?rev=1774882&r1=1774881&r2=1774882&view=diff
==============================================================================
--- sling/trunk/karaf/README.md (original)
+++ sling/trunk/karaf/README.md Sun Dec 18 12:03:10 2016
@@ -5,14 +5,12 @@ Apache Sling Karaf
* **Apache Sling Karaf Configs**: configurations for provisioning with Apache Karaf
* **Apache Sling Karaf Distribution**: a [distribution](https://karaf.apache.org/manual/latest/#_custom_distributions) of [Apache Sling](https://sling.apache.org) based on [Apache Karaf](https://karaf.apache.org) (Sling's features and artifacts in a single archive)
-**NOTE:** Tested and built with Apache Karaf 4.0.5
+**NOTE:** Tested and built with Apache Karaf 4.1.0-SNAPSHOT
Getting Started
---------------
-For Karaf < 4.1.0 you need to configure _Felix File Install_ in `etc/config.properties` to include `*.config` files (not necessary when using _Sling's Karaf Distribution_):
-
- `felix.fileinstall.filter = .*\\.(cfg|config)`
+You have to set `serviceRequirements=disable` in Karaf's `etc/org.apache.karaf.features.cfg` (not necessary when using _Sling's Karaf Distribution_).
1) [Start Apache Karaf](https://karaf.apache.org/manual/latest/#_quick_start) or _Sling's Karaf Distribution_.
Modified: sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml?rev=1774882&r1=1774881&r2=1774882&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-distribution/pom.xml Sun Dec 18 12:03:10 2016
@@ -38,9 +38,10 @@
<!-- https://github.com/apache/karaf/blob/master/assemblies/apache-karaf/pom.xml -->
<properties>
- <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
+ <org.apache.karaf.version>4.1.0-SNAPSHOT</org.apache.karaf.version>
+ <jna.version>4.2.2</jna.version>
<servicemix.specs.version>2.7.0</servicemix.specs.version>
- <xerces.version>2.11.0</xerces.version>
+ <xerces.version>2.11.0_1</xerces.version>
<xalan.bundle.version>2.7.2_3</xalan.bundle.version>
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
</properties>
@@ -417,8 +418,7 @@
<feature>webconsole</feature>
</bootFeatures>
<libraries>
- <library>xerces-${xerces.version}.jar;url:="wrap:mvn:xerces/xercesImpl/${xerces.version}$Export-Package=org.apache.*;version=${xerces.version}";type:=endorsed;export:=true;delegate:=true</library>
-
+ <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library>
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library>
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
@@ -431,7 +431,11 @@
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library>
<library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library>
+
+ <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
+ <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
</libraries>
+ <javase>1.8</javase>
</configuration>
</plugin>
</plugins>
Added: sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/org.apache.karaf.features.cfg?rev=1774882&view=auto
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/org.apache.karaf.features.cfg (added)
+++ sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/org.apache.karaf.features.cfg Sun Dec 18 12:03:10 2016
@@ -0,0 +1,87 @@
+################################################################################
+#
+# 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/0.1.1-SNAPSHOT/xml/features, \
+ mvn:org.apache.karaf.features/framework/4.0.7/xml/features, \
+ mvn:org.apache.karaf.features/standard/4.0.7/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
Propchange: sling/trunk/karaf/org.apache.sling.karaf-distribution/src/main/resources/etc/org.apache.karaf.features.cfg
------------------------------------------------------------------------------
svn:executable = *
Modified: sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml?rev=1774882&r1=1774881&r2=1774882&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml Sun Dec 18 12:03:10 2016
@@ -36,7 +36,7 @@
<description>Apache Sling Features for provisioning with Apache Karaf</description>
<properties>
- <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
+ <org.apache.karaf.version>4.1.0-SNAPSHOT</org.apache.karaf.version>
<org.apache.jackrabbit.version>2.13.1</org.apache.jackrabbit.version>
<org.apache.jackrabbit.oak.version>1.5.7</org.apache.jackrabbit.oak.version>
<org.apache.tika.version>1.13</org.apache.tika.version>
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml?rev=1774882&r1=1774881&r2=1774882&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/pom.xml Sun Dec 18 12:03:10 2016
@@ -37,7 +37,7 @@
<properties>
<org.apache.jackrabbit.version>2.13.1</org.apache.jackrabbit.version>
- <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
+ <org.apache.karaf.version>4.1.0-SNAPSHOT</org.apache.karaf.version>
<org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version>
</properties>
@@ -278,6 +278,7 @@
</executions>
<configuration>
<excludes>
+ <exclude>**/SlingLaunchpadOak*IT.*</exclude>
<!-- SLING-5122, SLING-5123 -->
<exclude>**/SlingAuthXing*.*</exclude>
</excludes>
Modified: sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java?rev=1774882&r1=1774881&r2=1774882&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-integration-tests/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java Sun Dec 18 12:03:10 2016
@@ -136,8 +136,8 @@ public abstract class KarafTestSupport {
.unpackDirectory(new File("target/paxexam/" + getClass().getSimpleName())),
keepRuntimeFolder(),
logLevel(LogLevel.DEBUG),
- editConfigurationFilePut("etc/custom.properties", "felix.fileinstall.filter", ".*\\.(cfg|config)"),
editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG, out, sift, osgi:*"),
+ editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "serviceRequirements", "disable"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", Integer.toString(rmiRegistryPort)),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", Integer.toString(rmiServerPort)),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", Integer.toString(sshPort)),
Modified: sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1774882&r1=1774881&r2=1774882&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/pom.xml Sun Dec 18 12:03:10 2016
@@ -36,7 +36,7 @@
<description>Launchpad Integration Tests for Apache Sling with Oak Tar on Karaf</description>
<properties>
- <org.apache.karaf.version>4.0.5</org.apache.karaf.version>
+ <org.apache.karaf.version>4.1.0-SNAPSHOT</org.apache.karaf.version>
<org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version>
<repoinit.filename>${project.basedir}/src/test/resources/repoinit.txt</repoinit.filename>
</properties>