WIP experimental upgrade to Spring6/JakartaEE

.github/workflows/assembly.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            jdk: 11
+            jdk: 17
             dist: 'temurin'
     steps:
     - uses: actions/checkout@v4

.github/workflows/docs.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5
@@ -46,10 +46,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5

.github/workflows/javadoc.yml

@@ -16,11 +16,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-20.04
-            jdk: 11
+            jdk: 17
             dist: 'temurin'
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.jdk }}

.github/workflows/linux.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [ 11, 17, 21 ]
+        jdk: [ 17, 21 ]
         dist: [ 'temurin' ]
         os: [ 'ubuntu-20.04' ]
     runs-on: ${{ matrix.os }}

.github/workflows/macos.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5

.github/workflows/qa.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5

.github/workflows/windows.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
     - name: Set up Maven
       uses: stCarolas/setup-maven@v4.5

.gitignore

@@ -3,6 +3,7 @@ target
 .settings
 .classpath
 .project
+.factorypath
 .metadata
 .DS_Store
 *.class

src/community/backup-restore/core/pom.xml

@@ -63,8 +63,13 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-jakarta</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.batch</groupId>
+      <artifactId>jakarta.batch-api</artifactId>
+      <version>2.1.1</version>
     </dependency>
 
     <!-- Spring Batch unit test -->

src/community/backup-restore/extension/pom.xml

@@ -38,10 +38,6 @@
       <artifactId>gs-restconfig</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
 
   </dependencies>
 

src/community/backup-restore/pom.xml

@@ -31,10 +31,6 @@
       <groupId>org.jdom</groupId>
       <artifactId>jdom2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>

src/community/backup-restore/rest/pom.xml

@@ -39,8 +39,18 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-fileupload2-jakarta</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.batch</groupId>
+      <artifactId>jakarta.batch-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
     </dependency>
 
   </dependencies>

src/community/backup-restore/rest/src/main/java/org/geoserver/backuprestore/rest/BackupController.java

@@ -5,14 +5,14 @@
 package org.geoserver.backuprestore.rest;
 
 import com.thoughtworks.xstream.XStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.logging.Level;
-import javax.servlet.http.HttpServletResponse;
 import org.geoserver.backuprestore.Backup;
 import org.geoserver.backuprestore.BackupExecutionAdapter;
 import org.geoserver.config.util.XStreamPersister;

src/community/backup-restore/rest/src/main/java/org/geoserver/backuprestore/rest/RestoreController.java

@@ -5,14 +5,14 @@
 package org.geoserver.backuprestore.rest;
 
 import com.thoughtworks.xstream.XStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.logging.Level;
-import javax.servlet.http.HttpServletResponse;
 import org.geoserver.backuprestore.Backup;
 import org.geoserver.backuprestore.RestoreExecutionAdapter;
 import org.geoserver.config.util.XStreamPersister;

src/community/cog/pom.xml

@@ -24,6 +24,12 @@
       <artifactId>gt-geotiff</artifactId>
       <version>${gt.version}</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.geoserver.web</groupId>
       <artifactId>gs-web-core</artifactId>

src/community/cog/src/main/java/org/geoserver/cog/CoverageReaderCogInputObjectConverter.java

@@ -8,12 +8,12 @@
 import it.geosolutions.imageio.core.SourceSPIProvider;
 import it.geosolutions.imageioimpl.plugins.cog.*;
 import it.geosolutions.imageioimpl.plugins.cog.CogSourceSPIProvider;
+import jakarta.annotation.Nullable;
 import java.io.Serializable;
 import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
 import javax.imageio.spi.ImageInputStreamSpi;
 import javax.imageio.spi.ImageReaderSpi;
 import org.geoserver.catalog.*;

src/community/cov-json/pom.xml

@@ -86,5 +86,11 @@
       <artifactId>json-path</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

src/community/dds/pom.xml

@@ -62,6 +62,12 @@
       <artifactId>gt-sample-data</artifactId>
       <version>${gt.version}</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.geoserver</groupId>
       <artifactId>gs-wms</artifactId>

src/community/dyndimension/pom.xml

@@ -24,6 +24,12 @@
       <artifactId>gs-web-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.geoserver</groupId>
       <artifactId>gs-main</artifactId>

src/community/features-templating/features-templating-core/pom.xml

@@ -50,6 +50,16 @@
       <artifactId>jsonld-java</artifactId>
       <version>0.12.5</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.1</version>
+    </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
       <artifactId>gt-app-schema</artifactId>
@@ -65,6 +75,11 @@
       <artifactId>gt-referencing</artifactId>
       <version>${gt.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.geoserver</groupId>
       <artifactId>gs-main</artifactId>

src/community/features-templating/features-templating-core/src/main/java/org/geoserver/featurestemplating/configuration/TemplateLayerConfig.java

@@ -4,11 +4,11 @@
  */
 package org.geoserver.featurestemplating.configuration;
 
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  * A class that holds a list of {@link TemplateRule}. Is meant to be stored in the FeatureTypeInfo

src/community/features-templating/features-templating-core/src/main/java/org/geoserver/featurestemplating/configuration/TemplateRule.java

@@ -4,11 +4,11 @@
  */
 package org.geoserver.featurestemplating.configuration;
 
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.Comparator;
 import java.util.Objects;
 import java.util.UUID;
-import javax.xml.bind.annotation.XmlRootElement;
 import org.geoserver.ows.Request;
 import org.geoserver.util.XCQL;
 import org.geotools.api.filter.Filter;

src/community/features-templating/features-templating-core/src/main/java/org/geoserver/featurestemplating/expressions/RequestMatchRegex.java

@@ -6,9 +6,9 @@
 
 import static org.geotools.filter.capability.FunctionNameImpl.parameter;
 
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 import org.geoserver.ows.Request;
 import org.geoserver.ows.util.ResponseUtils;
 import org.geotools.api.filter.capability.FunctionName;

src/community/features-templating/features-templating-core/src/main/java/org/geoserver/featurestemplating/expressions/RequestParameterFunction.java

@@ -6,8 +6,8 @@
 
 import static org.geotools.filter.capability.FunctionNameImpl.parameter;
 
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import org.geoserver.ows.Request;
 import org.geotools.api.filter.capability.FunctionName;
 import org.geotools.filter.capability.FunctionNameImpl;

src/community/features-templating/features-templating-ogcapi/pom.xml

@@ -28,6 +28,11 @@
   </developers>
 
   <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+    </dependency>
     <dependency>
       <groupId>org.geoserver.community</groupId>
       <artifactId>gs-features-templating-ows</artifactId>

src/community/features-templating/features-templating-ows/pom.xml

@@ -68,6 +68,12 @@
       <groupId>org.geotools</groupId>
       <artifactId>gt-referencing</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
       <artifactId>gt-app-schema</artifactId>

src/community/features-templating/features-templating-rest/pom.xml

@@ -58,6 +58,11 @@
       <artifactId>json-patch</artifactId>
       <version>1.12</version>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+    </dependency>
   </dependencies>
 
 </project>

src/community/features-templating/features-templating-rest/src/main/java/org/geoserver/featurestemplating/rest/TemplateRestController.java

@@ -10,6 +10,8 @@
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -21,8 +23,6 @@
 import java.util.function.Predicate;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.geoserver.catalog.Catalog;