From ade2527efc542352e9b94c60bb2e7ceee8f10aa7 Mon Sep 17 00:00:00 2001 From: Mat Allen Date: Thu, 3 Oct 2019 10:43:56 -0500 Subject: [PATCH] Re-applying log4j2 upgrade, however it can only be applied once we've moved to deploying on Tomcat >=8.5 --- pom.xml | 26 ++++++++++++------- .../java/com/redhat/sso/ninja/Backup.java | 5 ++-- .../java/com/redhat/sso/ninja/Config.java | 5 ++-- .../java/com/redhat/sso/ninja/Database2.java | 5 ++-- .../com/redhat/sso/ninja/GoogleDrive2.java | 5 ++-- .../java/com/redhat/sso/ninja/Heartbeat2.java | 5 ++-- .../sso/ninja/ManagementController.java | 7 ++--- .../com/redhat/sso/ninja/TasksController.java | 5 ++-- .../java/com/redhat/sso/ninja/TrelloSync.java | 5 ++-- .../redhat/sso/ninja/utils/DownloadFile.java | 5 ++-- .../java/com/redhat/sso/ninja/utils/Http.java | 7 +++-- src/main/resources/log4j.xml | 21 --------------- src/main/resources/log4j2.xml | 14 ++++++++++ 13 files changed, 61 insertions(+), 54 deletions(-) delete mode 100644 src/main/resources/log4j.xml create mode 100644 src/main/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index a1a47dea..e6f48d2c 100644 --- a/pom.xml +++ b/pom.xml @@ -125,16 +125,22 @@ --> 2.9.0 - - org.jboss.resteasy - resteasy-jaxrs - 2.2.1.GA - - - log4j - log4j - 1.2.17 - + + org.jboss.resteasy + resteasy-jaxrs + 2.2.1.GA + + + + org.apache.logging.log4j + log4j-api + 2.12.1 + + + org.apache.logging.log4j + log4j-core + 2.12.1 + diff --git a/src/main/java/com/redhat/sso/ninja/Backup.java b/src/main/java/com/redhat/sso/ninja/Backup.java index d0b48ee9..db7e52ca 100644 --- a/src/main/java/com/redhat/sso/ninja/Backup.java +++ b/src/main/java/com/redhat/sso/ninja/Backup.java @@ -10,10 +10,11 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Backup { - private static final Logger log = Logger.getLogger(Backup.class); + private static final Logger log=LogManager.getLogger(Backup.class); private static Timer t; public static void main(String[] asd){ diff --git a/src/main/java/com/redhat/sso/ninja/Config.java b/src/main/java/com/redhat/sso/ninja/Config.java index f4637a62..99427d3b 100644 --- a/src/main/java/com/redhat/sso/ninja/Config.java +++ b/src/main/java/com/redhat/sso/ninja/Config.java @@ -16,7 +16,8 @@ import java.util.Set; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.map.JsonMappingException; @@ -26,7 +27,7 @@ import com.redhat.sso.ninja.utils.MapBuilder; public class Config { - private static final Logger log=Logger.getLogger(Config.class); + private static final Logger log=LogManager.getLogger(Config.class); public static final File STORAGE=new File("target/ninja-persistence", "config.json"); private static Config instance; private List> scripts=null; diff --git a/src/main/java/com/redhat/sso/ninja/Database2.java b/src/main/java/com/redhat/sso/ninja/Database2.java index 163af0a7..bc2befd5 100644 --- a/src/main/java/com/redhat/sso/ninja/Database2.java +++ b/src/main/java/com/redhat/sso/ninja/Database2.java @@ -16,7 +16,8 @@ import java.util.Set; import java.util.UUID; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.annotate.JsonIgnore; @@ -26,7 +27,7 @@ import com.redhat.sso.ninja.utils.Json; public class Database2{ - private static final Logger log=Logger.getLogger(Database2.class); + private static final Logger log=LogManager.getLogger(Database2.class); public static final String STORAGE="target/ninja-persistence/database2.json"; public static final File STORAGE_AS_FILE=new File(STORAGE); public static Integer MAX_EVENT_ENTRIES=1000; diff --git a/src/main/java/com/redhat/sso/ninja/GoogleDrive2.java b/src/main/java/com/redhat/sso/ninja/GoogleDrive2.java index 3b44a316..8c5d828a 100644 --- a/src/main/java/com/redhat/sso/ninja/GoogleDrive2.java +++ b/src/main/java/com/redhat/sso/ninja/GoogleDrive2.java @@ -16,7 +16,8 @@ import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -25,7 +26,7 @@ import com.redhat.sso.ninja.utils.DownloadFile; public class GoogleDrive2 { - private static Logger log=Logger.getLogger(GoogleDrive2.class); + private static Logger log=LogManager.getLogger(GoogleDrive2.class); public static final String DEFAULT_EXECUTABLE="/home/%s/drive_linux"; // public static final String DEFAULT_PULL_COMMAND=DEFAULT_EXECUTABLE+" pull -export xls -quiet=true --id %s"; //worked with 0.3.1 diff --git a/src/main/java/com/redhat/sso/ninja/Heartbeat2.java b/src/main/java/com/redhat/sso/ninja/Heartbeat2.java index c76cc57e..d106cf06 100644 --- a/src/main/java/com/redhat/sso/ninja/Heartbeat2.java +++ b/src/main/java/com/redhat/sso/ninja/Heartbeat2.java @@ -30,7 +30,8 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.mortbay.log.Log; import com.google.common.collect.Lists; @@ -46,7 +47,7 @@ import com.redhat.sso.ninja.utils.Tuple; public class Heartbeat2 { - private static final Logger log = Logger.getLogger(Heartbeat2.class); + private static final Logger log=LogManager.getLogger(Heartbeat2.class); private static Timer t; private static Timer tRunOnce; // private static final long delay=30000l; diff --git a/src/main/java/com/redhat/sso/ninja/ManagementController.java b/src/main/java/com/redhat/sso/ninja/ManagementController.java index dca51d23..1f4ac79b 100644 --- a/src/main/java/com/redhat/sso/ninja/ManagementController.java +++ b/src/main/java/com/redhat/sso/ninja/ManagementController.java @@ -27,8 +27,9 @@ import javax.ws.rs.core.Response; import org.apache.commons.io.IOUtils; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; @@ -45,7 +46,7 @@ @Path("/") public class ManagementController { - private static final Logger log=Logger.getLogger(ManagementController.class); + private static final Logger log=LogManager.getLogger(ManagementController.class); public static void main(String[] asd) throws JsonGenerationException, JsonMappingException, IOException{ System.out.println(java.sql.Date.valueOf(LocalDate.now())); diff --git a/src/main/java/com/redhat/sso/ninja/TasksController.java b/src/main/java/com/redhat/sso/ninja/TasksController.java index 16ad7793..8ad57b48 100644 --- a/src/main/java/com/redhat/sso/ninja/TasksController.java +++ b/src/main/java/com/redhat/sso/ninja/TasksController.java @@ -22,7 +22,8 @@ import javax.ws.rs.core.Response; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; @@ -33,7 +34,7 @@ @Path("/") public class TasksController { - private static final Logger log= Logger.getLogger(TasksController.class); + private static final Logger log=LogManager.getLogger(TasksController.class); diff --git a/src/main/java/com/redhat/sso/ninja/TrelloSync.java b/src/main/java/com/redhat/sso/ninja/TrelloSync.java index 6cf77faa..773df9fc 100644 --- a/src/main/java/com/redhat/sso/ninja/TrelloSync.java +++ b/src/main/java/com/redhat/sso/ninja/TrelloSync.java @@ -11,7 +11,8 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.jayway.restassured.specification.RequestSpecification; import com.redhat.sso.ninja.utils.MapBuilder; @@ -27,7 +28,7 @@ */ public class TrelloSync extends ScriptBase{ - private static final Logger log=Logger.getLogger(TrelloSync.class); + private static final Logger log=LogManager.getLogger(TrelloSync.class); /* * diff --git a/src/main/java/com/redhat/sso/ninja/utils/DownloadFile.java b/src/main/java/com/redhat/sso/ninja/utils/DownloadFile.java index 7979e592..567a56cb 100644 --- a/src/main/java/com/redhat/sso/ninja/utils/DownloadFile.java +++ b/src/main/java/com/redhat/sso/ninja/utils/DownloadFile.java @@ -8,10 +8,11 @@ import java.nio.file.attribute.PosixFilePermission; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class DownloadFile{ - private Logger log=Logger.getLogger(this.getClass()); + private Logger log=LogManager.getLogger(this.getClass()); public String get(String remoteLocation, String localDestination, PosixFilePermission... permissions) throws IOException{ return get(remoteLocation, new File(localDestination), permissions); diff --git a/src/main/java/com/redhat/sso/ninja/utils/Http.java b/src/main/java/com/redhat/sso/ninja/utils/Http.java index 3e34b126..c90577f4 100644 --- a/src/main/java/com/redhat/sso/ninja/utils/Http.java +++ b/src/main/java/com/redhat/sso/ninja/utils/Http.java @@ -8,12 +8,11 @@ import java.net.URL; import java.util.Map; import java.util.Map.Entry; - -import org.apache.log4j.Logger; - +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Http{ - private static final Logger log = Logger.getLogger(Http.class); + private static final Logger log=LogManager.getLogger(Http.class); public static class Response{ public Response(int responseCode, String response){ diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml deleted file mode 100644 index 58e9b078..00000000 --- a/src/main/resources/log4j.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 00000000..4732e1e6 --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file