svn commit: r1778504 - /sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

[olli]

Author: olli
Date: Fri Jan 13 07:57:09 2017
New Revision: 1778504

URL: http://svn.apache.org/viewvc?rev=1778504&view=rev
Log:
SLING-6411 Upgrade Karaf to 4.1

adjust log configuration

Modified:
    
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java?rev=1778504&r1=1778503&r2=1778504&view=diff
==============================================================================
--- 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
 (original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java
 Fri Jan 13 07:57:09 2017
@@ -52,7 +52,6 @@ public class SlingLaunchpadOakTarConfigu
         final int httpPort = Integer.getInteger("http.port");
         return OptionUtils.combine(baseConfiguration(),
             cleanCaches(true),
-            editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", 
"log4j.rootLogger", "ERROR, out, sift, osgi:*"),
             // configurations for tests
             editConfigurationFilePut("etc/custom.properties", 
"sling.run.modes", "oak_tar"),
             editConfigurationFilePut("etc/users.properties", "admin", 
"admin,_g_:admingroup"), // Sling’s default admin credentials used in tests