Skip to content

Commit b6b2db9

Browse files
committed
set loglevel to scr project and pax
Signed-off-by: Stefan Bischof <[email protected]>
1 parent 54fd91e commit b6b2db9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

scr/pom.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@
6969

7070
<java.version>8</java.version>
7171
<felix.java.version>${java.version}</felix.java.version>
72-
<maven.compiler.release>${java.version}</maven.compiler.release>
73-
<maven.compiler.source>${java.version}</maven.compiler.source>
74-
<maven.compiler.target>${java.version}</maven.compiler.target>
7572
</properties>
7673

7774

@@ -290,6 +287,11 @@
290287
<exclude>**/instances/**</exclude>
291288
<exclude>**/instances2/**</exclude>
292289
</excludes>
290+
<systemPropertyVariables>
291+
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
292+
<org.slf4j.simpleLogger.defaultLogLevel>info</org.slf4j.simpleLogger.defaultLogLevel>
293+
<org.slf4j.simpleLogger.log.org.ops4j>info</org.slf4j.simpleLogger.log.org.ops4j>
294+
</systemPropertyVariables>
293295
</configuration>
294296
</plugin>
295297
<!-- integration tests run with pax-exam -->
@@ -307,6 +309,9 @@
307309
<systemPropertyVariables>
308310
<project.bundle.file>${bundle.file.name}</project.bundle.file>
309311
<felix.ca.version>${felix.ca.version}</felix.ca.version>
312+
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
313+
<org.slf4j.simpleLogger.defaultLogLevel>info</org.slf4j.simpleLogger.defaultLogLevel>
314+
<org.slf4j.simpleLogger.log.org.ops4j>info</org.slf4j.simpleLogger.log.org.ops4j>
310315
</systemPropertyVariables>
311316
<excludes>
312317
<exclude>**/components/**</exclude>

scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,9 @@ public static Option[] configuration()
195195
junitBundles(), frameworkProperty( "org.osgi.framework.bsnversion" ).value( bsnVersionUniqueness ),
196196
systemProperty( "ds.factory.enabled" ).value( Boolean.toString( NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR ) ),
197197
systemProperty( "ds.loglevel" ).value( DS_LOGLEVEL ),
198+
systemProperty("org.ops4j.pax.logging.log.shaded.org.apache.http.wire").value("OFF"),
199+
systemProperty("org.ops4j.pax.logging.log.org.apache.http.wire").value("OFF"),
198200
systemProperty( "ds.cache.metadata" ).value( Boolean.toString(CACHE_META_DATA) )
199-
200201
);
201202
final Option vmOption = ( paxRunnerVmOption != null )? CoreOptions.vmOption( paxRunnerVmOption ): null;
202203
NONSTANDARD_COMPONENT_FACTORY_BEHAVIOR = false;

0 commit comments

Comments
 (0)