build.gradle

@@ -64,7 +64,7 @@ dependencies {
   implementation 'commons-logging:commons-logging:1.3.2'
   implementation 'commons-net:commons-net:3.10.0'
   implementation 'com.sun.mail:javax.mail:1.6.2'
-  implementation 'javax.servlet:javax.servlet-api:4.0.1'
+  implementation 'jakarta.servlet:jakarta.servlet-api:5.0.0'
   implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
   implementation 'org.eclipse.jetty.ee9:jetty-ee9-servlet:12.0.9'
   implementation 'org.eclipse.jetty:jetty-xml:12.0.9'

src/main/java/helma/framework/CookieTrans.java

@@ -17,7 +17,7 @@
 package helma.framework;
 
 import java.io.Serializable;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
 
 /**
  *  Cookie Transmitter. A simple, serializable representation

src/main/java/helma/framework/RequestBean.java

@@ -16,12 +16,12 @@
 
 package helma.framework;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 import java.util.Map;
 
 /**
- * 
+ *
  */
 public class RequestBean implements Serializable {
     private static final long serialVersionUID = -6826881712426326687L;
@@ -89,7 +89,7 @@ public class RequestBean implements Serializable {
      * @return the header value, or null
      */
     public String getHeader(String name) {
-        return req.getHeader(name);        
+        return req.getHeader(name);
     }
 
     /**

src/main/java/helma/framework/RequestTrans.java

@@ -19,9 +19,9 @@ package helma.framework;
 import helma.util.SystemMap;
 import helma.util.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
 
 import org.apache.commons.codec.binary.Base64;
 

src/main/java/helma/framework/ResponseBean.java

@@ -19,7 +19,7 @@ package helma.framework;
 import helma.objectmodel.db.Transactor;
 import helma.scripting.ScriptingException;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.Serializable;
 import java.io.StringWriter;
 import java.io.PrintWriter;

src/main/java/helma/framework/ResponseTrans.java

@@ -21,7 +21,7 @@ import helma.framework.core.Application;
 import helma.util.*;
 import helma.scripting.ScriptingException;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.security.*;
 import java.util.*;

src/main/java/helma/servlet/AbstractServletClient.java

@@ -22,12 +22,14 @@ package helma.servlet;
 import helma.framework.*;
 import helma.framework.core.Application;
 import helma.util.*;
+
 import java.io.*;
 import java.util.*;
 import java.security.SecureRandom;
 import java.security.NoSuchAlgorithmException;
-import javax.servlet.*;
-import javax.servlet.http.*;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@@ -218,7 +220,7 @@ public abstract class AbstractServletClient extends HttpServlet {
 
             // read file uploads
             List uploads = null;
-            ServletRequestContext reqcx = new ServletRequestContext(request);
+            JakartaServletRequestContext reqcx = new JakartaServletRequestContext(request);
 
             if (ServletFileUpload.isMultipartContent(reqcx)) {
                 // get session for upload progress monitoring
@@ -653,7 +655,7 @@ public abstract class AbstractServletClient extends HttpServlet {
         map.put(name, newValues);
     }
 
-    protected List parseUploads(ServletRequestContext reqcx, RequestTrans reqtrans,
+    protected List parseUploads(JakartaServletRequestContext reqcx, RequestTrans reqtrans,
                                 final UploadStatus uploadStatus, String encoding)
             throws FileUploadException, UnsupportedEncodingException {
         // handle file upload

src/main/java/helma/servlet/EmbeddedServletClient.java

@@ -19,7 +19,7 @@ package helma.servlet;
 import helma.framework.*;
 import helma.framework.core.Application;
 import helma.main.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
 
 /**
  *  Servlet client that runs a Helma application for the embedded

src/main/java/helma/servlet/StandaloneServletClient.java

@@ -23,7 +23,7 @@ import helma.main.ServerConfig;
 import helma.main.Server;
 
 import java.io.*;
-import javax.servlet.*;
+import jakarta.servlet.*;
 import java.util.*;
 
 /**
@@ -98,7 +98,7 @@ public final class StandaloneServletClient extends AbstractServletClient {
                         repositoryImpl = "helma.framework.repository.FileRepository";
                     }
                 }
-        
+
                 try {
                     Repository newRepository = (Repository) Class.forName(repositoryImpl)
                         .getConstructor(parameters)
@@ -116,7 +116,7 @@ public final class StandaloneServletClient extends AbstractServletClient {
                 }
             }
         }
-        
+
         // add app dir
         FileRepository appRep = new FileRepository(appDir);
         log("adding repository: " + appDir);