scratch work for EE9+ support

Author: pdurbin

annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/config/AnnotationConfigProvider.java

@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.ocpsoft.common.services.ServiceLoader;
 import org.ocpsoft.logging.Logger;

annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/AbstractClassFinder.java

@@ -18,7 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import org.ocpsoft.logging.Logger;
 import org.ocpsoft.rewrite.annotation.api.ClassVisitor;
 import org.ocpsoft.rewrite.annotation.spi.ClassFinder;

annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/WebClassesFinder.java

@@ -22,7 +22,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.ocpsoft.rewrite.annotation.api.ClassVisitor;
 import org.ocpsoft.rewrite.annotation.spi.ClassFinder;

annotations-impl/src/main/java/org/ocpsoft/rewrite/annotation/scan/WebLibFinder.java

@@ -22,7 +22,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.ocpsoft.rewrite.annotation.api.ClassVisitor;
 import org.ocpsoft.rewrite.annotation.spi.ClassFinder;

annotations-impl/src/test/java/org/ocpsoft/rewrite/annotation/scan/WebClassesFinderTest.java

@@ -21,7 +21,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.junit.Ignore;
 import org.junit.Test;

annotations-impl/src/test/java/org/ocpsoft/rewrite/annotation/scan/WebLibFinderTest.java

@@ -29,7 +29,7 @@
 import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.junit.Test;
 import org.mockito.Mockito;

api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/DispatcherType.java

@@ -16,7 +16,7 @@
 package org.ocpsoft.rewrite.servlet;
 
 /**
- * Same as <code>javax.servlet.DispatcherType</code>. We are using our own enum because it is only available in Servlet
+ * Same as <code>jakarta.servlet.DispatcherType</code>. We are using our own enum because it is only available in Servlet
  * 3.0 and newer.
  * 
  * @author Christian Kaltepoth

api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteLifecycleContext.java

@@ -17,8 +17,8 @@
 
 import java.util.List;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.ocpsoft.rewrite.context.Context;
 import org.ocpsoft.rewrite.event.Rewrite;

api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteWrappedRequest.java

@@ -17,9 +17,9 @@
 
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 import org.ocpsoft.rewrite.event.Rewrite;
 import org.ocpsoft.rewrite.servlet.spi.RequestParameterProvider;

api-servlet/src/main/java/org/ocpsoft/rewrite/servlet/RewriteWrappedResponse.java

@@ -15,10 +15,10 @@
  */
 package org.ocpsoft.rewrite.servlet;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 
 import org.ocpsoft.rewrite.event.Rewrite;
 import org.ocpsoft.rewrite.servlet.config.response.ResponseContentInterceptor;