Upgrade to Spring 7

.github/workflows/CI.yml

@@ -78,7 +78,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"
@@ -110,19 +110,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
@@ -200,14 +196,14 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11.x'
+          java-version: '21.x'
       ############
       # Publish
       ##########
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
           server-id: geosolutions
           server-username: MAVEN_USERNAME

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11.x'
+          java-version: '21.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: '21.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 21
       uses: actions/setup-java@v3
       with:
-        java-version: '11.x'
+        java-version: '21.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 21
       uses: actions/setup-java@v3
       with:
-        java-version: '11.x'
+        java-version: '21.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 -->

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

@@ -24,7 +24,7 @@
 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;

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;

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

@@ -13,7 +13,7 @@
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

java/services/src/test/java/it/geosolutions/mapstore/filters/NoCacheFilterTest.java

@@ -3,11 +3,11 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletResponse;
 
 import static org.mockito.Mockito.*;
 

java/services/src/test/java/it/geosolutions/mapstore/utils/ResourceUtilsTest.java

@@ -15,7 +15,7 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 
 import org.junit.Before;
 import org.junit.Test;

java/web/pom.xml

@@ -50,22 +50,12 @@
         </dependency>
         <!-- servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-        <!-- gzip compression filter -->
         <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache-web</artifactId>
-        </dependency>
-        <!-- misc -->
-        <dependency>
-            <groupId>commons-pool</groupId>
-            <artifactId>commons-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
         </dependency>
     </dependencies>
 

java/web/src/main/webapp/WEB-INF/configs-servlet.xml

@@ -13,7 +13,7 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
-    <security:global-method-security secured-annotations="enabled" />
+    <security:method-security secured-enabled="true"/>
     <mvc:annotation-driven/>
     <context:component-scan base-package="it.geosolutions.mapstore.controllers.configs" />
     <!-- TODO: remove these duplucations -->

java/web/src/main/webapp/WEB-INF/extensions-servlet.xml

@@ -13,7 +13,7 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
-    <security:global-method-security secured-annotations="enabled" />
+    <security:method-security secured-enabled="true"/>
     <mvc:annotation-driven/>
     <context:component-scan base-package="it.geosolutions.mapstore.controllers.extensions" />
 <!-- TODO: remove these duplucations -->

java/web/src/main/webapp/WEB-INF/loadAssets-servlet.xml

@@ -13,7 +13,7 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
-    <security:global-method-security secured-annotations="enabled" />
+    <security:method-security secured-enabled="true"/>
     <mvc:annotation-driven/>
     <context:component-scan base-package="it.geosolutions.mapstore.controllers.rest.config" />
     <!-- TODO: remove these duplucations -->

java/web/src/main/webapp/WEB-INF/web.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4"
+<web-app id="WebApp_ID" version="6.0"
 	xmlns:javaee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
 
 	<!-- pick up all spring application contexts -->
 	<context-param>
@@ -54,23 +54,6 @@
 		<url-pattern>/rest/*</url-pattern>
 	</filter-mapping>
 
-	<!-- GZip compression -->
-	<filter>
-		<filter-name>CompressionFilter</filter-name>
-		<filter-class>net.sf.ehcache.constructs.web.filter.GzipFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CompressionFilter</filter-name>
-		<url-pattern>*.css</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CompressionFilter</filter-name>
-		<url-pattern>*.html</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CompressionFilter</filter-name>
-		<url-pattern>*.js</url-pattern>
-	</filter-mapping>
     <!-- Cache management -->
     <filter>
         <filter-name>noCacheFilter</filter-name>