migrate to Jakarta EE

Signed-off-by: Ceki Gulcu <[email protected]>

Author: ceki

logback-access/pom.xml

@@ -34,8 +34,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -65,8 +65,15 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>javax.mail-api</artifactId>
+      <groupId>jakarta.mail</groupId>
+      <artifactId>jakarta.mail-api</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -135,7 +142,7 @@
             <Import-Package>
               ch.qos.logback.core.rolling,
               ch.qos.logback.core.rolling.helper,
-              javax.servlet.*;version="4.0.0",
+              jakarta.servlet.*;version="4.0.0",
               org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
               org.eclipse.jetty.*;version="${jetty.version}";resolution:=optional,
               *

logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java

@@ -13,9 +13,9 @@
  */
 package ch.qos.logback.access;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import ch.qos.logback.core.status.StatusManager;
 import ch.qos.logback.core.status.ViewStatusMessagesServletBase;

logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java

@@ -15,6 +15,7 @@
 
 import java.io.File;
 import java.net.URL;
+import java.util.EventListener;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -243,20 +244,10 @@ enum State {
     String fileName;
     String resource;
 
-    // Jetty 9.4.x and newer is considered modern.
-    boolean modernJettyRequestLog;
     boolean quiet = false;
 
     public RequestLogImpl() {
         putObject(CoreConstants.EVALUATOR_MAP, new HashMap<String, EventEvaluator<?>>());
-
-        // plumb the depths of Jetty and the environment ...
-        if (EnvUtil.isClassAvailable(this.getClass(), "jakarta.servlet.http.HttpServlet")) {
-            throw new RuntimeException("The new jakarta.servlet classes are not supported by this " + "version of logback-access (check for a newer version of logback-access that " + "does support it)");
-        }
-
-        // look for modern approach to RequestLog
-        modernJettyRequestLog = EnvUtil.isClassAvailable(this.getClass(), "org.eclipse.jetty.server.CustomRequestLog");
     }
 
     @Override
@@ -270,11 +261,7 @@ public void log(Request jettyRequest, Response jettyResponse) {
     }
 
     private JettyServerAdapter makeJettyServerAdapter(Request jettyRequest, Response jettyResponse) {
-        if (modernJettyRequestLog) {
-            return new JettyModernServerAdapter(jettyRequest, jettyResponse);
-        } else {
-            return new JettyServerAdapter(jettyRequest, jettyResponse);
-        }
+       return new JettyModernServerAdapter(jettyRequest, jettyResponse);
     }
 
     protected void addInfo(String msg) {
@@ -402,6 +389,16 @@ public boolean isFailed() {
         return state == State.FAILED;
     }
 
+    @Override
+    public boolean addEventListener(EventListener listener) {
+        return false;
+    }
+
+    @Override
+    public boolean removeEventListener(EventListener listener) {
+        return false;
+    }
+
 
     public boolean isQuiet() {
         return quiet;
@@ -466,13 +463,10 @@ public FilterReply getFilterChainDecision(IAccessEvent event) {
         return fai.getFilterChainDecision(event);
     }
 
-
-    @Override
     public void addLifeCycleListener(LifeCycle.Listener listener) {
         // we'll implement this when asked
     }
 
-    @Override
     public void removeLifeCycleListener(LifeCycle.Listener listener) {
         // we'll implement this when asked
     }

logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java

@@ -19,14 +19,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import static ch.qos.logback.access.AccessConstants.LB_OUTPUT_BUFFER;
 import static ch.qos.logback.access.AccessConstants.TEE_FILTER_INCLUDES_PARAM;

logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java

@@ -17,9 +17,9 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import static ch.qos.logback.access.AccessConstants.LB_INPUT_BUFFER;
 

logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java

@@ -17,9 +17,9 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 public class TeeHttpServletResponse extends HttpServletResponseWrapper {
 

logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java

@@ -18,9 +18,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 
 class TeeServletInputStream extends ServletInputStream {
 

logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java

@@ -16,9 +16,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponse;
-import javax.servlet.WriteListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.WriteListener;
 
 public class TeeServletOutputStream extends ServletOutputStream {
 

logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java

@@ -15,8 +15,8 @@
 
 import ch.qos.logback.access.AccessConstants;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public class Util {
 

logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java

@@ -13,8 +13,8 @@
  */
 package ch.qos.logback.access.sift;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import ch.qos.logback.access.spi.IAccessEvent;
 import ch.qos.logback.core.sift.AbstractDiscriminator;