This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch 2.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 5cf5b3c94036f8686b076f2b5ae53ac8dafa383b Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon Oct 30 13:08:47 2023 +0100 Fix OSGi tests --- log4j-osgi-test/pom.xml | 7 +++++++ .../java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java | 6 ++++++ .../java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java | 7 ++++++- .../org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java | 6 ++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/log4j-osgi-test/pom.xml b/log4j-osgi-test/pom.xml index 681ac04d0a..bf60a75300 100644 --- a/log4j-osgi-test/pom.xml +++ b/log4j-osgi-test/pom.xml @@ -34,6 +34,7 @@ <bnd.baseline.skip>true</bnd.baseline.skip> <maven.deploy.skip>true</maven.deploy.skip> <maven.install.skip>true</maven.install.skip> + <spifly.version>1.3.6</spifly.version> </properties> <dependencies> <dependency> @@ -91,6 +92,12 @@ <artifactId>logback-classic</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.aries.spifly</groupId> + <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> + <version>${spifly.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> diff --git a/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java index df7293a751..5ddd78ce5e 100644 --- a/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java +++ b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/CoreOsgiTest.java @@ -48,6 +48,12 @@ public class CoreOsgiTest { linkBundle("org.apache.logging.log4j.core"), linkBundle("org.apache.logging.log4j.1.2.api").start(false), // required by Pax Exam's logging + linkBundle("org.objectweb.asm"), + linkBundle("org.objectweb.asm.commons"), + linkBundle("org.objectweb.asm.tree"), + linkBundle("org.objectweb.asm.tree.analysis"), + linkBundle("org.objectweb.asm.util"), + linkBundle("org.apache.aries.spifly.dynamic.bundle").startLevel(2), linkBundle("slf4j.api"), linkBundle("ch.qos.logback.classic"), linkBundle("ch.qos.logback.core"), diff --git a/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java index db88e57a04..760e39256d 100644 --- a/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java +++ b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java @@ -52,7 +52,12 @@ public class JULProviderTest { return options( linkBundle("org.apache.logging.log4j.api"), linkBundle("org.apache.logging.log4j.to.jul"), - // required by Pax Exam's logging + linkBundle("org.objectweb.asm"), + linkBundle("org.objectweb.asm.commons"), + linkBundle("org.objectweb.asm.tree"), + linkBundle("org.objectweb.asm.tree.analysis"), + linkBundle("org.objectweb.asm.util"), + linkBundle("org.apache.aries.spifly.dynamic.bundle").startLevel(2), linkBundle("slf4j.api"), linkBundle("ch.qos.logback.classic"), linkBundle("ch.qos.logback.core"), diff --git a/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java index 860dcc4e33..32b0243cfe 100644 --- a/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java +++ b/log4j-osgi-test/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java @@ -52,6 +52,12 @@ public class SLF4JProviderTest { return options( linkBundle("org.apache.logging.log4j.api"), linkBundle("org.apache.logging.log4j.to.slf4j"), + linkBundle("org.objectweb.asm"), + linkBundle("org.objectweb.asm.commons"), + linkBundle("org.objectweb.asm.tree"), + linkBundle("org.objectweb.asm.tree.analysis"), + linkBundle("org.objectweb.asm.util"), + linkBundle("org.apache.aries.spifly.dynamic.bundle").startLevel(2), linkBundle("slf4j.api"), linkBundle("ch.qos.logback.classic"), linkBundle("ch.qos.logback.core"),
