Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions scr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@

<java.version>8</java.version>
<felix.java.version>${java.version}</felix.java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>


Expand Down Expand Up @@ -290,6 +287,11 @@
<exclude>**/instances/**</exclude>
<exclude>**/instances2/**</exclude>
</excludes>
<systemPropertyVariables>
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
<org.slf4j.simpleLogger.defaultLogLevel>info</org.slf4j.simpleLogger.defaultLogLevel>
<org.slf4j.simpleLogger.log.org.ops4j>info</org.slf4j.simpleLogger.log.org.ops4j>
</systemPropertyVariables>
</configuration>
</plugin>
<!-- integration tests run with pax-exam -->
Expand All @@ -307,6 +309,9 @@
<systemPropertyVariables>
<project.bundle.file>${bundle.file.name}</project.bundle.file>
<felix.ca.version>${felix.ca.version}</felix.ca.version>
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
<org.slf4j.simpleLogger.defaultLogLevel>info</org.slf4j.simpleLogger.defaultLogLevel>
<org.slf4j.simpleLogger.log.org.ops4j>info</org.slf4j.simpleLogger.log.org.ops4j>
</systemPropertyVariables>
<excludes>
<exclude>**/components/**</exclude>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading