SLING-6411 Upgrade Karaf to 4.1
authorOliver Lietz <olli@apache.org>
Sun, 18 Dec 2016 12:03:10 +0000 (12:03 +0000)
committerOliver Lietz <olli@apache.org>
Sun, 18 Dec 2016 12:03:10 +0000 (12:03 +0000)
use Karaf 4.1.0-SNAPSHOT

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1774882 13f79535-47bb-0310-9956-ffa450edef68

pom.xml
src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java

diff --git a/pom.xml b/pom.xml
index 8b3e2dd..b15b3a2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 
             </executions>
             <configuration>
               <excludes>
+                <exclude>**/SlingLaunchpadOak*IT.*</exclude>
                 <!-- SLING-5122, SLING-5123 -->
                 <exclude>**/SlingAuthXing*.*</exclude>
               </excludes>
index 4bb8fce..eec8a67 100644 (file)
@@ -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)),