Tomcat 10 - Update namespace of Jakarta EE packages (#1813)

LabKey · Feb 1, 2024 · 3408be6 · 3408be6
1 parent 37c1636
commit 3408be6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,6 @@ project.dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}")
     implementation("org.apache.commons:commons-collections4:${commonsCollections4Version}")
     implementation("net.sf.opencsv:opencsv:${opencsvVersion}")
-    implementation("javax.servlet:javax.servlet-api:${servletApiVersion}")
     aspectj "org.aspectj:aspectjtools:${aspectjVersion}"
     implementation "org.apache.logging.log4j:log4j-core:${log4j2Version}"
     implementation "org.apache.logging.log4j:log4j-iostreams:${log4j2Version}"

diff --git a/modules/dumbster/src/org/labkey/dumbster/DumbsterController.java b/modules/dumbster/src/org/labkey/dumbster/DumbsterController.java
@@ -42,7 +42,7 @@
 import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**

diff --git a/modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java b/modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java
@@ -25,9 +25,9 @@
 import org.labkey.api.util.ShutdownListener;
 import org.labkey.api.util.StringUtilsLabKey;
 
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/modules/dumbster/src/org/labkey/dumbster/view/MailWebPart.java b/modules/dumbster/src/org/labkey/dumbster/view/MailWebPart.java
@@ -21,7 +21,7 @@
 import org.labkey.dumbster.DumbsterController;
 import org.labkey.dumbster.model.DumbsterManager;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
 public class MailWebPart extends JspView<MailPage>
 {

diff --git a/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp b/modules/dumbster/src/org/labkey/dumbster/view/mailWebPart.jsp
@@ -27,8 +27,8 @@
 <%@ page import="org.labkey.dumbster.DumbsterController" %>
 <%@ page import="org.labkey.dumbster.model.DumbsterManager" %>
 <%@ page import="org.labkey.dumbster.view.MailPage" %>
-<%@ page import="javax.mail.MessagingException" %>
-<%@ page import="javax.mail.internet.MimeMessage" %>
+<%@ page import="jakarta.mail.MessagingException" %>
+<%@ page import="jakarta.mail.internet.MimeMessage" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.*" %>

diff --git a/src/org/labkey/test/components/ui/grids/EditableGrid.java b/src/org/labkey/test/components/ui/grids/EditableGrid.java
@@ -2,6 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.Assertions;
+import org.jetbrains.annotations.Nullable;
 import org.labkey.test.Locator;
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.components.Component;
@@ -21,7 +22,6 @@
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import javax.annotation.Nullable;
 import java.awt.*;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;

diff --git a/src/org/labkey/test/tests/core/login/PasswordTest.java b/src/org/labkey/test/tests/core/login/PasswordTest.java
@@ -16,6 +16,7 @@
 
 package org.labkey.test.tests.core.login;
 
+import org.apache.hc.core5.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -38,7 +39,6 @@
 import org.labkey.test.util.core.login.DbLoginUtils.PasswordExpiration;
 import org.labkey.test.util.core.login.DbLoginUtils.PasswordStrength;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -241,7 +241,7 @@ public void testPasswordParameter()
         }
         catch (CommandException e)
         {
-            if (HttpServletResponse.SC_BAD_REQUEST == e.getStatusCode())
+            if (HttpStatus.SC_BAD_REQUEST == e.getStatusCode())
                 rejectedProperly = true;
         }
         catch (IOException e)