Skip to content

Item 7490: upgrade log4j #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-ankurj merged 2 commits into from
Aug 5, 2020
Merged

Item 7490: upgrade log4j #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f3410c
Item 7490: upgrade log4j
labkey-ankurj Jul 13, 2020
8c83f2c
Merge branch 'develop' into fb_log4J_upgrade
labkey-ankurj Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions snprc_ehr/src/org/labkey/snprc_ehr/SNPRCBeanFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.beanutils.PropertyUtils;
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.labkey.api.collections.CaseInsensitiveHashMap;
Expand All @@ -41,7 +42,7 @@
public class SNPRCBeanFactory<K> extends BeanObjectFactory<K>
{

private static Logger _log = Logger.getLogger(BeanObjectFactory.class);
private static Logger _log = LogManager.getLogger(BeanObjectFactory.class);
private Class<K> _class;


Expand Down
5 changes: 3 additions & 2 deletions snprc_ehr/src/org/labkey/snprc_ehr/notification/AbstractSSRSNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.util.IOUtils;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -61,7 +62,7 @@ public abstract class AbstractSSRSNotification implements Notification
private final String _textContent;
private Format _format;

private static final Logger LOG = Logger.getLogger(AbstractSSRSNotification.class);
private static final Logger LOG = LogManager.getLogger(AbstractSSRSNotification.class);
private final String _reportId;

public enum Format
Expand Down
5 changes: 3 additions & 2 deletions snprc_ehr/src/org/labkey/snprc_ehr/query/SNPRC_EHRTriggerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/
package org.labkey.snprc_ehr.query;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.data.CompareType;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -52,7 +53,7 @@

public class SNPRC_EHRTriggerHelper
{
private static final Logger _log = Logger.getLogger(SNPRC_EHRTriggerHelper.class);
private static final Logger _log = LogManager.getLogger(SNPRC_EHRTriggerHelper.class);
private Container _container = null;
private User _user = null;
private Map<String, TableInfo> _cachedTables = new HashMap<>();
Expand Down
5 changes: 3 additions & 2 deletions snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/
package org.labkey.snprc_ehr.table;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.AbstractTableInfo;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -47,7 +48,7 @@
*/
public class SNPRC_EHRCustomizer extends AbstractTableCustomizer
{
private static final Logger _log = Logger.getLogger(SNPRC_EHRCustomizer.class);
private static final Logger _log = LogManager.getLogger(SNPRC_EHRCustomizer.class);

public SNPRC_EHRCustomizer()
{
Expand Down
5 changes: 3 additions & 2 deletions snprc_ehr/src/org/labkey/snprc_ehr/views/AnimalsHierarchyWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
package org.labkey.snprc_ehr.views;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.view.JspView;

public class AnimalsHierarchyWebPart extends JspView
{
private static final Logger _log = Logger.getLogger(AnimalsHierarchyWebPart.class);
private static final Logger _log = LogManager.getLogger(AnimalsHierarchyWebPart.class);

public AnimalsHierarchyWebPart()
{
Expand Down
5 changes: 3 additions & 2 deletions snprc_scheduler/src/org/labkey/snprc_scheduler/view/SchedulerWebPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package org.labkey.snprc_scheduler.view;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.api.view.JspView;

public class SchedulerWebPart extends JspView
{
private static final Logger _log = Logger.getLogger(SchedulerWebPart.class);
private static final Logger _log = LogManager.getLogger(SchedulerWebPart.class);

public SchedulerWebPart()
{
Expand Down