From b054427d0fc8bb074064cd6630feb14886aa6d53 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Mon, 13 Jul 2020 07:14:29 -0700 Subject: [PATCH] Item 7490: upgrade log4j --- .../filetransfer/globus/GlobusFileTransferProvider.java | 5 +++-- .../labkey/filetransfer/provider/FileTransferProvider.java | 4 ++-- src/org/labkey/filetransfer/provider/Registry.java | 5 +++-- .../labkey/filetransfer/security/OAuth2Authenticator.java | 5 +++-- .../filetransfer/view/FileTransferWebPartConfigView.java | 5 +++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/org/labkey/filetransfer/globus/GlobusFileTransferProvider.java b/src/org/labkey/filetransfer/globus/GlobusFileTransferProvider.java index edf2042..638f9e7 100644 --- a/src/org/labkey/filetransfer/globus/GlobusFileTransferProvider.java +++ b/src/org/labkey/filetransfer/globus/GlobusFileTransferProvider.java @@ -28,7 +28,8 @@ import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; @@ -57,7 +58,7 @@ */ public class GlobusFileTransferProvider extends FileTransferProvider { - public static final Logger logger = Logger.getLogger(GlobusFileTransferProvider.class); + public static final Logger logger = LogManager.getLogger(GlobusFileTransferProvider.class); public static final String NAME = "Globus"; public GlobusFileTransferProvider() diff --git a/src/org/labkey/filetransfer/provider/FileTransferProvider.java b/src/org/labkey/filetransfer/provider/FileTransferProvider.java index 9103ea3..93695f0 100644 --- a/src/org/labkey/filetransfer/provider/FileTransferProvider.java +++ b/src/org/labkey/filetransfer/provider/FileTransferProvider.java @@ -21,11 +21,11 @@ import org.labkey.api.data.Container; import org.labkey.api.security.User; import org.labkey.api.view.ViewContext; -import org.labkey.filetransfer.model.TransferEndpoint; +import org.labkey.filetransfer.config.FileTransferSettings; import org.labkey.filetransfer.globus.TransferResult; +import org.labkey.filetransfer.model.TransferEndpoint; import org.labkey.filetransfer.security.OAuth2Authenticator; import org.labkey.filetransfer.security.SecurePropertiesDataStore; -import org.labkey.filetransfer.config.FileTransferSettings; import java.io.IOException; import java.net.URISyntaxException; diff --git a/src/org/labkey/filetransfer/provider/Registry.java b/src/org/labkey/filetransfer/provider/Registry.java index d12e3e5..647cfc8 100644 --- a/src/org/labkey/filetransfer/provider/Registry.java +++ b/src/org/labkey/filetransfer/provider/Registry.java @@ -15,7 +15,8 @@ */ package org.labkey.filetransfer.provider; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.data.Container; import org.labkey.api.security.User; @@ -28,7 +29,7 @@ */ public class Registry { - private static final Logger logger = Logger.getLogger(Registry.class); + private static final Logger logger = LogManager.getLogger(Registry.class); private static Map> _providers = new ConcurrentHashMap<>(); private static Registry _instance = new Registry(); diff --git a/src/org/labkey/filetransfer/security/OAuth2Authenticator.java b/src/org/labkey/filetransfer/security/OAuth2Authenticator.java index 66b0878..aa74578 100644 --- a/src/org/labkey/filetransfer/security/OAuth2Authenticator.java +++ b/src/org/labkey/filetransfer/security/OAuth2Authenticator.java @@ -29,7 +29,8 @@ import com.google.api.client.json.JsonFactory; import com.google.api.client.json.jackson2.JacksonFactory; import com.google.api.client.util.store.DataStore; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.data.Container; import org.labkey.api.data.ContainerManager; import org.labkey.api.security.User; @@ -47,7 +48,7 @@ */ public abstract class OAuth2Authenticator { - private static final Logger logger = Logger.getLogger(OAuth2Authenticator.class); + private static final Logger logger = LogManager.getLogger(OAuth2Authenticator.class); public static final String ACCESS_TOKEN = "transferToken"; public static final String REFRESH_TOKEN = "refreshToken"; public static final String EXPIRE_TIME_MILLIS = "expireTimeMillis"; diff --git a/src/org/labkey/filetransfer/view/FileTransferWebPartConfigView.java b/src/org/labkey/filetransfer/view/FileTransferWebPartConfigView.java index 35b5322..d4033c5 100644 --- a/src/org/labkey/filetransfer/view/FileTransferWebPartConfigView.java +++ b/src/org/labkey/filetransfer/view/FileTransferWebPartConfigView.java @@ -15,7 +15,8 @@ */ package org.labkey.filetransfer.view; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.labkey.api.view.JspView; import org.labkey.api.view.Portal; import org.labkey.api.view.ViewContext; @@ -28,7 +29,7 @@ */ public class FileTransferWebPartConfigView extends JspView { - private static final Logger logger = Logger.getLogger(FileTransferWebPartConfigView.class); + private static final Logger logger = LogManager.getLogger(FileTransferWebPartConfigView.class); public FileTransferWebPartConfigView(Portal.WebPart webPart, ViewContext context) { super("/org/labkey/filetransfer/view/fileTransferWebPartConfig.jsp");