Skip to content

Commit 34d466e

Browse files
Tomcat 10 - Update namespace of Jakarta EE packages (#133)
Co-authored-by: Adam Rauch <adam@labkey.com>
1 parent 808db1e commit 34d466e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

genotyping/src/org/labkey/genotyping/GenotypingController.java

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

1717
package org.labkey.genotyping;
1818

19+
import jakarta.servlet.http.HttpServletResponse;
1920
import org.apache.commons.io.IOUtils;
2021
import org.apache.logging.log4j.LogManager;
2122
import org.apache.logging.log4j.Logger;
@@ -113,7 +114,6 @@
113114
import org.springframework.validation.Errors;
114115
import org.springframework.web.servlet.ModelAndView;
115116

116-
import javax.servlet.http.HttpServletResponse;
117117
import java.io.File;
118118
import java.io.FileInputStream;
119119
import java.io.FileNotFoundException;

genotyping/src/org/labkey/genotyping/HaplotypeDataCollector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
*/
1616
package org.labkey.genotyping;
1717

18+
import jakarta.servlet.http.HttpServletRequest;
1819
import org.apache.commons.lang3.StringUtils;
1920
import org.jetbrains.annotations.NotNull;
20-
import org.labkey.api.exp.ExperimentException;
21-
import org.labkey.api.exp.api.ExpProtocol;
2221
import org.labkey.api.assay.AbstractTempDirDataCollector;
2322
import org.labkey.api.assay.AssayRunUploadContext;
23+
import org.labkey.api.exp.ExperimentException;
24+
import org.labkey.api.exp.api.ExpProtocol;
2425
import org.labkey.api.view.HttpView;
2526
import org.labkey.api.view.JspView;
2627

27-
import javax.servlet.http.HttpServletRequest;
2828
import java.io.ByteArrayInputStream;
2929
import java.io.File;
3030
import java.io.IOException;

genotyping/src/org/labkey/genotyping/ReadsJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.labkey.genotyping;
1717

18+
import jakarta.mail.MessagingException;
1819
import org.jetbrains.annotations.NotNull;
1920
import org.jetbrains.annotations.Nullable;
2021
import org.labkey.api.data.DbScope;
@@ -35,7 +36,6 @@
3536
import org.labkey.api.util.URLHelper;
3637
import org.labkey.api.view.ViewBackgroundInfo;
3738

38-
import javax.mail.MessagingException;
3939
import java.io.File;
4040
import java.util.Arrays;
4141
import java.util.Collections;

0 commit comments

Comments
 (0)