diff --git a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBController.java b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBController.java
index d49a236d1..88fae1896 100644
--- a/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBController.java
+++ b/EHR_ComplianceDB/src/org/labkey/ehr_compliancedb/EHR_ComplianceDBController.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr_compliancedb;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.action.SpringActionController;
 
 /**
@@ -26,7 +27,7 @@
 public class EHR_ComplianceDBController extends SpringActionController
 {
     private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(EHR_ComplianceDBController.class);
-    private static final Logger _log = Logger.getLogger(EHR_ComplianceDBController.class);
+    private static final Logger _log = LogManager.getLogger(EHR_ComplianceDBController.class);
 
     public EHR_ComplianceDBController()
     {
diff --git a/Viral_Load_Assay/src/org/labkey/viral_load_assay/Viral_Load_Manager.java b/Viral_Load_Assay/src/org/labkey/viral_load_assay/Viral_Load_Manager.java
index c242d8f72..77007f24a 100644
--- a/Viral_Load_Assay/src/org/labkey/viral_load_assay/Viral_Load_Manager.java
+++ b/Viral_Load_Assay/src/org/labkey/viral_load_assay/Viral_Load_Manager.java
@@ -29,7 +29,7 @@ public class Viral_Load_Manager
 
     public static String VL_ASSAY_PROVIDER_NAME = "Viral Loads";
 
-    //private static final Logger _log = Logger.getLogger(Viral_Load_Manager.class);
+    //private static final Logger _log = LogManager.getLogger(Viral_Load_Manager.class);
 
     private Viral_Load_Manager()
     {
diff --git a/Viral_Load_Assay/src/org/labkey/viral_load_assay/assay/ABI7500ImportMethod.java b/Viral_Load_Assay/src/org/labkey/viral_load_assay/assay/ABI7500ImportMethod.java
index 41666eec3..71f8ec8aa 100644
--- a/Viral_Load_Assay/src/org/labkey/viral_load_assay/assay/ABI7500ImportMethod.java
+++ b/Viral_Load_Assay/src/org/labkey/viral_load_assay/assay/ABI7500ImportMethod.java
@@ -19,7 +19,7 @@
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
-import org.apache.log4j.Level;
+import org.apache.logging.log4j.Level;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/AbstractFormSection.java b/ehr/api-src/org/labkey/api/ehr/dataentry/AbstractFormSection.java
index 2a7d3853b..cc3575499 100644
--- a/ehr/api-src/org/labkey/api/ehr/dataentry/AbstractFormSection.java
+++ b/ehr/api-src/org/labkey/api/ehr/dataentry/AbstractFormSection.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.api.ehr.dataentry;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 import org.labkey.api.data.TableInfo;
@@ -68,7 +69,7 @@ abstract public class AbstractFormSection implements FormSection
 
     private List<Supplier<ClientDependency>> _clientDependencies = new ArrayList<>();
 
-    protected static final Logger _log = Logger.getLogger(AbstractFormSection.class);
+    protected static final Logger _log = LogManager.getLogger(AbstractFormSection.class);
 
     public AbstractFormSection(String name, String label, String xtype)
     {
diff --git a/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java b/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java
index 4789f61e2..a9fa61db2 100644
--- a/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java
+++ b/ehr/api-src/org/labkey/api/ehr/dataentry/DefaultDataEntryFormFactory.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.api.ehr.dataentry;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.module.Module;
 
@@ -31,7 +32,7 @@
  */
 public class DefaultDataEntryFormFactory implements DataEntryFormFactory
 {
-    private Logger _log = Logger.getLogger(DefaultDataEntryFormFactory.class);
+    private Logger _log = LogManager.getLogger(DefaultDataEntryFormFactory.class);
     Class<? extends DataEntryForm> _clazz;
     Module _module;
 
diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
index d149a3cac..6de2327fc 100644
--- a/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
+++ b/ehr/api-src/org/labkey/api/ehr/demographics/AbstractDemographicsProvider.java
@@ -16,7 +16,8 @@
 package org.labkey.api.ehr.demographics;
 
 import org.apache.commons.lang3.time.DurationFormatUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
@@ -56,7 +57,7 @@
  */
 abstract public class AbstractDemographicsProvider extends EHROwnable implements DemographicsProvider
 {
-    protected static final Logger _log = Logger.getLogger(AbstractDemographicsProvider.class);
+    protected static final Logger _log = LogManager.getLogger(AbstractDemographicsProvider.class);
 
     private String _schemaName;
     private String _queryName;
diff --git a/ehr/api-src/org/labkey/api/ehr/history/AbstractDataSource.java b/ehr/api-src/org/labkey/api/ehr/history/AbstractDataSource.java
index 0799c8927..73e1a2d5a 100644
--- a/ehr/api-src/org/labkey/api/ehr/history/AbstractDataSource.java
+++ b/ehr/api-src/org/labkey/api/ehr/history/AbstractDataSource.java
@@ -16,7 +16,8 @@
 package org.labkey.api.ehr.history;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.ColumnInfo;
@@ -64,7 +65,7 @@ abstract public class AbstractDataSource extends EHROwnable implements HistoryDa
     private String _name;
     private boolean _showTime = false;
     protected String _subjectIdField = "Id";
-    protected static final Logger _log = Logger.getLogger(HistoryDataSource.class);
+    protected static final Logger _log = LogManager.getLogger(HistoryDataSource.class);
 
     public AbstractDataSource(String schema, String query, Module module)
     {
diff --git a/ehr/api-src/org/labkey/api/ehr/history/DefaultLabworkType.java b/ehr/api-src/org/labkey/api/ehr/history/DefaultLabworkType.java
index e24718f24..baf757ffb 100644
--- a/ehr/api-src/org/labkey/api/ehr/history/DefaultLabworkType.java
+++ b/ehr/api-src/org/labkey/api/ehr/history/DefaultLabworkType.java
@@ -16,7 +16,8 @@
 package org.labkey.api.ehr.history;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
@@ -74,7 +75,7 @@ public class DefaultLabworkType implements LabworkType
     protected String _normalRangeField = null;
     protected String _normalRangeStatusField = null;
 
-    private static final Logger _log = Logger.getLogger(DefaultLabworkType.class);
+    private static final Logger _log = LogManager.getLogger(DefaultLabworkType.class);
     @NotNull
     private final Module _declaringModule;
 
diff --git a/ehr/api-src/org/labkey/api/ehr/history/HistoryRowImpl.java b/ehr/api-src/org/labkey/api/ehr/history/HistoryRowImpl.java
index 72991686a..d81ca760b 100644
--- a/ehr/api-src/org/labkey/api/ehr/history/HistoryRowImpl.java
+++ b/ehr/api-src/org/labkey/api/ehr/history/HistoryRowImpl.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.api.ehr.history;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.json.JSONObject;
 
 import java.text.SimpleDateFormat;
@@ -49,7 +50,7 @@ public class HistoryRowImpl implements HistoryRow
     private String _objectId;
     private String _html;
 
-    protected static final Logger _log = Logger.getLogger(HistoryRowImpl.class);
+    protected static final Logger _log = LogManager.getLogger(HistoryRowImpl.class);
 
     protected final SimpleDateFormat _timeFormat = new SimpleDateFormat("kk:mm");
 
diff --git a/ehr/api-src/org/labkey/api/ehr/table/AssignedAtTimeForeignKey.java b/ehr/api-src/org/labkey/api/ehr/table/AssignedAtTimeForeignKey.java
index d7f0ce444..702987f3e 100644
--- a/ehr/api-src/org/labkey/api/ehr/table/AssignedAtTimeForeignKey.java
+++ b/ehr/api-src/org/labkey/api/ehr/table/AssignedAtTimeForeignKey.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.api.ehr.table;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
@@ -31,7 +32,7 @@
 
 public class AssignedAtTimeForeignKey extends LookupForeignKey
 {
-    private static final Logger _log = Logger.getLogger(AssignedAtTimeForeignKey.class);
+    private static final Logger _log = LogManager.getLogger(AssignedAtTimeForeignKey.class);
 
     private AbstractTableInfo _tableInfo;
     private ColumnInfo _pkCol;
diff --git a/ehr/api-src/org/labkey/api/ehr/table/AssignmentAtTimeForeignKey.java b/ehr/api-src/org/labkey/api/ehr/table/AssignmentAtTimeForeignKey.java
index 64f6eca6c..6a0a7e273 100644
--- a/ehr/api-src/org/labkey/api/ehr/table/AssignmentAtTimeForeignKey.java
+++ b/ehr/api-src/org/labkey/api/ehr/table/AssignmentAtTimeForeignKey.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.api.ehr.table;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.data.AbstractTableInfo;
 import org.labkey.api.data.BaseColumnInfo;
 import org.labkey.api.data.ColumnInfo;
@@ -31,7 +32,7 @@
 
 public class AssignmentAtTimeForeignKey extends LookupForeignKey
 {
-    private static final Logger _log = Logger.getLogger(AssignmentAtTimeForeignKey.class);
+    private static final Logger _log = LogManager.getLogger(AssignmentAtTimeForeignKey.class);
 
     private AbstractTableInfo _tableInfo;
     private ColumnInfo _pkCol;
diff --git a/ehr/src/org/labkey/ehr/EHRManager.java b/ehr/src/org/labkey/ehr/EHRManager.java
index 31f75ddc9..a489bc458 100644
--- a/ehr/src/org/labkey/ehr/EHRManager.java
+++ b/ehr/src/org/labkey/ehr/EHRManager.java
@@ -17,7 +17,8 @@
 
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.apache.xmlbeans.XmlException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -125,7 +126,7 @@ public class EHRManager
     @Queryable
     public static final String OBS_CATEGORY_OBSERVATIONS = "Observations";
 
-    private static final Logger _log = Logger.getLogger(EHRManager.class);
+    private static final Logger _log = LogManager.getLogger(EHRManager.class);
 
     private EHRManager()
     {
diff --git a/ehr/src/org/labkey/ehr/EHRServiceImpl.java b/ehr/src/org/labkey/ehr/EHRServiceImpl.java
index be783b506..d16647c27 100644
--- a/ehr/src/org/labkey/ehr/EHRServiceImpl.java
+++ b/ehr/src/org/labkey/ehr/EHRServiceImpl.java
@@ -17,7 +17,8 @@
 
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
@@ -105,7 +106,7 @@ public class EHRServiceImpl extends EHRService
     private Set<Module> _modulesRequiringLegacyExt3UI = new HashSet<>();
     private ProjectValidator _projectValidator = null;
 
-    private static final Logger _log = Logger.getLogger(EHRServiceImpl.class);
+    private static final Logger _log = LogManager.getLogger(EHRServiceImpl.class);
 
     public EHRServiceImpl()
     {
diff --git a/ehr/src/org/labkey/ehr/dataentry/DataEntryManager.java b/ehr/src/org/labkey/ehr/dataentry/DataEntryManager.java
index 78a31149b..fc533a483 100644
--- a/ehr/src/org/labkey/ehr/dataentry/DataEntryManager.java
+++ b/ehr/src/org/labkey/ehr/dataentry/DataEntryManager.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.dataentry;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.cache.Cache;
 import org.labkey.api.cache.CacheManager;
 import org.labkey.api.data.ColumnInfo;
@@ -54,7 +55,7 @@
 public class DataEntryManager
 {
     private static final DataEntryManager _instance = new DataEntryManager();
-    private static final Logger _log = Logger.getLogger(DataEntryManager.class);
+    private static final Logger _log = LogManager.getLogger(DataEntryManager.class);
     private List<DataEntryFormFactory> _forms = new ArrayList<>();
     private Map<String, List<FieldKey>> _defaultFieldKeys = new HashMap<>();
     private List<SingleQueryFormProvider> _queryProviders =  new ArrayList<>();
diff --git a/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java b/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java
index 1d433c44a..002615c68 100644
--- a/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java
+++ b/ehr/src/org/labkey/ehr/dataentry/RecordDeleteRunner.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.dataentry;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.collections.CaseInsensitiveHashMap;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
@@ -65,7 +66,7 @@ public class RecordDeleteRunner implements Job
 {
     public static final String PROPERTY_DOMAIN = "org.labkey.ehr.recorddeletion";
     public static final String ENABLED_PROP = "isEnabled";
-    private static final Logger _log = Logger.getLogger(RecordDeleteRunner.class);
+    private static final Logger _log = LogManager.getLogger(RecordDeleteRunner.class);
     private static final int _hour = 23;
     private static final int _minute = 30;
 
diff --git a/ehr/src/org/labkey/ehr/demographics/EHRDemographicsServiceImpl.java b/ehr/src/org/labkey/ehr/demographics/EHRDemographicsServiceImpl.java
index 2db96a9ad..e3550f613 100644
--- a/ehr/src/org/labkey/ehr/demographics/EHRDemographicsServiceImpl.java
+++ b/ehr/src/org/labkey/ehr/demographics/EHRDemographicsServiceImpl.java
@@ -18,7 +18,8 @@
 import com.google.common.collect.MapDifference;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.cache.Cache;
 import org.labkey.api.cache.CacheManager;
@@ -78,7 +79,7 @@
  */
 public class EHRDemographicsServiceImpl extends EHRDemographicsService
 {
-    private static final Logger _log = Logger.getLogger(EHRDemographicsServiceImpl.class);
+    private static final Logger _log = LogManager.getLogger(EHRDemographicsServiceImpl.class);
     private static JobDetail _job = null;
 
     private Cache<String, AnimalRecordImpl> _cache;
diff --git a/ehr/src/org/labkey/ehr/demographics/EHRProjectValidator.java b/ehr/src/org/labkey/ehr/demographics/EHRProjectValidator.java
index 37979e196..213ace401 100644
--- a/ehr/src/org/labkey/ehr/demographics/EHRProjectValidator.java
+++ b/ehr/src/org/labkey/ehr/demographics/EHRProjectValidator.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.demographics;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;
diff --git a/ehr/src/org/labkey/ehr/history/ClinicalHistoryManager.java b/ehr/src/org/labkey/ehr/history/ClinicalHistoryManager.java
index 13c79e1e6..743c05756 100644
--- a/ehr/src/org/labkey/ehr/history/ClinicalHistoryManager.java
+++ b/ehr/src/org/labkey/ehr/history/ClinicalHistoryManager.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.history;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.data.Container;
 import org.labkey.api.ehr.history.HistoryDataSource;
 import org.labkey.api.ehr.history.HistoryRow;
@@ -38,7 +39,7 @@
 public class ClinicalHistoryManager
 {
     private static final ClinicalHistoryManager _instance = new ClinicalHistoryManager();
-    private static final Logger _log = Logger.getLogger(ClinicalHistoryManager.class);
+    private static final Logger _log = LogManager.getLogger(ClinicalHistoryManager.class);
 
     private final List<HistoryDataSource> _dataSources = new ArrayList<>();
 
diff --git a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java
index 4e96fb0e2..20b0a816d 100644
--- a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java
+++ b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsJob.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.pipeline;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.data.PropertyManager;
@@ -48,7 +49,7 @@
 public class GeneticCalculationsJob implements Job
 {
     public final static String GENETICCALCULATIONS_PROPERTY_DOMAIN = "org.labkey.ehr.geneticcalculations";
-    private static final Logger _log = Logger.getLogger(GeneticCalculationsJob.class);
+    private static final Logger _log = LogManager.getLogger(GeneticCalculationsJob.class);
     private static TriggerKey _jobKey = null;
 
     public GeneticCalculationsJob()
diff --git a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsRunnable.java b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsRunnable.java
index 646be70fb..a3a5b54b7 100644
--- a/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsRunnable.java
+++ b/ehr/src/org/labkey/ehr/pipeline/GeneticCalculationsRunnable.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.pipeline;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.labkey.api.data.Container;
 import org.labkey.api.pipeline.PipeRoot;
 import org.labkey.api.pipeline.PipelineJobException;
@@ -53,7 +54,7 @@
 public class GeneticCalculationsRunnable
 {
     private final String KINSHIP_PIPELINE_NAME = "kinshipPipeline";
-    private final Logger _log = Logger.getLogger(GeneticCalculationsRunnable.class);
+    private final Logger _log = LogManager.getLogger(GeneticCalculationsRunnable.class);
 
     public boolean run(Container c, boolean allowRunningDuringDay) throws PipelineJobException
     {
diff --git a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
index 60f9927d1..857bed3ef 100644
--- a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
+++ b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.ehr.table;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
@@ -92,7 +93,7 @@ public class DefaultEHRCustomizer extends AbstractTableCustomizer
     public static final String ID_COL = "Id";
     public static final String PARTICIPANT_CONCEPT_URI = "http://cpas.labkey.com/Study#ParticipantId";
 
-    private static final Logger _log = Logger.getLogger(DefaultEHRCustomizer.class);
+    private static final Logger _log = LogManager.getLogger(DefaultEHRCustomizer.class);
     private boolean _addLinkDisablers = true;
     private static final String MORE_ACTIONS = "More Actions";
 
diff --git a/ehr/src/org/labkey/ehr/table/SNOMEDCodesDisplayColumn.java b/ehr/src/org/labkey/ehr/table/SNOMEDCodesDisplayColumn.java
index 3cfb98b00..ff944a7a1 100644
--- a/ehr/src/org/labkey/ehr/table/SNOMEDCodesDisplayColumn.java
+++ b/ehr/src/org/labkey/ehr/table/SNOMEDCodesDisplayColumn.java
@@ -16,7 +16,8 @@
 package org.labkey.ehr.table;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.DataColumn;
@@ -38,7 +39,7 @@
  */
 public class SNOMEDCodesDisplayColumn extends DataColumn
 {
-    private static final Logger _log = Logger.getLogger(SNOMEDCodesDisplayColumn.class);
+    private static final Logger _log = LogManager.getLogger(SNOMEDCodesDisplayColumn.class);
 
     public SNOMEDCodesDisplayColumn(ColumnInfo col)
     {
diff --git a/ehr/src/org/labkey/ehr/utils/TriggerScriptHelper.java b/ehr/src/org/labkey/ehr/utils/TriggerScriptHelper.java
index 38cda79f3..74d35589d 100644
--- a/ehr/src/org/labkey/ehr/utils/TriggerScriptHelper.java
+++ b/ehr/src/org/labkey/ehr/utils/TriggerScriptHelper.java
@@ -18,7 +18,8 @@
 import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
@@ -125,7 +126,7 @@ public class TriggerScriptHelper
     //NOTE: consider moving these to SharedCache, to allow them to be shared across scripts, yet reset from admin console
     private Map<Integer, String> _cachedAccounts = new HashMap<>();
 
-    private static final Logger _log = Logger.getLogger(TriggerScriptHelper.class);
+    private static final Logger _log = LogManager.getLogger(TriggerScriptHelper.class);
 
     private TriggerScriptHelper(int userId, String containerId)
     {
diff --git a/ehr_billing/api-src/org/labkey/api/ehr_billing/pipeline/InvoicedItemsProcessingService.java b/ehr_billing/api-src/org/labkey/api/ehr_billing/pipeline/InvoicedItemsProcessingService.java
index f02d9ae08..a94cd81a6 100644
--- a/ehr_billing/api-src/org/labkey/api/ehr_billing/pipeline/InvoicedItemsProcessingService.java
+++ b/ehr_billing/api-src/org/labkey/api/ehr_billing/pipeline/InvoicedItemsProcessingService.java
@@ -15,7 +15,8 @@
  */
 package org.labkey.api.ehr_billing.pipeline;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.CompareType;
 import org.labkey.api.data.Container;