From 001a1981cf98b97ee96f489eb3e216245c08bb1b Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 2 Nov 2019 10:07:13 +0800
Subject: [PATCH] update log4j 1.2.17 -> log4j 2.11.2 (log4j 2.12.x latest
 needs higher Android API)

---
 forge-game/pom.xml                             |  4 ++--
 forge-gui-android/proguard.cfg                 |  2 ++
 forge-gui-desktop/pom.xml                      | 11 ++++++++---
 forge-gui/pom.xml                              | 11 ++++++++---
 .../java/forge/net/server/FServerManager.java  |  7 -------
 forge-gui/src/main/resources/log4j2.xml        | 18 ++++++++++++++++++
 6 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 forge-gui/src/main/resources/log4j2.xml

diff --git a/forge-game/pom.xml b/forge-game/pom.xml
index 0d19263f85c..e98d5c8e814 100644
--- a/forge-game/pom.xml
+++ b/forge-game/pom.xml
@@ -32,8 +32,8 @@
         </dependency>
         <dependency>
             <groupId>io.sentry</groupId>
-            <artifactId>sentry-log4j</artifactId>
-            <version>1.7.5</version>
+            <artifactId>sentry-log4j2</artifactId>
+            <version>1.7.27</version>
         </dependency>
     </dependencies>
 
diff --git a/forge-gui-android/proguard.cfg b/forge-gui-android/proguard.cfg
index 7a8ab24db32..57fa2061f4d 100644
--- a/forge-gui-android/proguard.cfg
+++ b/forge-gui-android/proguard.cfg
@@ -27,6 +27,8 @@
 -dontwarn java.lang.**
 -dontwarn org.slf4j.**
 -dontwarn javax.**
+-dontwarn org.apache.logging.log4j.**
+-dontwarn module-info
 
 # mandatory proguard rules for cache2k to keep the core implementation
 -dontwarn org.cache2k.impl.xmlConfiguration.**
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index 3abbf4f47ae..ffdbece5e23 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -168,9 +168,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.11.2</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode</groupId>
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 53d3f3302d3..7508d9494cd 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -58,9 +58,14 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.11.2</version>
         </dependency>
         <dependency>
             <groupId>org.fourthline.cling</groupId>
diff --git a/forge-gui/src/main/java/forge/net/server/FServerManager.java b/forge-gui/src/main/java/forge/net/server/FServerManager.java
index 27cd0df0f87..beb3887d4c2 100644
--- a/forge-gui/src/main/java/forge/net/server/FServerManager.java
+++ b/forge-gui/src/main/java/forge/net/server/FServerManager.java
@@ -14,7 +14,6 @@ import forge.net.event.LogoutEvent;
 import forge.net.event.MessageEvent;
 import forge.net.event.NetEvent;
 import forge.net.event.UpdateLobbyPlayerEvent;
-import forge.properties.ForgeConstants;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -39,9 +38,6 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
 
-import org.apache.log4j.PropertyConfigurator;
-import io.netty.util.internal.logging.InternalLoggerFactory;
-import io.netty.util.internal.logging.Log4JLoggerFactory;
 import org.fourthline.cling.UpnpService;
 import org.fourthline.cling.UpnpServiceImpl;
 import org.fourthline.cling.support.igd.PortMappingListener;
@@ -87,8 +83,6 @@ public final class FServerManager {
      */
     public static FServerManager getInstance() {
         if (instance == null) {
-            if(GuiBase.hasPropertyConfig())
-                PropertyConfigurator.configure(ForgeConstants.ASSETS_DIR + "/src/main/resources/log4jConfig.config");
             instance = new FServerManager();
         }
         return instance;
@@ -96,7 +90,6 @@ public final class FServerManager {
 
     public void startServer(final int port) {
         try {
-            InternalLoggerFactory.setDefaultFactory(Log4JLoggerFactory.INSTANCE);
             final ServerBootstrap b = new ServerBootstrap()
                     .group(bossGroup, workerGroup)
                     .channel(NioServerSocketChannel.class)
diff --git a/forge-gui/src/main/resources/log4j2.xml b/forge-gui/src/main/resources/log4j2.xml
new file mode 100644
index 00000000000..c378e95d10f
--- /dev/null
+++ b/forge-gui/src/main/resources/log4j2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="ALL">
+    <Appenders>
+        <Console name="A1">
+            <PatternLayout pattern="%-4r [%t] %-5p %c %x - %m%n" />
+        </Console>
+
+        <!--Sentry name="Sentry" /-->
+    </Appenders>
+
+    <Loggers>
+        <Root level="ALL">
+            <AppenderRef ref="A1" />
+            <!-- Note that the Sentry logging threshold is overridden to the WARN level -->
+            <!--AppenderRef ref="Sentry" level="WARN" /-->
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file