You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2022/06/12 14:51:17 UTC
svn commit: r1901850 - in /jackrabbit/branches/2.20: ./ jackrabbit-it-osgi/pom.xml jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java jackrabbit-it-osgi/src/test/resources/logback-test.xml
Author: reschke
Date: Sun Jun 12 14:51:17 2022
New Revision: 1901850
URL: http://svn.apache.org/viewvc?rev=1901850&view=rev
Log:
JCR-4774: fix jackrabbit-it-osgi logging config (merged r1899195 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-it-osgi/pom.xml
jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/resources/logback-test.xml
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1899195
Modified: jackrabbit/branches/2.20/jackrabbit-it-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-it-osgi/pom.xml?rev=1901850&r1=1901849&r2=1901850&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-it-osgi/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-it-osgi/pom.xml Sun Jun 12 14:51:17 2022
@@ -55,16 +55,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <org.ops4j.pax.logging.DefaultServiceLog.level>
- WARN
- </org.ops4j.pax.logging.DefaultServiceLog.level>
- </systemPropertyVariables>
- </configuration>
- </plugin>
</plugins>
<testResources>
<testResource>
Modified: jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1901850&r1=1901849&r2=1901850&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java Sun Jun 12 14:51:17 2022
@@ -22,6 +22,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperties;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
import java.io.File;
@@ -42,6 +43,7 @@ import org.ops4j.pax.exam.options.Defaul
import org.ops4j.pax.exam.options.SystemPropertyOption;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.util.PathUtils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
@@ -56,14 +58,21 @@ public class OSGiIT {
public Option[] configuration() throws IOException, URISyntaxException {
return CoreOptions.options(
junitBundles(),
+ mavenBundle("org.osgi", "org.osgi.service.log", "1.3.0"),
mavenBundle("org.apache.felix", "org.apache.felix.scr", "2.0.12"),
mavenBundle("org.apache.felix", "org.apache.felix.jaas", "1.0.2"),
mavenBundle("org.osgi", "org.osgi.dto", "1.0.0"),
mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.16"),
mavenBundle("org.apache.felix", "org.apache.felix.fileinstall", "3.2.6"),
- mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"),
+ mavenBundle("org.slf4j", "slf4j-api", "1.7.35"),
+ mavenBundle("commons-logging", "commons-logging", "1.2"),
+ mavenBundle("ch.qos.logback", "logback-core", "1.2.10"),
+ mavenBundle("ch.qos.logback", "logback-classic", "1.2.10"),
frameworkProperty("repository.home").value("target"),
- systemProperties(new SystemPropertyOption("felix.fileinstall.dir").value(getConfigDir())),
+ systemProperties(
+ systemProperty("logback.configurationFile")
+ .value("file:" + PathUtils.getBaseDir() + "/src/test/resources/logback-test.xml"),
+ new SystemPropertyOption("felix.fileinstall.dir").value(getConfigDir())),
jarBundles(),
jpmsOptions());
}
Modified: jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/resources/logback-test.xml?rev=1901850&r1=1901849&r2=1901850&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/resources/logback-test.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-it-osgi/src/test/resources/logback-test.xml Sun Jun 12 14:51:17 2022
@@ -29,7 +29,7 @@
</encoder>
</appender>
-<root level="INFO">
+<root level="DEBUG">
<!--
<appender-ref ref="console"/>
-->