Update for Jakarta EE

Author: adamretter

README.md

@@ -5,14 +5,18 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.evolvedbinary.thirdparty.org.apache.xmlrpc/xmlrpc/badge.svg)](https://search.maven.org/search?q=g:com.evolvedbinary.thirdparty.org.apache.xmlrpc)
 
 [Apache XML-RPC](https://ws.apache.org/xmlrpc/) is no longer officially maintained by Apache.
-This is a simple fork for the purposes of applying the latest security patches.
+This is a simple fork for the purposes of:
+1. Applying the latest security patches.
+2. Providing support for Jakarta EE 5+, i.e.: `jakarta.javax`
 
 * The Apache XML-RPC source code was imported to Git from the archived SVN Apache XML-RPC repository at: https://svn.apache.org/repos/asf/webservices/archive/xmlrpc/
 * The security patches were obtained from the Fedora project's package at: https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/Packages/x/xmlrpc-3.1.3-28.fc34.src.rpm
     * Whilst 6 patches are available, the 2nd patch for OSGI metadata has not been applied as `PR: XMLRPC-184` (see commit: f0b8977) exists in the main line of this code base and already adds some conflicting OSGI metadata support. 
 
 *NOTE*: This fork was created for our own purposes, and we offer no guarantee that we will maintain it beyond our own requirements.
 
+*NOTE*: The version 4.x.x line contains only the original source code plus the security updates, whereas the 5.x.x line also contains changes to switch from the `javax.servlet` package namespace to Jakarta EE's `jakarta.servlet` package namespace.
+
 However, if you want a possibly more secure Apache XML-RPC than the last official version (3.1.3), then this fork's artifacts are available
 from Maven Central as:
 
@@ -21,7 +25,7 @@ from Maven Central as:
     <dependency>    
         <groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
         <artifactId>xmlrpc-server</artifactId>
-        <version>4.0.0</version>
+        <version>5.0.0</version>
     </dependency>
 ```
 
@@ -30,7 +34,7 @@ from Maven Central as:
     <dependency>    
         <groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
         <artifactId>xmlrpc-client</artifactId>
-        <version>4.0.0</version>
+        <version>5.0.0</version>
     </dependency>
 ```
 
@@ -39,7 +43,7 @@ from Maven Central as:
     <dependency>    
         <groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
         <artifactId>xmlrpc-common</artifactId>
-        <version>4.0.0</version>
+        <version>5.0.0</version>
     </dependency>
 ```
 

client/pom.xml

@@ -93,7 +93,7 @@
     <dependency>
       <groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
       <artifactId>xmlrpc-common</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>

dist/pom.xml

@@ -64,18 +64,18 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
     <dependency>
     	<groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
     	<artifactId>xmlrpc-client</artifactId>
-    	<version>4.0.1-SNAPSHOT</version>
+    	<version>${project.version}</version>
     </dependency>
     <dependency>
     	<groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
     	<artifactId>xmlrpc-server</artifactId>
-    	<version>4.0.1-SNAPSHOT</version>
+    	<version>${project.version}</version>
     </dependency>
   </dependencies>
 

pom.xml

@@ -391,9 +391,9 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>5.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>

server/pom.xml

@@ -112,17 +112,17 @@
     <dependency>
       <groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
       <artifactId>xmlrpc-common</artifactId>
-      <version>4.0.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
     	<groupId>com.evolvedbinary.thirdparty.org.apache.xmlrpc</groupId>
     	<artifactId>xmlrpc-client</artifactId>
-    	<version>4.0.1-SNAPSHOT</version>
+    	<version>${project.version}</version>
     	<scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
   </dependencies>
 </project>

server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java

@@ -40,27 +40,27 @@
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.ReadListener;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.DispatcherType;
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.xmlrpc.common.XmlRpcStreamConfig;
 import org.apache.xmlrpc.util.HttpUtil;
 
 
-/** Stub implementation of a {@link javax.servlet.http.HttpServletRequest}
+/** Stub implementation of a {@link jakarta.servlet.http.HttpServletRequest}
  * with lots of unimplemented methods. I implemented only those, which
  * are required for testing the {@link org.apache.xmlrpc.webserver.XmlRpcServlet}.
  * Perhaps someone else is adding more at a later time?

server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java

@@ -33,12 +33,12 @@
 import java.util.Collections;
 import java.util.StringTokenizer;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 
 
-/** Stub implementation of a {@link javax.servlet.http.HttpServletResponse}
+/** Stub implementation of a {@link jakarta.servlet.http.HttpServletResponse}
  * with lots of unimplemented methods. I implemented only those, which
  * are required for testing the {@link org.apache.xmlrpc.webserver.XmlRpcServlet}.
  * Perhaps someone else is adding more at a later time?

server/src/main/java/org/apache/xmlrpc/webserver/ServletConnection.java

@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.net.Socket;
 
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServlet;
 
 import org.apache.xmlrpc.util.ThreadPool.InterruptableTask;
 

server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java

@@ -21,8 +21,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 
 
 /** Default implementation of a servlet output stream.

server/src/main/java/org/apache/xmlrpc/webserver/ServletWebServer.java

@@ -24,10 +24,10 @@
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
 
 import org.apache.xmlrpc.server.PropertyHandlerMapping;
 import org.apache.xmlrpc.server.XmlRpcStreamServer;