Log4j update (#897)

Author: Brett Berenz

build.xml

@@ -96,11 +96,12 @@
         <jar compress="${jar.compress}" index="${jar.index}" destfile="${dist.dir}/${project.filename}.jar" duplicate="preserve">
             <fileset dir="${build.dir}/${project.filename}"/>
             <!-- Some root level files will cause jlink to fail, they need to be cleaned up -->
-            <fileset dir="${out.dir}/libs-temp" excludes="*.class,LICENSE,jetty-dir.css"/>
+            <fileset dir="${out.dir}/libs-temp" excludes="*.class,LICENSE,jetty-dir.css,about.html,Log4j-*"/>
             <manifest>
                 <attribute name="Application-Name" value="${project.name}"/>
                 <attribute name="Main-Class" value="qz.App"/>
                 <attribute name="Permissions" value="all-permissions"/>
+                <attribute name="Multi-Release" value="true"/>
             </manifest>
         </jar>
         <delete dir="${out.dir}/libs-temp" includeemptydirs="true" defaultexcludes="false"/>
@@ -156,10 +157,14 @@
         <!-- Remove files that can/did collide during unpacking -->
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${out.dir}/libs-temp">
-                <include name="**/META-INF/**"/>
-                <exclude name="**/META-INF/maven/**"/>
                 <include name="LICENSE*"/>
                 <include name="README*"/>
+                <include name="**/META-INF/**"/>
+                <!-- Used by SecurityInfo.getMavenVersions() -->
+                <exclude name="**/META-INF/maven/**"/>
+                <!-- Required by log4j -->
+                <exclude name="**/META-INF/**/apache/logging/**"/>
+                <exclude name="**/META-INF/services/**"/>
             </fileset>
         </delete>
     </target>

lib/logging/apache-log4j-extras-1.2.17.jar

@@ -11,8 +11,8 @@
 package com.apple;
 
 import com.github.zafarkhaja.semver.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import qz.common.Constants;
 import qz.utils.MacUtilities;
 
@@ -27,7 +27,7 @@
  * @author Tres Finocchiaro
  */
 public class OSXAdapterWrapper implements InvocationHandler {
-    private static final Logger log = LoggerFactory.getLogger(OSXAdapterWrapper.class);
+    private static final Logger log = LogManager.getLogger(OSXAdapterWrapper.class);
     public static final boolean legacyMode = Constants.JAVA_VERSION.lessThan(Version.valueOf("9.0.0"));
 
     private Object target;

lib/logging/log4j-1.2.17.jar

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="console" target="SYSTEM_OUT">
+            <PatternLayout pattern="[%p] %d{ISO8601} @ %c:%L%n\t%m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+    <!-- Packages -->
+        <Logger name="qz" level="trace"/>
+    <!-- Default -->
+        <Root level="warn">
+            <AppenderRef ref="console"/>
+        </Root>
+    </Loggers>
+</Configuration>