Migrate from javax.servlet to jakarta.servlet namespace.

The powers that be decided that it would be cool to break everything in the
entire Java universe because they didn't want to negotiate with Oracle the
permission to take over the javax.servlet namespace.

So now we all get to either have two versions of all of our web-related
libraries, or just pick a time to break every downstream dependency and force
them to jump through this renaming hoop as well. Today is the day that we're
forcing the hoop jumping.

h/t to fourbites for starting this whole ball rolling.

pom.xml

@@ -39,9 +39,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
+      <groupId>jakarta.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <artifactId>jakarta.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

src/main/java/com/samskivert/servlet/HttpErrorException.java

@@ -5,7 +5,7 @@
 
 package com.samskivert.servlet;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * An http error exception is thrown by servlet services when they wish to fail

src/main/java/com/samskivert/servlet/JDBCTableSiteIdentifier.java

@@ -17,7 +17,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.io.PersistenceException;
 

src/main/java/com/samskivert/servlet/MessageManager.java

@@ -9,7 +9,7 @@ import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.*;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.text.MessageUtil;
 import com.samskivert.util.StringUtil;

src/main/java/com/samskivert/servlet/SiteIdentifier.java

@@ -6,7 +6,7 @@
 package com.samskivert.servlet;
 
 import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Responsible for determining the unique site identifier based on information available in the

src/main/java/com/samskivert/servlet/SiteIdentifiers.java

@@ -8,7 +8,7 @@ package com.samskivert.servlet;
 import java.util.Collections;
 import java.util.Iterator;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * {@link SiteIdentifier} utility methods.

src/main/java/com/samskivert/servlet/SiteResourceLoader.java

@@ -15,7 +15,7 @@ import java.security.PrivilegedAction;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.HashIntMap;
 

src/main/java/com/samskivert/servlet/user/UserManager.java

@@ -6,9 +6,9 @@
 package com.samskivert.servlet.user;
 
 import java.util.Properties;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.samskivert.io.PersistenceException;
 import com.samskivert.jdbc.ConnectionProvider;

src/main/java/com/samskivert/servlet/util/CookieUtil.java

@@ -5,9 +5,9 @@
 
 package com.samskivert.servlet.util;
 
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Utility methods for dealing with cookies.

src/main/java/com/samskivert/servlet/util/ParameterUtil.java

@@ -14,7 +14,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.ArrayIntSet;
 import com.samskivert.util.IntSet;

src/main/java/com/samskivert/servlet/util/RequestUtils.java

@@ -7,7 +7,7 @@ package com.samskivert.servlet.util;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.util.StringUtil;
 

src/main/java/com/samskivert/velocity/Application.java

@@ -8,9 +8,9 @@ package com.samskivert.velocity;
 import java.util.Locale;
 import java.util.Properties;
 
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.velocity.app.Velocity;
 

src/main/java/com/samskivert/velocity/DispatcherServlet.java

@@ -11,12 +11,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Properties;
 
-import javax.servlet.ServletConfig;
+import jakarta.servlet.ServletConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
+import jakarta.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;

src/main/java/com/samskivert/velocity/FormTool.java

@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.servlet.util.HTMLUtil;
 import com.samskivert.servlet.util.ParameterUtil;

src/main/java/com/samskivert/velocity/I18nTool.java

@@ -10,7 +10,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.samskivert.servlet.MessageManager;
 import com.samskivert.util.StringUtil;

src/main/java/com/samskivert/velocity/InvocationContext.java

@@ -7,8 +7,8 @@ package com.samskivert.velocity;
 
 import java.util.Enumeration;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;

src/main/java/com/samskivert/velocity/ServletContextLogger.java

@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.log.LogChute;

src/main/java/com/samskivert/velocity/ServletContextResourceLoader.java

@@ -6,7 +6,7 @@
 package com.samskivert.velocity;
 
 import java.io.InputStream;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.commons.collections.ExtendedProperties;
 import org.apache.velocity.exception.ResourceNotFoundException;

src/main/java/com/samskivert/velocity/SiteResourceManager.java

@@ -5,7 +5,7 @@
 
 package com.samskivert.velocity;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;