From: Simon Steiner <ssteiner@apache.org>
Date: Thu, 11 Jul 2024 07:23:15 +0000 (+0100)
Subject: FOP-3188: Switch to Jakarta servlet API
X-Git-Tag: 2_10~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=639d5b608224d566443a21efd85432a1dddb734a;p=xmlgraphics-fop.git

FOP-3188: Switch to Jakarta servlet API
---

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index b142cacd1..a6b529e62 100644
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -89,9 +89,9 @@
       <version>${commons.logging.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.2</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/fop-core/src/main/java/org/apache/fop/servlet/FopPrintServlet.java b/fop-core/src/main/java/org/apache/fop/servlet/FopPrintServlet.java
index dddd1ec5e..8fbe79d7a 100644
--- a/fop-core/src/main/java/org/apache/fop/servlet/FopPrintServlet.java
+++ b/fop-core/src/main/java/org/apache/fop/servlet/FopPrintServlet.java
@@ -22,7 +22,6 @@ package org.apache.fop.servlet;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -34,6 +33,7 @@ import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.MimeConstants;
 
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Example servlet to generate a fop printout from a servlet.
diff --git a/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java b/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java
index 406ead324..9b8c9a989 100644
--- a/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java
+++ b/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java
@@ -26,10 +26,6 @@ import java.io.PrintWriter;
 import java.net.URI;
 import java.net.URL;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -51,6 +47,11 @@ import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.FopFactoryBuilder;
 import org.apache.fop.apps.MimeConstants;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Example servlet to generate a PDF from a servlet.
  * <br>
diff --git a/fop-core/src/main/java/org/apache/fop/servlet/ServletContextURIResolver.java b/fop-core/src/main/java/org/apache/fop/servlet/ServletContextURIResolver.java
index 413dac76d..b0422f632 100644
--- a/fop-core/src/main/java/org/apache/fop/servlet/ServletContextURIResolver.java
+++ b/fop-core/src/main/java/org/apache/fop/servlet/ServletContextURIResolver.java
@@ -23,12 +23,13 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.servlet.ServletContext;
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
 
+import jakarta.servlet.ServletContext;
+
 /**
  * This class is a URIResolver implementation that provides access to resources in the WEB-INF
  * directory of a web application using "servlet-content:" URIs.