Skip to content

Commit ab6f2ac

Browse files
Tomcat 10 - Update namespace of Jakarta EE packages (#190)
Co-authored-by: Adam Rauch <adam@labkey.com>
1 parent cab2685 commit ab6f2ac

File tree

14 files changed

+19
-20
lines changed

14 files changed

+19
-20
lines changed

LabPurchasing/src/org/labkey/labpurchasing/LabPurchasingTriggerHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.labkey.api.util.MailHelper;
1717
import org.labkey.api.util.PageFlowUtil;
1818

19-
import javax.mail.Message;
19+
import jakarta.mail.Message;
2020
import java.util.HashMap;
2121
import java.util.List;
2222
import java.util.Map;

mGAP/src/org/labkey/mgap/mGAPController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@
9898
import org.springframework.validation.Errors;
9999
import org.springframework.web.servlet.ModelAndView;
100100

101-
import javax.mail.Address;
102-
import javax.mail.Message;
103-
import javax.mail.internet.InternetAddress;
104-
import javax.servlet.http.HttpServletResponse;
101+
import jakarta.mail.Address;
102+
import jakarta.mail.Message;
103+
import jakarta.mail.internet.InternetAddress;
104+
import jakarta.servlet.http.HttpServletResponse;
105105
import java.io.BufferedInputStream;
106106
import java.io.File;
107107
import java.io.FileInputStream;

mGAP/src/org/labkey/mgap/pipeline/GroupCompareStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import htsjdk.samtools.util.Interval;
44
import org.apache.commons.lang3.StringUtils;
55
import org.apache.logging.log4j.Logger;
6+
import org.jetbrains.annotations.Nullable;
67
import org.json.JSONArray;
78
import org.json.JSONObject;
89
import org.labkey.api.pipeline.PipelineJob;
@@ -23,7 +24,6 @@
2324
import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
2425
import org.labkey.api.writer.PrintWriters;
2526

26-
import javax.annotation.Nullable;
2727
import java.io.BufferedReader;
2828
import java.io.File;
2929
import java.io.IOException;

mGAP/src/org/labkey/mgap/pipeline/IndexVariantsForMgapStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import htsjdk.samtools.util.Interval;
44
import org.apache.commons.lang3.StringUtils;
5+
import org.jetbrains.annotations.Nullable;
56
import org.json.JSONObject;
67
import org.labkey.api.data.Container;
78
import org.labkey.api.data.SimpleFilter;
@@ -26,7 +27,6 @@
2627
import org.labkey.api.util.PageFlowUtil;
2728
import org.labkey.mgap.mGAPSchema;
2829

29-
import javax.annotation.Nullable;
3030
import java.io.File;
3131
import java.util.Arrays;
3232
import java.util.List;

mGAP/src/org/labkey/mgap/pipeline/SampleSpecificGenotypeFiltrationStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import htsjdk.variant.vcf.VCFFileReader;
55
import htsjdk.variant.vcf.VCFHeader;
66
import org.apache.logging.log4j.Logger;
7+
import org.jetbrains.annotations.Nullable;
78
import org.json.JSONObject;
89
import org.labkey.api.pipeline.PipelineJob;
910
import org.labkey.api.pipeline.PipelineJobException;
@@ -23,7 +24,6 @@
2324
import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
2425
import org.labkey.api.writer.PrintWriters;
2526

26-
import javax.annotation.Nullable;
2727
import java.io.File;
2828
import java.io.IOException;
2929
import java.io.PrintWriter;

mGAP/src/org/labkey/mgap/pipeline/VcfComparisonStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import htsjdk.samtools.util.Interval;
44
import org.apache.logging.log4j.Logger;
5+
import org.jetbrains.annotations.Nullable;
56
import org.json.JSONObject;
67
import org.labkey.api.pipeline.PipelineJobException;
78
import org.labkey.api.sequenceanalysis.SequenceAnalysisService;
@@ -15,7 +16,6 @@
1516
import org.labkey.api.sequenceanalysis.run.AbstractCommandPipelineStep;
1617
import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
1718

18-
import javax.annotation.Nullable;
1919
import java.io.File;
2020
import java.util.ArrayList;
2121
import java.util.Arrays;

mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAlleleFreqStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import htsjdk.samtools.util.Interval;
44
import org.apache.logging.log4j.Logger;
5+
import org.jetbrains.annotations.Nullable;
56
import org.json.JSONObject;
67
import org.labkey.api.pipeline.PipelineJobException;
78
import org.labkey.api.sequenceanalysis.SequenceAnalysisService;
@@ -16,7 +17,6 @@
1617
import org.labkey.api.sequenceanalysis.run.AbstractDiscvrSeqWrapper;
1718
import org.labkey.api.util.PageFlowUtil;
1819

19-
import javax.annotation.Nullable;
2020
import java.io.File;
2121
import java.util.ArrayList;
2222
import java.util.List;

mGAP/src/org/labkey/mgap/pipeline/mGapReleaseAnnotateNovelSitesStep.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import htsjdk.samtools.util.Interval;
44
import org.apache.commons.lang3.math.NumberUtils;
55
import org.apache.logging.log4j.Logger;
6+
import org.jetbrains.annotations.Nullable;
67
import org.json.JSONObject;
78
import org.labkey.api.data.SimpleFilter;
89
import org.labkey.api.data.TableSelector;
@@ -24,7 +25,6 @@
2425
import org.labkey.api.util.PageFlowUtil;
2526
import org.labkey.mgap.mGAPSchema;
2627

27-
import javax.annotation.Nullable;
2828
import java.io.File;
2929
import java.util.ArrayList;
3030
import java.util.Arrays;

mGAP/src/org/labkey/mgap/pipeline/mGapReleaseComparisonStep.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.labkey.mgap.pipeline;
22

33
import htsjdk.samtools.util.Interval;
4+
import org.jetbrains.annotations.Nullable;
45
import org.json.JSONObject;
56
import org.labkey.api.pipeline.PipelineJob;
67
import org.labkey.api.pipeline.PipelineJobException;
@@ -18,10 +19,8 @@
1819
import org.labkey.api.sequenceanalysis.run.AbstractCommandPipelineStep;
1920
import org.labkey.api.util.PageFlowUtil;
2021

21-
import javax.annotation.Nullable;
2222
import java.io.File;
2323
import java.util.ArrayList;
24-
import java.util.Arrays;
2524
import java.util.List;
2625

2726
/**

mcc/src/org/labkey/mcc/MccController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
import org.springframework.validation.Errors;
7777
import org.springframework.web.servlet.ModelAndView;
7878

79-
import javax.mail.Address;
80-
import javax.mail.Message;
79+
import jakarta.mail.Address;
80+
import jakarta.mail.Message;
8181
import java.util.ArrayList;
8282
import java.util.Arrays;
8383
import java.util.HashMap;

0 commit comments

Comments
 (0)