diff --git a/LabPurchasing/src/org/labkey/labpurchasing/LabPurchasingTriggerHelper.java b/LabPurchasing/src/org/labkey/labpurchasing/LabPurchasingTriggerHelper.java
index f79c3688e..4e86852b8 100644
--- a/LabPurchasing/src/org/labkey/labpurchasing/LabPurchasingTriggerHelper.java
+++ b/LabPurchasing/src/org/labkey/labpurchasing/LabPurchasingTriggerHelper.java
@@ -16,7 +16,7 @@
 import org.labkey.api.util.MailHelper;
 import org.labkey.api.util.PageFlowUtil;
 
-import javax.mail.Message;
+import jakarta.mail.Message;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/mGAP/src/org/labkey/mgap/mGAPController.java b/mGAP/src/org/labkey/mgap/mGAPController.java
index 657cfcb0a..aeade8aa8 100644
--- a/mGAP/src/org/labkey/mgap/mGAPController.java
+++ b/mGAP/src/org/labkey/mgap/mGAPController.java
@@ -98,10 +98,10 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.internet.InternetAddress;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/GroupCompareStep.java b/mGAP/src/org/labkey/mgap/pipeline/GroupCompareStep.java
index d6272f263..1fd0e68ab 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/GroupCompareStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/GroupCompareStep.java
@@ -3,6 +3,7 @@
 import htsjdk.samtools.util.Interval;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJob;
@@ -23,7 +24,6 @@
 import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
 import org.labkey.api.writer.PrintWriters;
 
-import javax.annotation.Nullable;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/IndexVariantsForMgapStep.java b/mGAP/src/org/labkey/mgap/pipeline/IndexVariantsForMgapStep.java
index 35ca79d17..c2aad3905 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/IndexVariantsForMgapStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/IndexVariantsForMgapStep.java
@@ -2,6 +2,7 @@
 
 import htsjdk.samtools.util.Interval;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.SimpleFilter;
@@ -26,7 +27,6 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.mgap.mGAPSchema;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/SampleSpecificGenotypeFiltrationStep.java b/mGAP/src/org/labkey/mgap/pipeline/SampleSpecificGenotypeFiltrationStep.java
index 945d2301d..4bfa60ec8 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/SampleSpecificGenotypeFiltrationStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/SampleSpecificGenotypeFiltrationStep.java
@@ -4,6 +4,7 @@
 import htsjdk.variant.vcf.VCFFileReader;
 import htsjdk.variant.vcf.VCFHeader;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJob;
 import org.labkey.api.pipeline.PipelineJobException;
@@ -23,7 +24,6 @@
 import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
 import org.labkey.api.writer.PrintWriters;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/VcfComparisonStep.java b/mGAP/src/org/labkey/mgap/pipeline/VcfComparisonStep.java
index 9050c8fa9..d77e21a13 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/VcfComparisonStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/VcfComparisonStep.java
@@ -2,6 +2,7 @@
 
 import htsjdk.samtools.util.Interval;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJobException;
 import org.labkey.api.sequenceanalysis.SequenceAnalysisService;
@@ -15,7 +16,6 @@
 import org.labkey.api.sequenceanalysis.run.AbstractCommandPipelineStep;
 import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAlleleFreqStep.java b/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAlleleFreqStep.java
index 74c40baf0..8d3790fac 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAlleleFreqStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAlleleFreqStep.java
@@ -2,6 +2,7 @@
 
 import htsjdk.samtools.util.Interval;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJobException;
 import org.labkey.api.sequenceanalysis.SequenceAnalysisService;
@@ -16,7 +17,6 @@
 import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
 import org.labkey.api.util.PageFlowUtil;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAnnotateNovelSitesStep.java b/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAnnotateNovelSitesStep.java
index 49dbb5c3f..70e30aaf1 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAnnotateNovelSitesStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAnnotateNovelSitesStep.java
@@ -3,6 +3,7 @@
 import htsjdk.samtools.util.Interval;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.data.SimpleFilter;
 import org.labkey.api.data.TableSelector;
@@ -24,7 +25,6 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.mgap.mGAPSchema;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseComparisonStep.java b/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseComparisonStep.java
index 58df4b528..1caeab897 100644
--- a/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseComparisonStep.java
+++ b/mGAP/src/org/labkey/mgap/pipeline/mGapReleaseComparisonStep.java
@@ -1,6 +1,7 @@
 package org.labkey.mgap.pipeline;
 
 import htsjdk.samtools.util.Interval;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJob;
 import org.labkey.api.pipeline.PipelineJobException;
@@ -18,10 +19,8 @@
 import org.labkey.api.sequenceanalysis.run.AbstractCommandPipelineStep;
 import org.labkey.api.util.PageFlowUtil;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
diff --git a/mcc/src/org/labkey/mcc/MccController.java b/mcc/src/org/labkey/mcc/MccController.java
index 38c6e76d2..2fc49a80f 100644
--- a/mcc/src/org/labkey/mcc/MccController.java
+++ b/mcc/src/org/labkey/mcc/MccController.java
@@ -76,8 +76,8 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.mail.Address;
-import javax.mail.Message;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/mcc/src/org/labkey/mcc/MccManager.java b/mcc/src/org/labkey/mcc/MccManager.java
index 7b5b8d1b7..9ce036caa 100644
--- a/mcc/src/org/labkey/mcc/MccManager.java
+++ b/mcc/src/org/labkey/mcc/MccManager.java
@@ -16,6 +16,7 @@
 
 package org.labkey.mcc;
 
+import jakarta.mail.Address;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -35,7 +36,6 @@
 import org.labkey.mcc.security.MccRequestAdminPermission;
 import org.labkey.mcc.security.MccRequestorPermission;
 
-import javax.mail.Address;
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/mcc/src/org/labkey/mcc/query/TriggerHelper.java b/mcc/src/org/labkey/mcc/query/TriggerHelper.java
index 67cdfad60..957339003 100644
--- a/mcc/src/org/labkey/mcc/query/TriggerHelper.java
+++ b/mcc/src/org/labkey/mcc/query/TriggerHelper.java
@@ -35,8 +35,8 @@
 import org.labkey.mcc.MccManager;
 import org.labkey.mcc.MccSchema;
 
-import javax.mail.Address;
-import javax.mail.Message;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/primeseq/src/org/labkey/primeseq/pipeline/GeographicOriginStep.java b/primeseq/src/org/labkey/primeseq/pipeline/GeographicOriginStep.java
index 8a14cd729..f1634cd48 100644
--- a/primeseq/src/org/labkey/primeseq/pipeline/GeographicOriginStep.java
+++ b/primeseq/src/org/labkey/primeseq/pipeline/GeographicOriginStep.java
@@ -2,6 +2,7 @@
 
 import htsjdk.samtools.util.Interval;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 import org.labkey.api.pipeline.PipelineJobException;
 import org.labkey.api.sequenceanalysis.pipeline.AbstractPipelineStep;
@@ -15,7 +16,6 @@
 import org.labkey.api.sequenceanalysis.pipeline.VariantProcessingStepOutputImpl;
 import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/tcrdb/src/org/labkey/tcrdb/TCRdbController.java b/tcrdb/src/org/labkey/tcrdb/TCRdbController.java
index d5e12281a..54bed8c81 100644
--- a/tcrdb/src/org/labkey/tcrdb/TCRdbController.java
+++ b/tcrdb/src/org/labkey/tcrdb/TCRdbController.java
@@ -59,7 +59,7 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;