Migrate to Tomcat 10

LabKey · Dec 23, 2023 · bd69d82 · bd69d82
1 parent 0c5a50a
commit bd69d82
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreController.java b/SkylineToolsStore/src/org/labkey/skylinetoolsstore/SkylineToolsStoreController.java
@@ -16,6 +16,9 @@
 
 package org.labkey.skylinetoolsstore;
 
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -87,9 +90,6 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

diff --git a/panoramapublic/src/org/labkey/panoramapublic/model/validation/SkylineDocValidation.java b/panoramapublic/src/org/labkey/panoramapublic/model/validation/SkylineDocValidation.java
@@ -1,6 +1,7 @@
 package org.labkey.panoramapublic.model.validation;
 
-import javax.validation.constraints.NotNull;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 import java.util.stream.Collectors;
 

diff --git a/testresults/build.gradle b/testresults/build.gradle
@@ -1,19 +1,3 @@
-import org.labkey.gradle.util.BuildUtils
-import org.labkey.gradle.util.ExternalDependency
-
 plugins {
     id 'org.labkey.build.module'
 }
-
-BuildUtils.addExternalDependency(
-        project,
-        new ExternalDependency(
-                "commons-fileupload:commons-fileupload:${commonsFileuploadVersion}",
-                "Commons File Upload",
-                "Apache",
-                "http://jakarta.apache.org/commons/fileupload/",
-                ExternalDependency.APACHE_2_LICENSE_NAME,
-                ExternalDependency.APACHE_2_LICENSE_URL,
-                "Parses HTTP multipart/form-data POSTs"
-        )
-)
diff --git a/testresults/src/org/labkey/testresults/TestResultsController.java b/testresults/src/org/labkey/testresults/TestResultsController.java
@@ -15,6 +15,7 @@
  */
 package org.labkey.testresults;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -90,7 +91,6 @@
 import org.xml.sax.InputSource;
 
 import javax.management.modelmbean.XMLParseException;
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.ByteArrayOutputStream;