Migration to Jakarta EE 10 and Spring 6.2

Author: aaime

geowebcache/arcgiscache/pom.xml

@@ -22,8 +22,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
 
     <!-- test dependencies -->

geowebcache/arcgiscache/src/main/java/org/geowebcache/arcgis/layer/ArcGISCacheLayer.java

@@ -14,6 +14,7 @@
 package org.geowebcache.arcgis.layer;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -24,7 +25,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletResponse;
 import org.geotools.util.logging.Logging;
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.arcgis.compact.ArcGISCompactCache;
@@ -452,7 +452,7 @@ public String getStyles() {
         return null;
     }
 
-    /** @see org.geowebcache.layer.TileLayer#setExpirationHeader(javax.servlet.http.HttpServletResponse, int) */
+    /** @see org.geowebcache.layer.TileLayer#setExpirationHeader(jakarta.servlet.http.HttpServletResponse, int) */
     @Override
     public void setExpirationHeader(HttpServletResponse response, int zoomLevel) {
         /*

geowebcache/azureblob/pom.xml

@@ -66,8 +66,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

geowebcache/core/pom.xml

@@ -39,6 +39,10 @@
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
@@ -67,8 +71,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
 
     <dependency>
@@ -157,10 +161,9 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
     </dependency>
     <!-- test dependencies -->
     <dependency>

geowebcache/core/src/main/java/org/geowebcache/DispatcherOutputStream.java

@@ -13,10 +13,10 @@
  */
 package org.geowebcache;
 
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 import java.io.IOException;
 import java.io.OutputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 
 /**
  * A wrapper for a Dispatcher destination output stream that signals {@link IOException}s thrown while writing to the

geowebcache/core/src/main/java/org/geowebcache/GeoWebCacheDispatcher.java

@@ -15,6 +15,10 @@
 
 import static org.apache.commons.text.StringEscapeUtils.escapeHtml4;
 
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,10 +33,6 @@
 import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
 import org.geotools.util.logging.Logging;
 import org.geowebcache.config.BaseConfiguration;
 import org.geowebcache.config.BlobStoreInfo;

geowebcache/core/src/main/java/org/geowebcache/GeoWebCacheExtensions.java

@@ -13,6 +13,7 @@
  */
 package org.geowebcache;
 
+import jakarta.servlet.ServletContext;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -21,7 +22,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
 import org.geotools.util.logging.Logging;
 import org.geowebcache.config.BaseConfiguration;
 import org.geowebcache.util.GWCVars;

geowebcache/core/src/main/java/org/geowebcache/config/XMLFileResourceProvider.java

@@ -14,6 +14,7 @@
  */
 package org.geowebcache.config;
 
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -25,7 +26,6 @@
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.geotools.util.logging.Logging;

geowebcache/core/src/main/java/org/geowebcache/controller/GeoWebCacheDispatcherController.java

@@ -13,9 +13,9 @@
  */
 package org.geowebcache.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 import org.geowebcache.GeoWebCacheDispatcher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

geowebcache/core/src/main/java/org/geowebcache/conveyor/Conveyor.java

@@ -13,8 +13,8 @@
  */
 package org.geowebcache.conveyor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.geowebcache.mime.MimeType;
 import org.geowebcache.storage.StorageBroker;