diff --git a/scr/pom.xml b/scr/pom.xml index 1883d19073..361f8811e3 100644 --- a/scr/pom.xml +++ b/scr/pom.xml @@ -69,9 +69,6 @@ 8 ${java.version} - ${java.version} - ${java.version} - ${java.version} @@ -290,6 +287,11 @@ **/instances/** **/instances2/** + + true + info + info + @@ -307,6 +309,9 @@ ${bundle.file.name} ${felix.ca.version} + true + info + info **/components/** diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java index 39724c1b0f..8b88eac680 100644 --- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java +++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java @@ -195,8 +195,13 @@ public static Option[] configuration() junitBundles(), frameworkProperty( "org.osgi.framework.bsnversion" ).value( bsnVersionUniqueness ), systemProperty( "ds.factory.enabled" ).value( Boolean.toString( NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR ) ), systemProperty( "ds.loglevel" ).value( DS_LOGLEVEL ), + systemProperty("org.slf4j.simpleLogger.defaultLogLevel").value("INFO"), + systemProperty("org.slf4j.simpleLogger.log.org.ops4j").value("INFO"), + systemProperty("org.slf4j.simpleLogger.log.shaded.org.apache.http.wire").value("WARN"), + systemProperty("org.slf4j.simpleLogger.log.org.apache.http.wire").value("WARN"), + systemProperty("org.ops4j.pax.logging.log.shaded.org.apache.http.wire").value("OFF"), + systemProperty("org.ops4j.pax.logging.log.org.apache.http.wire").value("OFF"), systemProperty( "ds.cache.metadata" ).value( Boolean.toString(CACHE_META_DATA) ) - ); final Option vmOption = ( paxRunnerVmOption != null )? CoreOptions.vmOption( paxRunnerVmOption ): null; NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR = false;