Author: rotty3000 Date: Mon Jan 14 00:58:37 2019 New Revision: 1851218 URL: http://svn.apache.org/viewvc?rev=1851218&view=rev Log: [logback] massive simplifications to tests
Signed-off-by: Raymond Auge <[email protected]> Added: felix/trunk/logback/itests/immediate-jul-felix/ felix/trunk/logback/itests/immediate-jul-felix/itest.bndrun - copied, changed from r1851217, felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun felix/trunk/logback/itests/immediate-jul-felix/logback.xml - copied, changed from r1851217, felix/trunk/logback/itests/immediate-log4j1/logback.xml felix/trunk/logback/itests/immediate-jul-felix/pom.xml - copied, changed from r1851217, felix/trunk/logback/itests/standard-felix-logservice/pom.xml felix/trunk/logback/itests/immediate-jul-felix/src/ felix/trunk/logback/itests/immediate-jul-felix/src/main/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/test/ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/test/JULTest.java - copied, changed from r1851217, felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java felix/trunk/logback/itests/itest-parent/ felix/trunk/logback/itests/itest-parent/pom.xml - copied, changed from r1851217, felix/trunk/logback/itests/pom.xml felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/ls/ felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/ls/LogServiceHelper.java - copied, changed from r1851217, felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java Removed: felix/trunk/logback/itests/immediate-equinox-logservice/bnd.bnd felix/trunk/logback/itests/immediate-felix-logservice/bnd.bnd felix/trunk/logback/itests/immediate-jbl/bnd.bnd felix/trunk/logback/itests/immediate-jcl/bnd.bnd felix/trunk/logback/itests/immediate-jul/bnd.bnd felix/trunk/logback/itests/immediate-jul/jul-logging.properties felix/trunk/logback/itests/immediate-log4j1/bnd.bnd felix/trunk/logback/itests/immediate-log4j2/bnd.bnd felix/trunk/logback/itests/immediate-log4j2/jul-logging.properties felix/trunk/logback/itests/immediate-slf4j/bnd.bnd felix/trunk/logback/itests/standard-equinox-logservice/bnd.bnd felix/trunk/logback/itests/standard-felix-logservice/bnd.bnd felix/trunk/logback/itests/standard-jbl/bnd.bnd felix/trunk/logback/itests/standard-jcl/bnd.bnd felix/trunk/logback/itests/standard-jul/bnd.bnd felix/trunk/logback/itests/standard-log4j1/bnd.bnd felix/trunk/logback/itests/standard-log4j2/bnd.bnd felix/trunk/logback/itests/standard-slf4j/bnd.bnd Modified: felix/trunk/logback/itests/immediate-equinox-logservice/itest.bndrun felix/trunk/logback/itests/immediate-equinox-logservice/logback.xml felix/trunk/logback/itests/immediate-equinox-logservice/pom.xml felix/trunk/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun felix/trunk/logback/itests/immediate-felix-logservice/logback.xml felix/trunk/logback/itests/immediate-felix-logservice/pom.xml felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java felix/trunk/logback/itests/immediate-jbl/itest.bndrun felix/trunk/logback/itests/immediate-jbl/logback.xml felix/trunk/logback/itests/immediate-jbl/pom.xml felix/trunk/logback/itests/immediate-jcl/itest.bndrun felix/trunk/logback/itests/immediate-jcl/logback.xml felix/trunk/logback/itests/immediate-jcl/pom.xml felix/trunk/logback/itests/immediate-jul/itest.bndrun felix/trunk/logback/itests/immediate-jul/logback.xml felix/trunk/logback/itests/immediate-jul/pom.xml felix/trunk/logback/itests/immediate-log4j1/itest.bndrun felix/trunk/logback/itests/immediate-log4j1/logback.xml felix/trunk/logback/itests/immediate-log4j1/pom.xml felix/trunk/logback/itests/immediate-log4j2/itest.bndrun felix/trunk/logback/itests/immediate-log4j2/logback.xml felix/trunk/logback/itests/immediate-log4j2/pom.xml felix/trunk/logback/itests/immediate-slf4j/itest.bndrun felix/trunk/logback/itests/immediate-slf4j/logback.xml felix/trunk/logback/itests/immediate-slf4j/pom.xml felix/trunk/logback/itests/pom.xml felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun felix/trunk/logback/itests/standard-equinox-logservice/logback.xml felix/trunk/logback/itests/standard-equinox-logservice/pom.xml felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun felix/trunk/logback/itests/standard-felix-logservice/logback.xml felix/trunk/logback/itests/standard-felix-logservice/pom.xml felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java felix/trunk/logback/itests/standard-jbl/itest.bndrun felix/trunk/logback/itests/standard-jbl/logback.xml felix/trunk/logback/itests/standard-jbl/pom.xml felix/trunk/logback/itests/standard-jcl/itest.bndrun felix/trunk/logback/itests/standard-jcl/logback.xml felix/trunk/logback/itests/standard-jcl/pom.xml felix/trunk/logback/itests/standard-jul/itest.bndrun felix/trunk/logback/itests/standard-jul/logback.xml felix/trunk/logback/itests/standard-jul/pom.xml felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java felix/trunk/logback/itests/standard-log4j1/itest.bndrun felix/trunk/logback/itests/standard-log4j1/logback.xml felix/trunk/logback/itests/standard-log4j1/pom.xml felix/trunk/logback/itests/standard-log4j2/itest.bndrun felix/trunk/logback/itests/standard-log4j2/logback.xml felix/trunk/logback/itests/standard-log4j2/pom.xml felix/trunk/logback/itests/standard-log4j2/src/main/java/org/apache/felix/logback/test/Activator.java felix/trunk/logback/itests/standard-slf4j/itest.bndrun felix/trunk/logback/itests/standard-slf4j/logback.xml felix/trunk/logback/itests/standard-slf4j/pom.xml felix/trunk/logback/itests/test-helper/pom.xml felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java felix/trunk/logback/logback/pom.xml Modified: felix/trunk/logback/itests/immediate-equinox-logservice/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-equinox-logservice/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-equinox-logservice/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-equinox-logservice/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -8,15 +8,14 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.equinox.logservice)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest,\ org.apache.felix.logback;version=latest -runproperties: \ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.equinox.logservice;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + org.apache.felix.logback.itests.immediate.equinox.logservice;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-equinox-logservice/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-equinox-logservice/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-equinox-logservice/logback.xml (original) +++ felix/trunk/logback/itests/immediate-equinox-logservice/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>[%.15thread] %-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Service.org.apache.felix.logback.itests" level="DEBUG"/> <logger name="LogService.org.apache.felix.logback.itests" level="DEBUG"/> Modified: felix/trunk/logback/itests/immediate-equinox-logservice/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-equinox-logservice/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-equinox-logservice/pom.xml (original) +++ felix/trunk/logback/itests/immediate-equinox-logservice/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,9 +19,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,23 +29,16 @@ <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.equinox.logservice</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> <plugins> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> + <artifactId>bnd-maven-plugin</artifactId> + <configuration> + <bnd><![CDATA[ + -conditionalpackage: org.apache.felix.logback.test.helper.* + ]]></bnd> + </configuration> </plugin> </plugins> </build> Modified: felix/trunk/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (original) +++ felix/trunk/logback/itests/immediate-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Mon Jan 14 00:58:37 2019 @@ -19,6 +19,7 @@ package org.apache.felix.logback.test; import org.apache.felix.logback.test.helper.LogTestHelper; +import org.apache.felix.logback.test.helper.ls.LogServiceHelper; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -31,7 +32,7 @@ public class LogServiceTest extends LogT @Test public void test() { long time = System.nanoTime(); - Logger logger = getLogger(getClass()); + Logger logger = LogServiceHelper.getLogger(getClass()); if (logger.isInfoEnabled()) { logger.info(time + ""); } Modified: felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -9,9 +9,9 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.felix.logservice)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest,\ org.apache.felix.log;version=latest,\ org.apache.felix.logback;version=latest @@ -19,7 +19,6 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ + biz.aQute.junit;version='[4.1.0,4.1.1)',\ org.apache.felix.log.extension;version='[1.0.0,1.0.1)',\ - org.apache.felix.logback.itests.immediate.felix.logservice;version='[1.0.0,1.0.1)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)' + org.apache.felix.logback.itests.immediate.felix.logservice;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-felix-logservice/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-felix-logservice/logback.xml (original) +++ felix/trunk/logback/itests/immediate-felix-logservice/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-felix-logservice/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-felix-logservice/pom.xml (original) +++ felix/trunk/logback/itests/immediate-felix-logservice/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,9 +19,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,20 +32,14 @@ <dependencies> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log.extension</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <scope>runtime</scope> </dependency> </dependencies> @@ -54,11 +48,12 @@ <plugins> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> + <artifactId>bnd-maven-plugin</artifactId> + <configuration> + <bnd><![CDATA[ + -conditionalpackage: org.apache.felix.logback.test.helper.* + ]]></bnd> + </configuration> </plugin> </plugins> </build> Modified: felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (original) +++ felix/trunk/logback/itests/immediate-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Mon Jan 14 00:58:37 2019 @@ -19,6 +19,7 @@ package org.apache.felix.logback.test; import org.apache.felix.logback.test.helper.LogTestHelper; +import org.apache.felix.logback.test.helper.ls.LogServiceHelper; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -31,7 +32,7 @@ public class LogServiceTest extends LogT @Test public void test() { long time = System.nanoTime(); - Logger logger = getLogger(getClass()); + Logger logger = LogServiceHelper.getLogger(getClass()); if (logger.isInfoEnabled()) { logger.info(time + ""); } Modified: felix/trunk/logback/itests/immediate-jbl/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jbl/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jbl/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-jbl/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -8,9 +8,9 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.jbl)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)' + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest -runsystempackages: \ org.slf4j;version=1.7.25,\ @@ -22,11 +22,6 @@ org.jboss.logging.provider=slf4j -runbundles: \ - org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.jbl;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' \ No newline at end of file + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + org.apache.felix.logback.itests.immediate.jbl;version='[1.0.0,1.0.1)',\ + org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)' Modified: felix/trunk/logback/itests/immediate-jbl/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jbl/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jbl/logback.xml (original) +++ felix/trunk/logback/itests/immediate-jbl/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-jbl/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jbl/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jbl/pom.xml (original) +++ felix/trunk/logback/itests/immediate-jbl/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.jbl</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/immediate-jcl/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jcl/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jcl/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-jcl/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -9,9 +9,9 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.jcl)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)' + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest -runsystempackages: \ org.slf4j;version=1.7.25,\ @@ -22,12 +22,7 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - log4j.over.slf4j;version='[1.7.25,1.7.26)',\ - org.apache.commons.logging;version='[1.2.0,1.2.1)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.jcl;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + log4j.over.slf4j;version='[1.7.25,1.7.26)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.logback.itests.immediate.jcl;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-jcl/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jcl/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jcl/logback.xml (original) +++ felix/trunk/logback/itests/immediate-jcl/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-jcl/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jcl/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jcl/pom.xml (original) +++ felix/trunk/logback/itests/immediate-jcl/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.jcl</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Copied: felix/trunk/logback/itests/immediate-jul-felix/itest.bndrun (from r1851217, felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun) URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul-felix/itest.bndrun?p2=felix/trunk/logback/itests/immediate-jul-felix/itest.bndrun&p1=felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun&r1=1851217&r2=1851218&rev=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-felix-logservice/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-jul-felix/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -6,12 +6,12 @@ -runrequires:\ osgi.identity;filter:='(osgi.identity=org.apache.felix.log.extension)',\ - osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.felix.logservice)' + osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.jul.felix)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest,\ org.apache.felix.log;version=latest,\ org.apache.felix.logback;version=latest @@ -19,7 +19,6 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ + biz.aQute.junit;version='[4.1.0,4.1.1)',\ org.apache.felix.log.extension;version='[1.0.0,1.0.1)',\ - org.apache.felix.logback.itests.immediate.felix.logservice;version='[1.0.0,1.0.1)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)' + org.apache.felix.logback.itests.immediate.jul.felix;version='[1.0.0,1.0.1)' Copied: felix/trunk/logback/itests/immediate-jul-felix/logback.xml (from r1851217, felix/trunk/logback/itests/immediate-log4j1/logback.xml) URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul-felix/logback.xml?p2=felix/trunk/logback/itests/immediate-jul-felix/logback.xml&p1=felix/trunk/logback/itests/immediate-log4j1/logback.xml&r1=1851217&r2=1851218&rev=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j1/logback.xml (original) +++ felix/trunk/logback/itests/immediate-jul-felix/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Copied: felix/trunk/logback/itests/immediate-jul-felix/pom.xml (from r1851217, felix/trunk/logback/itests/standard-felix-logservice/pom.xml) URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul-felix/pom.xml?p2=felix/trunk/logback/itests/immediate-jul-felix/pom.xml&p1=felix/trunk/logback/itests/standard-felix-logservice/pom.xml&r1=1851217&r2=1851218&rev=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-felix-logservice/pom.xml (original) +++ felix/trunk/logback/itests/immediate-jul-felix/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,41 +19,28 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> - <artifactId>org.apache.felix.logback.itests.standard.felix.logservice</artifactId> + <artifactId>org.apache.felix.logback.itests.immediate.jul.felix</artifactId> <dependencies> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> + <artifactId>org.apache.felix.log</artifactId> + <version>1.2.0</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>1.1.0-SNAPSHOT</version> + <artifactId>org.apache.felix.log.extension</artifactId> + <version>1.0.0</version> <scope>runtime</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Copied: felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/test/JULTest.java (from r1851217, felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/test/JULTest.java?p2=felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/test/JULTest.java&p1=felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java&r1=1851217&r2=1851218&rev=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java (original) +++ felix/trunk/logback/itests/immediate-jul-felix/src/main/java/org/apache/felix/logback/test/JULTest.java Mon Jan 14 00:58:37 2019 @@ -22,16 +22,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.felix.logback.test.helper.LogTestHelper; +import org.junit.Ignore; import org.junit.Test; public class JULTest extends LogTestHelper { @Test public void test() { - - // In standard deployment mode you need to install jul-to-slf4j bridge - org.slf4j.bridge.SLF4JBridgeHandler.install(); - long time = System.nanoTime(); Logger logger = Logger.getLogger(getClass().getName()); if (logger.isLoggable(Level.INFO)) { Modified: felix/trunk/logback/itests/immediate-jul/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jul/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-jul/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,17 +1,17 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active --runfw: org.apache.felix.framework +-runfw: org.eclipse.osgi -runrequires:\ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.jul)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ - jul.to.slf4j;version='[1.7.25,1.7.26)' + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest,\ + org.apache.felix.logback;version=latest -runsystempackages: \ org.slf4j;version=1.7.25,\ @@ -19,14 +19,8 @@ org.slf4j.spi;version=1.7.25 -runproperties: \ - java.util.logging.config.file=${.}/jul-logging.properties,\ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.jul;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + org.apache.felix.logback.itests.immediate.jul;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-jul/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jul/logback.xml (original) +++ felix/trunk/logback/itests/immediate-jul/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-jul/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-jul/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-jul/pom.xml (original) +++ felix/trunk/logback/itests/immediate-jul/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,34 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.jul</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/immediate-log4j1/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j1/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j1/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-log4j1/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -8,9 +8,9 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.log4j1)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)' + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest -runsystempackages: \ org.slf4j;version=1.7.25,\ @@ -21,11 +21,6 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - log4j.over.slf4j;version='[1.7.25,1.7.26)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.log4j1;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + log4j.over.slf4j;version='[1.7.25,1.7.26)',\ + org.apache.felix.logback.itests.immediate.log4j1;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-log4j1/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j1/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j1/logback.xml (original) +++ felix/trunk/logback/itests/immediate-log4j1/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-log4j1/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j1/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j1/pom.xml (original) +++ felix/trunk/logback/itests/immediate-log4j1/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.log4j1</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/immediate-log4j2/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j2/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-log4j2/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -8,11 +8,11 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.log4j2)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - org.apache.logging.log4j.api;version='[2.11.0,2.11.1)',\ - org.apache.logging.log4j.to-slf4j;version='[2.11.0,2.11.1)',\ - slf4j.api;version='[1.7.25,1.7.26)' + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + org.apache.logging.log4j.api;version=latest,\ + org.apache.logging.log4j.to-slf4j;version=latest,\ + slf4j.api;version=latest -runsystempackages: \ org.apache.logging.log4j;version=2.11.0,\ @@ -21,14 +21,8 @@ org.slf4j.spi;version=1.7.25 -runproperties: \ - logback.configurationFile=file:${.}/logback.xml,\ - org.jboss.logging.provider=slf4j + logback.configurationFile=file:${.}/logback.xml -runbundles: \ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.log4j2;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + org.apache.felix.logback.itests.immediate.log4j2;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-log4j2/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j2/logback.xml (original) +++ felix/trunk/logback/itests/immediate-log4j2/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-log4j2/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-log4j2/pom.xml (original) +++ felix/trunk/logback/itests/immediate-log4j2/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.log4j2</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/immediate-slf4j/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-slf4j/itest.bndrun (original) +++ felix/trunk/logback/itests/immediate-slf4j/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -8,9 +8,9 @@ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.slf4j)' -runpath: \ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - slf4j.api;version='[1.7.25,1.7.26)' + ch.qos.logback.classic;version=latest,\ + ch.qos.logback.core;version=latest,\ + slf4j.api;version=latest -runsystempackages: \ org.slf4j;version=1.7.25,\ @@ -21,10 +21,5 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.immediate.slf4j;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + org.apache.felix.logback.itests.immediate.slf4j;version='[1.0.0,1.0.1)' Modified: felix/trunk/logback/itests/immediate-slf4j/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-slf4j/logback.xml (original) +++ felix/trunk/logback/itests/immediate-slf4j/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/immediate-slf4j/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/immediate-slf4j/pom.xml (original) +++ felix/trunk/logback/itests/immediate-slf4j/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.immediate.slf4j</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Copied: felix/trunk/logback/itests/itest-parent/pom.xml (from r1851217, felix/trunk/logback/itests/pom.xml) URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/itest-parent/pom.xml?p2=felix/trunk/logback/itests/itest-parent/pom.xml&p1=felix/trunk/logback/itests/pom.xml&r1=1851217&r2=1851218&rev=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/pom.xml (original) +++ felix/trunk/logback/itests/itest-parent/pom.xml Mon Jan 14 00:58:37 2019 @@ -23,51 +23,46 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.logback.reactor</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> - <name>Apache Felix Logback ITests Reactor</name> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <name>Apache Felix Logback ITests Parent POM</name> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/logback/itests</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/logback/itests</developerConnection> - <url>http://svn.apache.org/viewvc/felix/trunk/logback/itests/</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/logback/itests/itest-parent</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/logback/itests/itest-parent</developerConnection> + <url>https://svn.apache.org/repos/asf/felix/trunk/logback/itests/itest-parent</url> </scm> <properties> <animal.sniffer.skip>true</animal.sniffer.skip> <maven.deploy.skip>true</maven.deploy.skip> - <maven.install.skip>true</maven.install.skip> <maven.javadoc.skip>true</maven.javadoc.skip> <maven.site.skip>true</maven.site.skip> <maven.source.skip>true</maven.source.skip> </properties> - <modules> - <module>test-helper</module> - <module>immediate-equinox-logservice</module> - <module>immediate-felix-logservice</module> - <module>immediate-jbl</module> - <module>immediate-jcl</module> - <module>immediate-jul</module> - <module>immediate-log4j1</module> - <module>immediate-log4j2</module> - <module>immediate-slf4j</module> - <module>standard-equinox-logservice</module> - <module>standard-felix-logservice</module> - <module>standard-jbl</module> - <module>standard-jcl</module> - <module>standard-jul</module> - <module>standard-log4j1</module> - <module>standard-log4j2</module> - <module>standard-slf4j</module> - </modules> - <dependencies> <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.junit</artifactId> + <version>${bnd.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + <version>7.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> <version>6.0.0</version> @@ -96,19 +91,20 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>5.6.10</version> + <version>6.0.1</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.logback</artifactId> - <version>1.0.0</version> + <version>1.0.1-SNAPSHOT</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.2.3</version> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.logback.itests.helper</artifactId> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.platform</groupId> @@ -117,21 +113,6 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.enroute.junit.wrapper</artifactId> - <version>4.12.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.enroute.hamcrest.wrapper</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>1.7.25</version> - </dependency> - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>3.3.2.Final</version> @@ -149,12 +130,12 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <version>2.11.0</version> + <version>2.11.1</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-to-slf4j</artifactId> - <version>2.11.0</version> + <version>2.11.1</version> </dependency> </dependencies> @@ -169,29 +150,22 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> <configuration> - <includes> - <include>META-INF/*</include> - <include>OSGI-OPT/*</include> - <include>org/apache/felix/logback/test/*</include> - <include>org/apache/felix/logback/test/helper/*</include> - <include>*.jar</include> - </includes> + <bnd><![CDATA[ + Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test} + -conditionalpackage: org.apache.felix.logback.test.helper + ]]></bnd> </configuration> </plugin> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> + <artifactId>bnd-resolver-maven-plugin</artifactId> </plugin> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-indexer-maven-plugin</artifactId> - <configuration> - <includeJar>true</includeJar> - <localURLs>REQUIRED</localURLs> - </configuration> + <artifactId>bnd-testing-maven-plugin</artifactId> </plugin> </plugins> <pluginManagement> Modified: felix/trunk/logback/itests/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/pom.xml (original) +++ felix/trunk/logback/itests/pom.xml Mon Jan 14 00:58:37 2019 @@ -37,15 +37,6 @@ <url>http://svn.apache.org/viewvc/felix/trunk/logback/itests/</url> </scm> - <properties> - <animal.sniffer.skip>true</animal.sniffer.skip> - <maven.deploy.skip>true</maven.deploy.skip> - <maven.install.skip>true</maven.install.skip> - <maven.javadoc.skip>true</maven.javadoc.skip> - <maven.site.skip>true</maven.site.skip> - <maven.source.skip>true</maven.source.skip> - </properties> - <modules> <module>test-helper</module> <module>immediate-equinox-logservice</module> @@ -53,6 +44,7 @@ <module>immediate-jbl</module> <module>immediate-jcl</module> <module>immediate-jul</module> + <module>immediate-jul-felix</module> <module>immediate-log4j1</module> <module>immediate-log4j2</module> <module>immediate-slf4j</module> @@ -65,159 +57,4 @@ <module>standard-log4j2</module> <module>standard-slf4j</module> </modules> - - <dependencies> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <version>6.0.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.service.log</artifactId> - <version>1.4.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.util.function</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.util.promise</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.util.pushstream</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.framework</artifactId> - <version>5.6.10</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback</artifactId> - <version>1.0.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.2.3</version> - </dependency> - <dependency> - <groupId>org.eclipse.platform</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>3.13.0</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.enroute.junit.wrapper</artifactId> - <version>4.12.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.enroute.hamcrest.wrapper</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>1.7.25</version> - </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - <version>3.3.2.Final</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>1.7.25</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>2.11.0</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>2.11.0</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <includes> - <include>META-INF/*</include> - <include>OSGI-OPT/*</include> - <include>org/apache/felix/logback/test/*</include> - <include>org/apache/felix/logback/test/helper/*</include> - <include>*.jar</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-indexer-maven-plugin</artifactId> - <configuration> - <includeJar>true</includeJar> - <localURLs>REQUIRED</localURLs> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - <configuration> - <failOnChanges>false</failOnChanges> - <bndruns> - <bndrun>itest.bndrun</bndrun> - </bndruns> - </configuration> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - <configuration> - <failOnChanges>false</failOnChanges> - <resolve>false</resolve> - <bndruns> - <bndrun>itest.bndrun</bndrun> - </bndruns> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> </project> Modified: felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -14,10 +14,9 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - org.apache.felix.logback;version='[1.0.0,1.0.1)',\ - slf4j.api;version='[1.7.25,1.7.26)',\ + biz.aQute.junit;version='[4.1.0,4.1.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.equinox.logservice;version='[1.0.0,1.0.1)' + org.apache.felix.logback.itests.standard.equinox.logservice;version='[1.0.0,1.0.1)',\ + org.apache.felix.logback;version='[1.0.1,1.0.2)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-equinox-logservice/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-equinox-logservice/logback.xml (original) +++ felix/trunk/logback/itests/standard-equinox-logservice/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Service.org.apache.felix.logback.itests" level="DEBUG"/> <logger name="LogService.org.apache.felix.logback.itests" level="DEBUG"/> Modified: felix/trunk/logback/itests/standard-equinox-logservice/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-equinox-logservice/pom.xml (original) +++ felix/trunk/logback/itests/standard-equinox-logservice/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,9 +19,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -29,24 +29,16 @@ <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.standard.equinox.logservice</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> <plugins> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> + <artifactId>bnd-maven-plugin</artifactId> + <configuration> + <bnd><![CDATA[ + -conditionalpackage: org.apache.felix.logback.test.helper.* + ]]></bnd> + </configuration> </plugin> </plugins> </build> Modified: felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (original) +++ felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Mon Jan 14 00:58:37 2019 @@ -19,6 +19,7 @@ package org.apache.felix.logback.test; import org.apache.felix.logback.test.helper.LogTestHelper; +import org.apache.felix.logback.test.helper.ls.LogServiceHelper; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -31,7 +32,7 @@ public class LogServiceTest extends LogT @Test public void test() { long time = System.nanoTime(); - Logger logger = getLogger(getClass()); + Logger logger = LogServiceHelper.getLogger(getClass()); if (logger.isInfoEnabled()) { logger.info(time + ""); } Modified: felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,6 +1,6 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 --resolve.effective: resolve, active +-resolve.effective: resolve -runfw: org.apache.felix.framework @@ -16,11 +16,10 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ + biz.aQute.junit;version='[4.1.0,4.1.1)',\ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - org.apache.felix.log;version='[1.1.0,1.1.1)',\ - org.apache.felix.logback;version='[1.0.0,1.0.1)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)' + org.apache.felix.log;version='[1.2.0,1.2.1)',\ + org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)',\ + org.apache.felix.logback;version='[1.0.1,1.0.2)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-felix-logservice/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-felix-logservice/logback.xml (original) +++ felix/trunk/logback/itests/standard-felix-logservice/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/standard-felix-logservice/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-felix-logservice/pom.xml (original) +++ felix/trunk/logback/itests/standard-felix-logservice/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,9 +19,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,14 +32,8 @@ <dependencies> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.2.0</version> <scope>runtime</scope> </dependency> </dependencies> @@ -48,11 +42,12 @@ <plugins> <plugin> <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> + <artifactId>bnd-maven-plugin</artifactId> + <configuration> + <bnd><![CDATA[ + -conditionalpackage: org.apache.felix.logback.test.helper.* + ]]></bnd> + </configuration> </plugin> </plugins> </build> Modified: felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (original) +++ felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Mon Jan 14 00:58:37 2019 @@ -19,6 +19,7 @@ package org.apache.felix.logback.test; import org.apache.felix.logback.test.helper.LogTestHelper; +import org.apache.felix.logback.test.helper.ls.LogServiceHelper; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -31,7 +32,7 @@ public class LogServiceTest extends LogT @Test public void test() { long time = System.nanoTime(); - Logger logger = getLogger(getClass()); + Logger logger = LogServiceHelper.getLogger(getClass()); if (logger.isInfoEnabled()) { logger.info(time + ""); } Modified: felix/trunk/logback/itests/standard-jbl/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jbl/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-jbl/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -13,14 +13,9 @@ org.jboss.logging.provider=slf4j -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.jbl;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + org.apache.felix.logback.itests.standard.jbl;version='[1.0.0,1.0.1)',\ + org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-jbl/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jbl/logback.xml (original) +++ felix/trunk/logback/itests/standard-jbl/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/standard-jbl/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jbl/pom.xml (original) +++ felix/trunk/logback/itests/standard-jbl/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.standard.jbl</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/standard-jcl/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jcl/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-jcl/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -13,15 +13,10 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - log4j.over.slf4j;version='[1.7.25,1.7.26)',\ - org.apache.commons.logging;version='[1.2.0,1.2.1)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.jcl;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + log4j.over.slf4j;version='[1.7.25,1.7.26)',\ + org.apache.commons.logging;version='[1.2.0,1.2.1)',\ + org.apache.felix.logback.itests.standard.jcl;version='[1.0.0,1.0.1)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-jcl/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jcl/logback.xml (original) +++ felix/trunk/logback/itests/standard-jcl/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/>
