Upgrade to Spring 7

.github/workflows/CI.yml

@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: ['11.x', '17.x', '21.x']
+        java-version: ['17.x', '21.x']
       fail-fast: false
     steps:
       - name: "checking out"
@@ -111,19 +111,15 @@ jobs:
     strategy:
       matrix:
         node-version: ['20.x', '22.x', '24.x']
-        java-version: ['11.x', '17.x', '21.x']
+        java-version: ['17.x', '21.x']
         # Reduce the combinations to reduce the total number of jobs
         exclude:
           - node-version: '20.x'
             java-version: '17.x'
           - node-version: '20.x'
             java-version: '21.x'
-          - node-version: '22.x'
-            java-version: '11.x'
           - node-version: '22.x'
             java-version: '21.x'
-          - node-version: '24.x'
-            java-version: '11.x'
           - node-version: '24.x'
             java-version: '17.x'
       fail-fast: false
@@ -201,14 +197,14 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11.x'
+          java-version: '17.x'
       ############
       # Publish
       ##########
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           server-id: geosolutions
           server-username: MAVEN_USERNAME

.github/workflows/build.yml

@@ -5,7 +5,7 @@ on:
     - master
     # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
-    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
+    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
     - '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11.x'
+          java-version: '17.x'
       ############
       # CACHING
       ##########

.github/workflows/create_release.yml

@@ -41,7 +41,7 @@ jobs:
       - name: "setting up Java"
         uses: actions/setup-java@v1
         with:
-          java-version: '11.x'
+          java-version: '17.x'
       ############
       # CACHING
       ##########

.github/workflows/post_release.yml

@@ -21,10 +21,10 @@ jobs:
         script: |
             core.setFailed('This workflow can not run on master branch')
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11.x'
+        java-version: '17.x'
         distribution: 'adopt'
         cache: maven
 

.github/workflows/pre_release.yml

@@ -37,10 +37,10 @@ jobs:
         script: |
             core.setFailed('This workflow can not run on master branch')
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11.x'
+        java-version: '17.x'
         distribution: 'adopt'
         cache: maven
 

binary/bin-war/pom.xml

@@ -14,7 +14,7 @@
     <url>http://www.geo-solutions.it</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomcat.version>9.0.116</tomcat.version>
+        <tomcat.version>11.0.22</tomcat.version>
         <binary.number>${mapstore2.version}</binary.number>
     </properties>
 

binary/pom.xml

@@ -13,7 +13,7 @@
     <url>http://www.geo-solutions.it</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tomcat.version>9.0.118</tomcat.version>
+        <tomcat.version>11.0.22</tomcat.version>
         <binary.number>${mapstore2.version}</binary.number>
     </properties>
     <dependencies>

binary/tomcat/conf/web.xml

@@ -15,11 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                      http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
-  version="4.0">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+  version="6.0">
 
   <!-- ======================== Introduction ============================== -->
   <!-- This document defines default values for *all* web applications      -->

java/services/pom.xml

@@ -86,10 +86,9 @@
         </dependency>
 
         <!-- servlet -->
-        <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- json-lib -->
@@ -143,8 +142,8 @@
                 <version>3.10.1</version>
                 <configuration>
                     <encoding>utf8</encoding>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <debug>true</debug>
                     <encoding>UTF-8</encoding>
                     <!--

java/services/src/main/java/it/geosolutions/mapstore/controllers/BaseMapStoreController.java

@@ -1,6 +1,6 @@
 package it.geosolutions.mapstore.controllers;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

java/services/src/main/java/it/geosolutions/mapstore/controllers/extensions/ExtensionsController.java

@@ -10,8 +10,8 @@
 import java.io.IOException;
 import java.nio.file.Paths;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.stereotype.Controller;

java/services/src/main/java/it/geosolutions/mapstore/controllers/rest/config/LoadAssetsController.java

@@ -12,8 +12,8 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Value;

java/services/src/main/java/it/geosolutions/mapstore/controllers/rest/config/SetParamsController.java

@@ -28,10 +28,8 @@
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;

java/services/src/main/java/it/geosolutions/mapstore/controllers/rest/config/UploadPluginController.java

@@ -16,6 +16,7 @@
 import it.geosolutions.mapstore.utils.ResourceUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.CloseShieldInputStream;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
