You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2021/11/29 03:51:11 UTC
[felix-dev] 01/05: [logback] cleanup the build and update to bnd 6.1.0
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit ca68735741665b23291af4d33ff909be55fc2362
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Sat Nov 27 12:02:44 2021 -0500
[logback] cleanup the build and update to bnd 6.1.0
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
logback/itests/base.bndrun | 8 ++
.../immediate-equinox-logservice/itest.bndrun | 11 +-
.../itests/immediate-equinox-logservice/pom.xml | 26 ++--
.../itests/immediate-felix-logservice/itest.bndrun | 11 +-
.../itests/immediate-felix-logservice/logback.xml | 45 -------
logback/itests/immediate-felix-logservice/pom.xml | 32 +----
logback/itests/immediate-jbl/itest.bndrun | 17 +--
logback/itests/immediate-jbl/logback.xml | 45 -------
logback/itests/immediate-jbl/pom.xml | 13 +-
logback/itests/immediate-jcl/itest.bndrun | 19 +--
logback/itests/immediate-jcl/logback.xml | 45 -------
logback/itests/immediate-jcl/pom.xml | 13 +-
logback/itests/immediate-jul-felix/itest.bndrun | 11 +-
logback/itests/immediate-jul-felix/logback.xml | 45 -------
logback/itests/immediate-jul-felix/pom.xml | 16 +--
logback/itests/immediate-jul/itest.bndrun | 17 +--
logback/itests/immediate-jul/logback.xml | 45 -------
logback/itests/immediate-jul/pom.xml | 13 +-
logback/itests/immediate-log4j1/itest.bndrun | 19 +--
logback/itests/immediate-log4j1/logback.xml | 45 -------
logback/itests/immediate-log4j1/pom.xml | 13 +-
logback/itests/immediate-log4j2/itest.bndrun | 19 +--
logback/itests/immediate-log4j2/logback.xml | 45 -------
logback/itests/immediate-log4j2/pom.xml | 13 +-
logback/itests/immediate-slf4j/itest.bndrun | 17 +--
logback/itests/immediate-slf4j/logback.xml | 45 -------
logback/itests/immediate-slf4j/pom.xml | 13 +-
logback/itests/itest-parent/pom.xml | 146 ++++++++++++++++-----
.../{immediate-equinox-logservice => }/logback.xml | 8 +-
.../standard-equinox-logservice/itest.bndrun | 17 +--
.../itests/standard-equinox-logservice/logback.xml | 40 ------
logback/itests/standard-equinox-logservice/pom.xml | 25 ++--
.../itests/standard-felix-logservice/itest.bndrun | 22 ++--
.../itests/standard-felix-logservice/logback.xml | 45 -------
logback/itests/standard-felix-logservice/pom.xml | 26 ++--
logback/itests/standard-jbl/itest.bndrun | 15 +--
logback/itests/standard-jbl/logback.xml | 45 -------
logback/itests/standard-jbl/pom.xml | 13 +-
logback/itests/standard-jcl/itest.bndrun | 17 +--
logback/itests/standard-jcl/logback.xml | 45 -------
logback/itests/standard-jcl/pom.xml | 13 +-
logback/itests/standard-jul/itest.bndrun | 22 ++--
logback/itests/standard-jul/logback.xml | 45 -------
logback/itests/standard-jul/pom.xml | 10 +-
logback/itests/standard-log4j1/itest.bndrun | 17 +--
logback/itests/standard-log4j1/logback.xml | 45 -------
logback/itests/standard-log4j1/pom.xml | 13 +-
logback/itests/standard-log4j2/itest.bndrun | 19 +--
logback/itests/standard-log4j2/logback.xml | 45 -------
logback/itests/standard-log4j2/pom.xml | 13 +-
logback/itests/standard-slf4j/itest.bndrun | 15 +--
logback/itests/standard-slf4j/logback.xml | 45 -------
logback/itests/standard-slf4j/pom.xml | 13 +-
logback/itests/test-helper/pom.xml | 23 +---
.../felix/logback/test/helper/LogTestHelper.java | 4 +-
logback/logback/pom.xml | 33 ++---
logback/pom.xml | 73 -----------
57 files changed, 422 insertions(+), 1151 deletions(-)
diff --git a/logback/itests/base.bndrun b/logback/itests/base.bndrun
new file mode 100644
index 0000000..6cb0682
--- /dev/null
+++ b/logback/itests/base.bndrun
@@ -0,0 +1,8 @@
+-resolve.effective: resolve, active
+
+-runproperties.base: \
+ logback.configurationFile=${fileuri;${.}/logback.xml}
+
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
diff --git a/logback/itests/immediate-equinox-logservice/itest.bndrun b/logback/itests/immediate-equinox-logservice/itest.bndrun
index 213351c..95424cb 100644
--- a/logback/itests/immediate-equinox-logservice/itest.bndrun
+++ b/logback/itests/immediate-equinox-logservice/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.eclipse.osgi
@@ -13,9 +11,6 @@
slf4j.api;version=latest,\
org.apache.felix.logback;version=latest
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- org.apache.felix.logback.itests.immediate.equinox.logservice;version='[1.0.0,1.0.1)'
+ org.apache.felix.logback.itests.immediate.equinox.logservice;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-equinox-logservice/pom.xml b/logback/itests/immediate-equinox-logservice/pom.xml
index 0e6fffd..aa05340 100644
--- a/logback/itests/immediate-equinox-logservice/pom.xml
+++ b/logback/itests/immediate-equinox-logservice/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,21 +26,15 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.immediate.equinox.logservice</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- -conditionalpackage: org.apache.felix.logback.test.helper.*
- ]]></bnd>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.logback.itests.helper</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/logback/itests/immediate-felix-logservice/itest.bndrun b/logback/itests/immediate-felix-logservice/itest.bndrun
index 581eb32..f075432 100644
--- a/logback/itests/immediate-felix-logservice/itest.bndrun
+++ b/logback/itests/immediate-felix-logservice/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -15,10 +13,7 @@
org.apache.felix.log;version=latest,\
org.apache.felix.logback;version=latest
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
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)'
+ org.apache.felix.logback.itests.immediate.felix.logservice;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-felix-logservice/logback.xml b/logback/itests/immediate-felix-logservice/logback.xml
deleted file mode 100644
index 0fc5b28..0000000
--- a/logback/itests/immediate-felix-logservice/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.felix.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.felix.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-felix-logservice/pom.xml b/logback/itests/immediate-felix-logservice/pom.xml
index 96b8bd7..e0efc8c 100644
--- a/logback/itests/immediate-felix-logservice/pom.xml
+++ b/logback/itests/immediate-felix-logservice/pom.xml
@@ -17,43 +17,23 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../itest-parent/pom.xml</relativePath>
+ <relativePath>../itest-parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.immediate.felix.logservice</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <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.extension</artifactId>
- <version>1.0.0</version>
- <scope>runtime</scope>
+ <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-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- -conditionalpackage: org.apache.felix.logback.test.helper.*
- ]]></bnd>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/logback/itests/immediate-jbl/itest.bndrun b/logback/itests/immediate-jbl/itest.bndrun
index 67a9f92..ccda978 100644
--- a/logback/itests/immediate-jbl/itest.bndrun
+++ b/logback/itests/immediate-jbl/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -13,15 +11,14 @@
slf4j.api;version=latest
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25
+ org.slf4j;version=${slf4j.api.version},\
+ org.slf4j.helpers;version=${slf4j.api.version},\
+ org.slf4j.spi;version=${slf4j.api.version}
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml},\
+-runproperties.this: \
org.jboss.logging.provider=slf4j
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
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)'
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ org.jboss.logging.jboss-logging;version='[3.4.2,3.4.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-jbl/logback.xml b/logback/itests/immediate-jbl/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-jbl/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-jbl/pom.xml b/logback/itests/immediate-jbl/pom.xml
index a4fa2d3..60fbf05 100644
--- a/logback/itests/immediate-jbl/pom.xml
+++ b/logback/itests/immediate-jbl/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
</project>
diff --git a/logback/itests/immediate-jcl/itest.bndrun b/logback/itests/immediate-jcl/itest.bndrun
index 268cdc2..a9a6e8c 100644
--- a/logback/itests/immediate-jcl/itest.bndrun
+++ b/logback/itests/immediate-jcl/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -14,15 +12,12 @@
slf4j.api;version=latest
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25
-
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
+ org.slf4j;version=${slf4j.api.version},\
+ org.slf4j.helpers;version=${slf4j.api.version},\
+ org.slf4j.spi;version=${slf4j.api.version}
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- log4j.over.slf4j;version='[1.7.25,1.7.26)',\
+ log4j.over.slf4j;version='[1.7.32,1.7.33)',\
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)'
+ org.apache.felix.logback.itests.immediate.jcl;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-jcl/logback.xml b/logback/itests/immediate-jcl/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-jcl/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-jcl/pom.xml b/logback/itests/immediate-jcl/pom.xml
index 86bb036..e3cf061 100644
--- a/logback/itests/immediate-jcl/pom.xml
+++ b/logback/itests/immediate-jcl/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
</project>
diff --git a/logback/itests/immediate-jul-felix/itest.bndrun b/logback/itests/immediate-jul-felix/itest.bndrun
index 1a70be1..9641288 100644
--- a/logback/itests/immediate-jul-felix/itest.bndrun
+++ b/logback/itests/immediate-jul-felix/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -15,10 +13,7 @@
org.apache.felix.log;version=latest,\
org.apache.felix.logback;version=latest
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
org.apache.felix.log.extension;version='[1.0.0,1.0.1)',\
- org.apache.felix.logback.itests.immediate.jul.felix;version='[1.0.0,1.0.1)'
+ org.apache.felix.logback.itests.immediate.jul.felix;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-jul-felix/logback.xml b/logback/itests/immediate-jul-felix/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-jul-felix/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-jul-felix/pom.xml b/logback/itests/immediate-jul-felix/pom.xml
index 226f625..00dc151 100644
--- a/logback/itests/immediate-jul-felix/pom.xml
+++ b/logback/itests/immediate-jul-felix/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,22 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.immediate.jul.felix</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <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.extension</artifactId>
- <version>1.0.0</version>
- <scope>runtime</scope>
+ <artifactId>org.apache.felix.logback.itests.helper</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/logback/itests/immediate-jul/itest.bndrun b/logback/itests/immediate-jul/itest.bndrun
index c727480..6568bb6 100644
--- a/logback/itests/immediate-jul/itest.bndrun
+++ b/logback/itests/immediate-jul/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.eclipse.osgi
@@ -14,13 +12,10 @@
org.apache.felix.logback;version=latest
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25
-
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
+ org.slf4j;version=${slf4j.api.version},\
+ org.slf4j.helpers;version=${slf4j.api.version},\
+ org.slf4j.spi;version=${slf4j.api.version}
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- org.apache.felix.logback.itests.immediate.jul;version='[1.0.0,1.0.1)'
+ org.apache.felix.logback.itests.immediate.jul;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-jul/logback.xml b/logback/itests/immediate-jul/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-jul/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-jul/pom.xml b/logback/itests/immediate-jul/pom.xml
index 08314e6..a341a69 100644
--- a/logback/itests/immediate-jul/pom.xml
+++ b/logback/itests/immediate-jul/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/logback/itests/immediate-log4j1/itest.bndrun b/logback/itests/immediate-log4j1/itest.bndrun
index 3f38f6d..7b60182 100644
--- a/logback/itests/immediate-log4j1/itest.bndrun
+++ b/logback/itests/immediate-log4j1/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -13,14 +11,11 @@
slf4j.api;version=latest
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25
-
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
+ org.slf4j;version=${slf4j.api.version},\
+ org.slf4j.helpers;version=${slf4j.api.version},\
+ org.slf4j.spi;version=${slf4j.api.version}
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- log4j.over.slf4j;version='[1.7.25,1.7.26)',\
- org.apache.felix.logback.itests.immediate.log4j1;version='[1.0.0,1.0.1)'
+ log4j.over.slf4j;version='[1.7.32,1.7.33)',\
+ org.apache.felix.logback.itests.immediate.log4j1;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-log4j1/logback.xml b/logback/itests/immediate-log4j1/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-log4j1/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-log4j1/pom.xml b/logback/itests/immediate-log4j1/pom.xml
index 6cc52cb..bc7926c 100644
--- a/logback/itests/immediate-log4j1/pom.xml
+++ b/logback/itests/immediate-log4j1/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
</project>
diff --git a/logback/itests/immediate-log4j2/itest.bndrun b/logback/itests/immediate-log4j2/itest.bndrun
index e74120a..a626507 100644
--- a/logback/itests/immediate-log4j2/itest.bndrun
+++ b/logback/itests/immediate-log4j2/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -15,14 +13,11 @@
slf4j.api;version=latest
-runsystempackages: \
- org.apache.logging.log4j;version=2.11.0,\
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25
-
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
+ org.apache.logging.log4j;version=${apache.logging.log4j.version},\
+ org.slf4j;version=${slf4j.api.version},\
+ org.slf4j.helpers;version=${slf4j.api.version},\
+ org.slf4j.spi;version=${slf4j.api.version}
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- org.apache.felix.logback.itests.immediate.log4j2;version='[1.0.0,1.0.1)'
+ org.apache.felix.logback.itests.immediate.log4j2;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-log4j2/logback.xml b/logback/itests/immediate-log4j2/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-log4j2/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-log4j2/pom.xml b/logback/itests/immediate-log4j2/pom.xml
index 6848f82..f79b92b 100644
--- a/logback/itests/immediate-log4j2/pom.xml
+++ b/logback/itests/immediate-log4j2/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
</project>
diff --git a/logback/itests/immediate-slf4j/itest.bndrun b/logback/itests/immediate-slf4j/itest.bndrun
index a8a66d5..b5a8f7e 100644
--- a/logback/itests/immediate-slf4j/itest.bndrun
+++ b/logback/itests/immediate-slf4j/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -13,13 +11,10 @@
slf4j.api;version=latest
-runsystempackages: \
- org.slf4j;version=1.7.25,\
- org.slf4j.helpers;version=1.7.25,\
- org.slf4j.spi;version=1.7.25
-
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
+ org.slf4j;version=${slf4j.api.version},\
+ org.slf4j.helpers;version=${slf4j.api.version},\
+ org.slf4j.spi;version=${slf4j.api.version}
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- org.apache.felix.logback.itests.immediate.slf4j;version='[1.0.0,1.0.1)'
+ org.apache.felix.logback.itests.immediate.slf4j;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
\ No newline at end of file
diff --git a/logback/itests/immediate-slf4j/logback.xml b/logback/itests/immediate-slf4j/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/immediate-slf4j/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/immediate-slf4j/pom.xml b/logback/itests/immediate-slf4j/pom.xml
index 586690c..eb6611b 100644
--- a/logback/itests/immediate-slf4j/pom.xml
+++ b/logback/itests/immediate-slf4j/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
</project>
diff --git a/logback/itests/itest-parent/pom.xml b/logback/itests/itest-parent/pom.xml
index 2c28c12..cd40dc0 100644
--- a/logback/itests/itest-parent/pom.xml
+++ b/logback/itests/itest-parent/pom.xml
@@ -28,7 +28,6 @@
<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>
@@ -38,6 +37,17 @@
</scm>
<properties>
+ <bnd.version>6.1.0</bnd.version>
+
+ <felix.java.version>8</felix.java.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <apache.logging.log4j.version>2.14.1</apache.logging.log4j.version>
+ <felix.log.version>1.2.5-SNAPSHOT</felix.log.version>
+ <slf4j.api.version>1.7.32</slf4j.api.version>
+
<animal.sniffer.skip>true</animal.sniffer.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -47,19 +57,19 @@
<dependencies>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.junit</artifactId>
- <version>${bnd.version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.api.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.3</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -76,46 +86,52 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.pushstream</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.9.22</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.1</version>
+ <version>7.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.logback.itests.helper</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <version>4.13.2_1</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.13.0</version>
+ <version>3.17.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.3.2.Final</version>
+ <version>3.4.2.Final</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -125,37 +141,31 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.25</version>
+ <version>1.7.32</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.11.1</version>
+ <version>${apache.logging.log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
- <version>2.11.1</version>
+ <version>2.14.1</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>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<configuration>
<bnd><![CDATA[
- Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
- -conditionalpackage: org.apache.felix.logback.test.helper
+ Test-Cases: ${classes;CONCRETE;HIERARCHY_ANNOTATED;org.junit.Test}
+ -conditionalpackage: \
+ org.apache.felix.logback.test.helper,\
+ org.apache.felix.logback.test.helper.ls
]]></bnd>
</configuration>
</plugin>
@@ -167,28 +177,104 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <!--
+ This is used for diagnostics by invoking it like:
+
+ mvn antrun:run@props [-N]
+ -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>props</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echoproperties />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <reportOptional>false</reportOptional>
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
</configuration>
+ <executions>
+ <execution>
+ <id>resolve</id>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
+ <version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
<resolve>false</resolve>
<bndruns>
<bndrun>itest.bndrun</bndrun>
</bndruns>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>testing</id>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
</plugins>
diff --git a/logback/itests/immediate-equinox-logservice/logback.xml b/logback/itests/logback.xml
similarity index 91%
rename from logback/itests/immediate-equinox-logservice/logback.xml
rename to logback/itests/logback.xml
index 8ba6eb3..3c424d2 100644
--- a/logback/itests/immediate-equinox-logservice/logback.xml
+++ b/logback/itests/logback.xml
@@ -28,12 +28,12 @@
</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"/>
+ <logger name="Events.Service.org.apache.felix.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.felix.logback.itests" level="INFO"/>
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
+ <logger name="org.apache.felix.logback.test" level="INFO" />
- <root level="ERROR">
+ <root level="OFF">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</root>
diff --git a/logback/itests/standard-equinox-logservice/itest.bndrun b/logback/itests/standard-equinox-logservice/itest.bndrun
index b89f732..c90ab1f 100644
--- a/logback/itests/standard-equinox-logservice/itest.bndrun
+++ b/logback/itests/standard-equinox-logservice/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.eclipse.osgi
@@ -10,13 +8,12 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.equinox.logservice)'
-runproperties: \
- eclipse.log.enabled=false,\
- logback.configurationFile=${fileuri;${.}/logback.xml}
+ eclipse.log.enabled=false
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
+ org.apache.felix.logback;version='[1.0.3,1.0.4)',\
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)'
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-equinox-logservice/logback.xml b/logback/itests/standard-equinox-logservice/logback.xml
deleted file mode 100644
index 3c75150..0000000
--- a/logback/itests/standard-equinox-logservice/logback.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-equinox-logservice/pom.xml b/logback/itests/standard-equinox-logservice/pom.xml
index 7ec38a9..2b7c5b0 100644
--- a/logback/itests/standard-equinox-logservice/pom.xml
+++ b/logback/itests/standard-equinox-logservice/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,21 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.equinox.logservice</artifactId>
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- -conditionalpackage: org.apache.felix.logback.test.helper.*
- ]]></bnd>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.logback.itests.helper</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/logback/itests/standard-felix-logservice/itest.bndrun b/logback/itests/standard-felix-logservice/itest.bndrun
index 1ec5876..c1f206e 100644
--- a/logback/itests/standard-felix-logservice/itest.bndrun
+++ b/logback/itests/standard-felix-logservice/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -12,14 +10,12 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.felix.logservice)'
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- 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.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)'
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
+ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+ org.apache.felix.log;version='[1.2.5,1.2.6)',\
+ org.apache.felix.logback;version='[1.0.3,1.0.4)',\
+ org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-felix-logservice/logback.xml b/logback/itests/standard-felix-logservice/logback.xml
deleted file mode 100644
index 0fc5b28..0000000
--- a/logback/itests/standard-felix-logservice/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.felix.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.felix.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-felix-logservice/pom.xml b/logback/itests/standard-felix-logservice/pom.xml
index 626d942..1f02717 100644
--- a/logback/itests/standard-felix-logservice/pom.xml
+++ b/logback/itests/standard-felix-logservice/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,30 +26,20 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.felix.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>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
- <version>1.2.0</version>
+ <version>${felix.log.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- -conditionalpackage: org.apache.felix.logback.test.helper.*
- ]]></bnd>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/logback/itests/standard-jbl/itest.bndrun b/logback/itests/standard-jbl/itest.bndrun
index 49db351..58ae862 100644
--- a/logback/itests/standard-jbl/itest.bndrun
+++ b/logback/itests/standard-jbl/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -9,13 +7,12 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.jbl)'
-runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml},\
org.jboss.logging.provider=slf4j
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
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)'
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ org.jboss.logging.jboss-logging;version='[3.4.2,3.4.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-jbl/logback.xml b/logback/itests/standard-jbl/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/standard-jbl/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-jbl/pom.xml b/logback/itests/standard-jbl/pom.xml
index 918d4c1..591aa63 100644
--- a/logback/itests/standard-jbl/pom.xml
+++ b/logback/itests/standard-jbl/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<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>
</project>
diff --git a/logback/itests/standard-jcl/itest.bndrun b/logback/itests/standard-jcl/itest.bndrun
index 49bd119..5be9330 100644
--- a/logback/itests/standard-jcl/itest.bndrun
+++ b/logback/itests/standard-jcl/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -9,14 +7,11 @@
osgi.identity;filter:='(osgi.identity=log4j.over.slf4j)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.jcl)'
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- 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)',\
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
+ log4j.over.slf4j;version='[1.7.32,1.7.33)',\
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)'
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-jcl/logback.xml b/logback/itests/standard-jcl/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/standard-jcl/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-jcl/pom.xml b/logback/itests/standard-jcl/pom.xml
index 2591b5f..7b7ad3a 100644
--- a/logback/itests/standard-jcl/pom.xml
+++ b/logback/itests/standard-jcl/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.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>
</project>
diff --git a/logback/itests/standard-jul/itest.bndrun b/logback/itests/standard-jul/itest.bndrun
index 919b224..773faf8 100644
--- a/logback/itests/standard-jul/itest.bndrun
+++ b/logback/itests/standard-jul/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -10,14 +8,12 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.jul)'
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- 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.2.0,1.2.1)',\
- org.apache.felix.logback.itests.standard.jul;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)'
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
+ org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
+ org.apache.felix.log;version='[1.2.5,1.2.6)',\
+ org.apache.felix.logback;version='[1.0.3,1.0.4)',\
+ org.apache.felix.logback.itests.standard.jul;version='[1.0.0,1.0.1)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-jul/logback.xml b/logback/itests/standard-jul/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/standard-jul/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-jul/pom.xml b/logback/itests/standard-jul/pom.xml
index 122b205..ac8d267 100644
--- a/logback/itests/standard-jul/pom.xml
+++ b/logback/itests/standard-jul/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,16 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.jul</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>1.2.0</version>
- <scope>runtime</scope>
+ <artifactId>org.apache.felix.logback.itests.helper</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/logback/itests/standard-log4j1/itest.bndrun b/logback/itests/standard-log4j1/itest.bndrun
index 4d637e0..8a5897c 100644
--- a/logback/itests/standard-log4j1/itest.bndrun
+++ b/logback/itests/standard-log4j1/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -8,13 +6,10 @@
osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.log4j1)'
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- 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)',\
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
+ log4j.over.slf4j;version='[1.7.32,1.7.33)',\
org.apache.felix.logback.itests.standard.log4j1;version='[1.0.0,1.0.1)',\
- slf4j.api;version='[1.7.25,1.7.26)'
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-log4j1/logback.xml b/logback/itests/standard-log4j1/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/standard-log4j1/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-log4j1/pom.xml b/logback/itests/standard-log4j1/pom.xml
index 54a2194..1f75d63 100644
--- a/logback/itests/standard-log4j1/pom.xml
+++ b/logback/itests/standard-log4j1/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.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>
</project>
diff --git a/logback/itests/standard-log4j2/itest.bndrun b/logback/itests/standard-log4j2/itest.bndrun
index af49987..2f77fe4 100644
--- a/logback/itests/standard-log4j2/itest.bndrun
+++ b/logback/itests/standard-log4j2/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -9,14 +7,11 @@
osgi.identity;filter:='(osgi.identity=org.apache.logging.log4j.to-slf4j)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.log4j2)'
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
org.apache.felix.logback.itests.standard.log4j2;version='[1.0.0,1.0.1)',\
- org.apache.logging.log4j.api;version='[2.11.1,2.11.2)',\
- org.apache.logging.log4j.to-slf4j;version='[2.11.1,2.11.2)',\
- slf4j.api;version='[1.7.25,1.7.26)'
+ org.apache.logging.log4j.api;version='[2.14.1,2.14.2)',\
+ org.apache.logging.log4j.to-slf4j;version='[2.14.1,2.14.2)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-log4j2/logback.xml b/logback/itests/standard-log4j2/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/standard-log4j2/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-log4j2/pom.xml b/logback/itests/standard-log4j2/pom.xml
index 10daf6f..3759f90 100644
--- a/logback/itests/standard-log4j2/pom.xml
+++ b/logback/itests/standard-log4j2/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.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>
</project>
diff --git a/logback/itests/standard-slf4j/itest.bndrun b/logback/itests/standard-slf4j/itest.bndrun
index 0f54eec..42f4c2c 100644
--- a/logback/itests/standard-slf4j/itest.bndrun
+++ b/logback/itests/standard-slf4j/itest.bndrun
@@ -1,6 +1,4 @@
--standalone: true
--runee: JavaSE-1.8
--resolve.effective: resolve, active
+-include: ../base.bndrun
-runfw: org.apache.felix.framework
@@ -8,12 +6,9 @@
osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.slf4j)'
--runproperties: \
- logback.configurationFile=${fileuri;${.}/logback.xml}
-
-runbundles: \
- biz.aQute.junit;version='[5.0.1,5.0.2)',\
- ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
- ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.classic;version='[1.2.7,1.2.8)',\
+ ch.qos.logback.core;version='[1.2.7,1.2.8)',\
org.apache.felix.logback.itests.standard.slf4j;version='[1.0.0,1.0.1)',\
- slf4j.api;version='[1.7.25,1.7.26)'
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
+ slf4j.api;version='[1.7.32,1.7.33)'
\ No newline at end of file
diff --git a/logback/itests/standard-slf4j/logback.xml b/logback/itests/standard-slf4j/logback.xml
deleted file mode 100644
index 289c3cf..0000000
--- a/logback/itests/standard-slf4j/logback.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
- <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
- <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
- <resetJUL>true</resetJUL>
- </contextListener>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
- <pattern>%-5level %logger{1000}:%line - %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"/>
- <logger name="Events.Service" level="ERROR"/>
- <logger name="LogService" level="ERROR"/>
-
- <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
- <logger name="LogService.org.apache.logback.itests" level="OFF"/>
-
- <logger name="org.apache.felix.logback.test" level="DEBUG" />
-
- <root level="ERROR">
- <appender-ref ref="STDOUT" />
- <appender-ref ref="FILE" />
- </root>
-</configuration>
diff --git a/logback/itests/standard-slf4j/pom.xml b/logback/itests/standard-slf4j/pom.xml
index 9b1d762..0ff9697 100644
--- a/logback/itests/standard-slf4j/pom.xml
+++ b/logback/itests/standard-slf4j/pom.xml
@@ -17,6 +17,8 @@
under the License.
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.logback.itests.parent</artifactId>
@@ -24,7 +26,14 @@
<relativePath>../itest-parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
<artifactId>org.apache.felix.logback.itests.standard.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>
</project>
diff --git a/logback/itests/test-helper/pom.xml b/logback/itests/test-helper/pom.xml
index c9f0c18..4634044 100644
--- a/logback/itests/test-helper/pom.xml
+++ b/logback/itests/test-helper/pom.xml
@@ -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.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>
@@ -34,6 +34,8 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.site.skip>true</maven.site.skip>
<maven.source.skip>true</maven.source.skip>
+ <maven.test.skip>true</maven.test.skip>
+ <bnd.resolve.skip>true</bnd.resolve.skip>
</properties>
<dependencies>
@@ -59,21 +61,4 @@
<version>1.4.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>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java b/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java
index ba45f83..f2762a0 100644
--- a/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java
+++ b/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java
@@ -27,7 +27,7 @@ import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.read.ListAppender;
-import junit.framework.AssertionFailedError;
+
public class LogTestHelper {
@@ -72,7 +72,7 @@ public class LogTestHelper {
return lr.equals(record);
})) {
- throw new AssertionFailedError("Log record not found: " + record);
+ throw new RuntimeException("Log record not found: " + record);
}
}
diff --git a/logback/logback/pom.xml b/logback/logback/pom.xml
index 736a580..33e66a9 100644
--- a/logback/logback/pom.xml
+++ b/logback/logback/pom.xml
@@ -38,6 +38,16 @@
<url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
</scm>
+ <properties>
+ <bnd.version>6.1.0</bnd.version>
+
+ <animal.sniffer.skip>true</animal.sniffer.skip>
+ <felix.java.version>8</felix.java.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -48,12 +58,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.0</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.13.0</version>
+ <version>3.17.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -65,13 +75,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.7.22</version>
+ <version>1.7.32</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -80,7 +90,7 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>4.1.0</version>
+ <version>${bnd.version}</version>
<configuration>
<bnd><![CDATA[
Import-Package: !org.eclipse.osgi.internal.hookregistry, *
@@ -98,14 +108,6 @@
</plugin>
<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>
<archive>
@@ -114,9 +116,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>0.12</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
diff --git a/logback/pom.xml b/logback/pom.xml
index 23ebb26..51dd877 100644
--- a/logback/pom.xml
+++ b/logback/pom.xml
@@ -37,81 +37,8 @@
<url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
</scm>
- <properties>
- <bnd.version>5.0.1</bnd.version>
- </properties>
-
<modules>
<module>logback</module>
<module>itests</module>
</modules>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>${bnd.version}</version>
- <executions>
- <execution>
- <id>bnd-process</id>
- <goals>
- <goal>bnd-process</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-resolver-maven-plugin</artifactId>
- <version>${bnd.version}</version>
- <configuration>
- <includeOptional>false</includeOptional>
- </configuration>
- <executions>
- <execution>
- <id>resolve</id>
- <goals>
- <goal>resolve</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-testing-maven-plugin</artifactId>
- <version>${bnd.version}</version>
- <executions>
- <execution>
- <id>testing</id>
- <goals>
- <goal>testing</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <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>
- <version>3.0.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>