Port OsgiRule changes from main

Author: vy

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

@@ -16,11 +16,8 @@
  */
 package org.apache.logging.log4j.osgi.tests.junit;
 
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
-import java.util.stream.Collectors;
 import org.junit.rules.ExternalResource;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.launch.Framework;
@@ -53,25 +50,18 @@ protected void after() {
 
     @Override
     protected void before() throws Throwable {
-        try (final InputStream is = OsgiRule.class.getResourceAsStream("/osgi.properties")) {
-            final Properties props = new Properties();
-            props.load(is);
-            final Map<String, String> configMap = props.entrySet().stream()
-                    .collect(Collectors.toMap(
-                            e -> String.valueOf(e.getKey()),
-                            e -> String.valueOf(e.getValue()),
-                            (prev, next) -> next,
-                            HashMap::new));
-            System.getProperties().forEach((k, v) -> {
-                final String key = String.valueOf(k);
-                if (key.startsWith("felix") || key.startsWith("org.osgi")) {
-                    configMap.put(key, String.valueOf(v));
-                }
-            });
-            framework = factory.newFramework(configMap);
-            framework.init();
-            framework.start();
-        }
+        final Map<String, String> configMap = new HashMap<>();
+        // Cleans framework before first init. Subsequent init invocations do not clean framework.
+        configMap.put("org.osgi.framework.storage.clean", "onFirstInit");
+        configMap.put("felix.log.level", "4");
+        configMap.put("eclipse.log.level", "ALL");
+        // Hack to get the build working on Windows. Could try newer versions of Felix.
+        configMap.put("felix.cache.locking", "false");
+        // Delegates loading of endorsed libraries to JVM classloader
+        // config.put("org.osgi.framework.bootdelegation", "javax.*,org.w3c.*,org.xml.*");
+        framework = factory.newFramework(configMap);
+        framework.init();
+        framework.start();
     }
 
     public Framework getFramework() {