Fix Apache Rat errors

Author: ppkarwasz

log4j-jakarta-smtp/src/main/resources/META-INF/services/org.apache.logging.log4j.core.net.MailManagerFactory

@@ -1 +1,17 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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.
+#
 org.apache.logging.log4j.smtp.SmtpManager$SMTPManagerFactory

log4j-osgi-test/pom.xml

@@ -198,6 +198,8 @@
             <!-- PAX logging has a copy of Log4j2 API-->
             <pax.exam.logging>false</pax.exam.logging>
             <java.protocol.handler.pkgs>org.ops4j.pax.url</java.protocol.handler.pkgs>
+            <!-- Used in `osgi.properties -->
+            <felix.cache.rootdir>${project.build.directory}</felix.cache.rootdir>
           </systemPropertyVariables>
         </configuration>
       </plugin>

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

@@ -16,8 +16,11 @@
  */
 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;
@@ -50,18 +53,25 @@ protected void after() {
 
     @Override
     protected void before() throws Throwable {
-        final Map<String, String> configMap = new HashMap<>(2);
-        // 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();
+        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();
+        }
     }
 
     public Framework getFramework() {

log4j-osgi-test/src/test/resources/log4j2.custom

@@ -1 +1,17 @@
-# This file enables the CustomConfigurationFactory
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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.
+#
+This file enables the CustomConfigurationFactory

log4j-osgi-test/src/test/resources/osgi.properties

@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you 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.
+#
+org.osgi.framework.storage.clean = onFirstInit
+felix.log.level = 4
+eclipse.log.level = ALL
+# Hack to get the build working on Windows. Could try newer versions of Felix.
+felix.cache.locking = false

pom.xml

@@ -572,7 +572,6 @@
             <exclude>**/.toDelete</exclude>
             <exclude>velocity.log</exclude>
             <!-- Other -->
-            <exclude>felix-cache/**</exclude>
             <exclude>**/README.md</exclude>
             <exclude>SECURITY.md</exclude>
             <exclude>**/*.yml</exclude>
@@ -910,6 +909,7 @@
         </plugins>
       </build>
     </profile>
+
   </profiles>
 
 </project>