Migrate from javax.servlet to jakarta.servlet.

pom.xml

@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>samskivert</artifactId>
-      <version>1.10</version>
+      <version>1.11</version>
     </dependency>
     <dependency>
       <groupId>com.samskivert</groupId>
@@ -58,9 +58,9 @@
       <version>5.1.0</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
     <!-- https://mvnrepository.com/artifact/de.mkammerer/argon2-jvm -->

src/main/java/com/threerings/servlet/DepotSiteIdentifier.java

@@ -9,7 +9,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

src/main/java/com/threerings/user/AffiliateInfo.java

@@ -8,9 +8,9 @@ import static com.threerings.user.Log.log;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.samskivert.io.PersistenceException;
 import com.samskivert.servlet.SiteIdentifier;

src/main/java/com/threerings/user/OOOSiteIdentifier.java

@@ -6,7 +6,7 @@ package com.threerings.user;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.google.common.collect.Lists;
 

src/main/java/com/threerings/user/OOOUserManager.java

@@ -5,7 +5,7 @@ package com.threerings.user;
 
 import java.util.Map;
 import java.util.Properties;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.google.common.collect.Maps;
 

src/main/java/com/threerings/user/UserDataUtil.java

@@ -3,7 +3,7 @@
 
 package com.threerings.user;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.net.MailUtil;
 import com.samskivert.servlet.util.DataValidationException;

src/main/java/com/threerings/user/depot/AffiliateInfo.java

@@ -8,9 +8,9 @@ import static com.threerings.user.Log.log;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.samskivert.servlet.SiteIdentifier;
 import com.samskivert.servlet.util.CookieUtil;

src/main/java/com/threerings/user/depot/DepotUserManager.java

@@ -6,9 +6,9 @@ package com.threerings.user.depot;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.google.common.collect.Maps;