Skip to content

Item 7490: upgrade log4j #285

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 #285

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
ffcf751
Item 7490: upgrade log4j
labkey-ankurj Jul 10, 2020
41f75ac
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 src/org/labkey/cds/CDSController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
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.jetbrains.annotations.NotNull;
import org.json.JSONObject;
import org.labkey.api.action.Action;
Expand Down Expand Up @@ -145,7 +146,7 @@ public class CDSController extends SpringActionController
}
}

private static final Logger LOG = Logger.getLogger(CDSController.class);
private static final Logger LOG = LogManager.getLogger(CDSController.class);

private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(CDSController.class);

Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/cds/CDSModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package org.labkey.cds;

import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -258,7 +258,7 @@ private String ensureShortcut(ModuleProperty prop, String prevTarget, String sou
}
catch (IllegalArgumentException x)
{
Logger.getLogger(CDSModule.class).warn("Could not create shortcut from '" + source + "' to '" + target + "'.");
LogManager.getLogger(CDSModule.class).warn("Could not create shortcut from '" + source + "' to '" + target + "'.");
}
}
return target;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/CDSImportCopyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
import org.labkey.api.data.DbSchema;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/TSVCopyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
import org.labkey.api.dataiterator.DataIteratorBuilder;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/steps/AbstractPopulateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package org.labkey.cds.data.steps;

import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.Container;
import org.labkey.api.module.FolderTypeManager;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/steps/CDSImportTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/steps/CDSValidateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/steps/ClearAndWarmCube.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.cache.CacheManager;
import org.labkey.api.pipeline.PipelineJobException;
import org.labkey.api.query.QueryService;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/steps/ClearMappingTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.Container;
import org.labkey.api.data.TableInfo;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/ContainerSensitivePopulateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/data/steps/PopulateAssayTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/PopulateDatasetTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
Expand All @@ -27,7 +27,6 @@
import org.labkey.api.query.QuerySchema;
import org.labkey.api.query.QueryUpdateService;
import org.labkey.api.query.ValidationException;
import org.labkey.api.security.User;
import org.labkey.api.util.DateUtil;

import java.util.Arrays;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/PopulateFactsTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/PopulateGridBaseTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/PopulateRelationshipTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/PopulateStudiesTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.data.NormalContainerType;
import org.labkey.api.data.SQLFragment;
Expand Down
4 changes: 1 addition & 3 deletions src/org/labkey/cds/data/steps/PopulateStudyVisitTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/cds/data/steps/PopulateTreatmentArmTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
*/
package org.labkey.cds.data.steps;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerFilterable;
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
Expand Down
1 change: 0 additions & 1 deletion src/org/labkey/cds/query/MabGroupTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.labkey.cds.query;

import org.jetbrains.annotations.NotNull;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.CompareType;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/cds/view/cms.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* limitations under the License.
*/
%>
<%@ page import="org.labkey.cds.CDSController" %>
<%@ page import="org.labkey.api.view.HttpView" %>
<%@ page import="org.labkey.cds.CDSController" %>
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
<%@ page extends="org.labkey.api.jsp.JspBase" %>
<%
Expand Down