@@ -24,14 +25,15 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -69,6 +71,8 @@ public class UploadPluginController extends BaseMapStoreController {
     @Secured({"ROLE_ADMIN"})
     @RequestMapping(value = "/uploadPlugin", method = RequestMethod.POST, headers = "Accept=application/json")
     public @ResponseBody String uploadPlugin(InputStream dataStream) throws IOException {
+        File servletTempDir = (File) context.getAttribute(ServletContext.TEMPDIR);
+        Path tempDir = Files.createTempDirectory(servletTempDir.toPath(), "mapstore-upload-");
         try (ZipInputStream zip = new ZipInputStream(dataStream)) {
             ZipEntry entry = zip.getNextEntry();
             String pluginName = null;
@@ -85,12 +89,12 @@ public class UploadPluginController extends BaseMapStoreController {
 
                     if (lower.endsWith("index.js")) {
                         bundleEntryName = normalizedEntry;
-                        File tempBundle = File.createTempFile("mapstore-bundle", ".js");
+                        File tempBundle = Files.createTempFile(tempDir, "mapstore-bundle", ".js").toFile();
                         storeAsset(zip, tempBundle);
                         // We'll resolve final relative target after we know pluginName
                         tempFilesToRelativeTargets.put(tempBundle, "__BUNDLE__");
                     } else if (lower.equals("index.json")) {
-                        JsonNode json = readJSON(zip);
+                        JsonNode json = readJSON(CloseShieldInputStream.wrap(zip));
                         JsonNode plugins = json.get("plugins");
                         if (plugins == null || !plugins.isArray() || plugins.isEmpty()) {
                             throw new IOException("Invalid bundle: index.json has no 'plugins' array");
@@ -108,13 +112,13 @@ public class UploadPluginController extends BaseMapStoreController {
                             addPluginConfiguration(plugin);
                         }
                     } else if (lower.startsWith("translations/")) {
-                        File tempAsset = File.createTempFile("mapstore-asset-translations", ".json");
+                        File tempAsset = Files.createTempFile(tempDir, "mapstore-asset-translations", ".json").toFile();
                         storeAsset(zip, tempAsset);
                         // Target relative to extensions root: <pluginName>/<translations/...>
                         tempFilesToRelativeTargets.put(tempAsset, PLUGIN_PATH_PREFIX + normalizedEntry);
                         addTranslations = true;
                     } else if (lower.startsWith("assets/")) {
-                        File tempAsset = File.createTempFile("mapstore-asset", ".tmp");
+                        File tempAsset = Files.createTempFile(tempDir, "mapstore-asset", ".tmp").toFile();
                         storeAsset(zip, tempAsset);
                         // Target relative to extensions root: <pluginName>/<assets/...>
                         tempFilesToRelativeTargets.put(tempAsset, PLUGIN_PATH_PREFIX + normalizedEntry);
@@ -159,6 +163,8 @@ public class UploadPluginController extends BaseMapStoreController {
             }
 
             return plugin.toString();
+        } finally {
+            FileUtils.deleteDirectory(tempDir.toFile());
         }
     }
 
@@ -212,7 +218,7 @@ private boolean shouldStorePluginsConfigAsPatch() {
     private boolean canUseDataDir() {
         return !getDataDir().isEmpty() &&
                Stream.of(getDataDir().split(","))
-                       .anyMatch(folder -> !folder.trim().isEmpty() && new File(folder).exists());
+                   .anyMatch(folder -> !folder.trim().isEmpty() && new File(folder).exists());
     }
 
     /**
@@ -250,7 +256,7 @@ private boolean canUseDataDir() {
             for (int i = 0; i < plugins.size(); i++) {
                 JsonNode plugin = plugins.get(i);
                 String name = plugin.has("name") ? plugin.get("name").asText()
-                        : plugin.get("value").get("name").asText();
+                    : plugin.get("value").get("name").asText();
                 if (name.contentEquals(pluginName)) {
                     toRemove = i;
                 }
@@ -445,7 +451,7 @@ private void storeJSONConfig(Object config, String configName) throws IOExceptio
     }
 
     private void addExtension(String pluginName, String pluginBundleRelative, String translationsRelative)
-            throws IOException {
+        throws IOException {
         ObjectNode config;
         Optional<File> extensionsConfigFile = findResource(getExtensionsConfigPath());
         if (extensionsConfigFile.isPresent()) {
@@ -484,25 +490,16 @@ private ObjectNode getExtensionConfig() throws IOException {
     }
 
     private JsonNode readJSON(InputStream input) throws IOException {
-        byte[] buffer = new byte[4096];
-        int read;
-        StringBuilder json = new StringBuilder();
-        while ((read = input.read(buffer)) >= 0) {
-            json.append(new String(buffer, 0, read, StandardCharsets.UTF_8));
-        }
-        return jsonMapper.readTree(json.toString());
+        return jsonMapper.readTree(input);
     }
 
     private void storeAsset(ZipInputStream zip, File file) throws IOException {
         try (FileOutputStream outFile = new FileOutputStream(file)) {
-            byte[] buffer = new byte[8192];
-            int read;
-            while ((read = zip.read(buffer)) >= 0) {
-                outFile.write(buffer, 0, read);
-            }
+            IOUtils.copy(zip, outFile);
         }
     }
 
+    @Override
     public void setContext(ServletContext context) {
         this.context = context;
     }

java/services/src/main/java/it/geosolutions/mapstore/filters/NoCacheFilter.java

@@ -1,6 +1,6 @@
 package it.geosolutions.mapstore.filters;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class NoCacheFilter implements Filter {

java/services/src/main/java/it/geosolutions/mapstore/utils/ResourceUtils.java

@@ -18,7 +18,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 public class ResourceUtils {
 

java/services/src/test/java/it/geosolutions/mapstore/ConfigControllerTest.java

@@ -12,7 +12,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.junit.Before;
 import org.junit.Test;

java/services/src/test/java/it/geosolutions/mapstore/ExtensionsControllerTest.java

@@ -13,7 +13,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;

java/services/src/test/java/it/geosolutions/mapstore/LoadAssetControllerTest.java

@@ -14,7 +14,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;