Fix OSGi tests

Author: ppkarwasz

log4j-api-test/pom.xml

@@ -36,6 +36,7 @@
       -->
     <bnd-module-name>org.apache.logging.log4j.test</bnd-module-name>
     <bnd-extra-package-options>
+      org.apache.commons.lang3.*;resolution:=optional,
       <!-- Both JUnit 4 and JUnit 5 are not required -->
       org.junit.*;resolution:=optional,
       org.hamcrest.*;resolution:=optional,
@@ -55,7 +56,6 @@
       maven.model.builder;substitute="maven-model-builder";transitive=false;static=true,
       plexus.utils;substitute="plexus-utils";transitive=false;static=true
     </bnd-extra-module-options>
-    <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
   </properties>
   <dependencies>
     <dependency>

log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/AbstractLoadBundleTest.java

@@ -71,11 +71,11 @@ private Bundle getCoreBundle() throws BundleException {
     }
 
     private Bundle get12ApiBundle() throws BundleException {
-        return installBundle("org.apache.logging.log4j.1.2-api");
+        return installBundle("org.apache.logging.log4j.1.2.api");
     }
 
     private Bundle getApiTestsBundle() throws BundleException {
-        return installBundle("org.apache.logging.log4j.api-test");
+        return installBundle("org.apache.logging.log4j.api.test");
     }
 
     protected abstract FrameworkFactory getFactory();
@@ -261,21 +261,21 @@ public void testServiceLoader() throws BundleException, ReflectiveOperationExcep
         final Class<?> osgiServiceLocator = api.loadClass("org.apache.logging.log4j.util.OsgiServiceLocator");
         assertTrue("OsgiServiceLocator is active", (boolean) osgiServiceLocator.getMethod("isAvailable").invoke(null));
 
-        api.start();
         core.start();
-        assertEquals("api-tests is not in RESOLVED state", Bundle.RESOLVED, apiTests.getState());
+        apiTests.start();
+        assertEquals("api-tests is not in ACTIVE state", Bundle.ACTIVE, apiTests.getState());
 
-        final Class<?> osgiServiceLocatorTest = api.loadClass("org.apache.logging.log4j.test.util.OsgiServiceLocatorTest");
+        final Class<?> osgiServiceLocatorTest = apiTests.loadClass("org.apache.logging.log4j.test.util.OsgiServiceLocatorTest");
 
         final Method loadProviders = osgiServiceLocatorTest.getDeclaredMethod("loadProviders");
         final Object obj = loadProviders.invoke(null);
         assertTrue(obj instanceof Stream);
         @SuppressWarnings("unchecked")
-        final
-                List<Object> services = ((Stream<Object>) obj).collect(Collectors.toList());
+        final List<Object> services = ((Stream<Object>) obj).collect(Collectors.toList());
         assertEquals(1, services.size());
         assertEquals("org.apache.logging.log4j.core.impl.Log4jProvider", services.get(0).getClass().getName());
 
+        apiTests.stop();
         core.stop();
         api.stop();
         assertEquals("api-tests is not in ACTIVE state", Bundle.RESOLVED, apiTests.getState());

log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/JULProviderTest.java

@@ -51,7 +51,7 @@ public class JULProviderTest {
     public Option[] config() {
         return options(
                 linkBundle("org.apache.logging.log4j.api"),
-                linkBundle("org.apache.logging.log4j.to-jul"),
+                linkBundle("org.apache.logging.log4j.to.jul"),
                 // required by Pax Exam's logging
                 linkBundle("slf4j.api"),
                 linkBundle("ch.qos.logback.classic"),
@@ -62,7 +62,7 @@ public Option[] config() {
     @Test(timeout = 10_000L)
     public void testJulFactoryResolves() {
         final Optional<Bundle> julBundle = Stream.of(context.getBundles())
-                .filter(b -> "org.apache.logging.log4j.to-jul".equals(b.getSymbolicName()))
+                .filter(b -> "org.apache.logging.log4j.to.jul".equals(b.getSymbolicName()))
                 .findAny();
         assertTrue(julBundle.isPresent());
         final LoggerContextFactory factory = LogManager.getFactory();

log4j-osgi/src/test/java/org/apache/logging/log4j/osgi/tests/SLF4JProviderTest.java

@@ -51,7 +51,7 @@ public class SLF4JProviderTest {
     public Option[] config() {
         return options(
                 linkBundle("org.apache.logging.log4j.api"),
-                linkBundle("org.apache.logging.log4j.to-slf4j"),
+                linkBundle("org.apache.logging.log4j.to.slf4j"),
                 linkBundle("slf4j.api"),
                 linkBundle("ch.qos.logback.classic"),
                 linkBundle("ch.qos.logback.core"),
@@ -61,7 +61,7 @@ public Option[] config() {
     @Test(timeout = 10_000L)
     public void testSlf4jFactoryResolves() {
         final Optional<Bundle> slf4jBundle = Stream.of(context.getBundles())
-                .filter(b -> "org.apache.logging.log4j.to-slf4j".equals(b.getSymbolicName()))
+                .filter(b -> "org.apache.logging.log4j.to.slf4j".equals(b.getSymbolicName()))
                 .findAny();
         assertTrue(slf4jBundle.isPresent());
         final LoggerContextFactory factory = LogManager.getFactory();

log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/Activator.java

@@ -17,7 +17,10 @@
 package org.apache.logging.slf4j;
 
 import org.apache.logging.log4j.util.ProviderActivator;
+import org.osgi.annotation.bundle.Header;
 
+@Header(name = org.osgi.framework.Constants.BUNDLE_ACTIVATOR, value = "${@class}")
+@Header(name = org.osgi.framework.Constants.BUNDLE_ACTIVATIONPOLICY, value = org.osgi.framework.Constants.ACTIVATION_LAZY)
 public class Activator extends ProviderActivator {
 
     public Activator() {