Spring7 migration

.github/workflows/main.yaml

@@ -41,15 +41,15 @@ jobs:
           python-version: '3.14'
       - run: python3 -m pip install --requirement=ci/requirements.txt
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
           restore-keys: "pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}\npre-commit-"
       - run: pre-commit run --all-files --color=always
       - run: git diff --exit-code --patch > /tmp/pre-commit.patch; git diff --color; git reset --hard || true
         if: failure()
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: Apply pre-commit fix.patch
           path: /tmp/pre-commit.patch
@@ -110,7 +110,7 @@ jobs:
       - run: make build
 
       - run: make checks
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: Checkstyle and SpotBugs reports
           path: reports
@@ -120,13 +120,13 @@ jobs:
       - timeout-minutes: 10
         run: make tests
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: Unit test results
           path: core/build/resources/test/org/mapfish/print/
           if-no-files-found: ignore
         if: failure()
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: Unit test report
           path: core/build/reports/tests/test/
@@ -139,7 +139,7 @@ jobs:
       - run: c2cciutils-docker-logs || true
         if: always()
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: Acceptance tests (Examples)
           path: examples/build/resources/test/examples/
@@ -155,7 +155,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: git diff --exit-code --patch > /tmp/dpkg-versions.patch; git diff --color; git reset --hard || true
         if: failure()
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: Update dpkg versions list.patch
           path: /tmp/dpkg-versions.patch

.pre-commit-config.yaml

@@ -21,15 +21,15 @@ repos:
             |\.github/ghci\.yaml
           )$
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 42.29.4
+    rev: 42.69.2
     hooks:
       - id: renovate-config-validator
   - repo: https://github.com/sbrunner/hooks
     rev: 1.6.1
     hooks:
       - id: canonicalize
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.7
+    rev: v0.14.10
     hooks:
       - id: ruff-format
   - repo: https://github.com/sbrunner/python-versions-hook

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-  id("com.github.spotbugs") version "6.4.7"
+  id("com.github.spotbugs") version "6.4.8"
 }
 
 defaultTasks 'build'
@@ -60,12 +60,12 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
     compileJava {
         options.encoding = 'utf-8'
         options.deprecation = true
-        options.compilerArgs += ['-Xlint:unchecked']
+        options.compilerArgs += ['-Xlint:unchecked', '-parameters']
     }
 
     dependencies {
         testImplementation(
-                'org.mockito:mockito-core:5.20.0',
+            'org.mockito:mockito-core:5.20.0',
         )
     }
 
@@ -88,4 +88,3 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 tasks.register('docs') {
     enabled = false
 }
-

ci/requirements.txt

@@ -1,3 +1,3 @@
 c2cciutils==1.7.5
-pre-commit==4.5.0
+pre-commit==4.5.1
 tag-publish==1.1.1

core/Dockerfile

@@ -1,6 +1,6 @@
 FROM mapfish_print_builder AS builder
 
-FROM tomcat:9.0.112-jre21-temurin-jammy AS runner
+FROM tomcat:10-jre21-temurin-jammy AS runner
 LABEL maintainer="Camptocamp <[email protected]>"
 
 RUN --mount=type=cache,target=/var/cache,sharing=locked \

core/build.gradle

@@ -91,6 +91,8 @@ test {
         junitXml.getRequired().set(true)
         html.getRequired().set(true)
     }
+    maxHeapSize = "2G"
+    useJUnitPlatform()
 }
 
 build {
@@ -125,88 +127,97 @@ configurations {
 
 dependencies {
     implementation(
-            'org.springframework:spring-context:5.3.39',
-            'org.springframework:spring-web:5.3.39',
-            'org.springframework:spring-webmvc:5.3.39',
-            'org.springframework:spring-aspects:5.3.39',
-            'org.springframework:spring-orm:5.3.39',
-            'org.springframework:spring-jdbc:5.3.39',
-            'org.springframework:spring-tx:5.3.39',
-            'org.springframework:spring-test:5.3.39',
-            'org.springframework.security:spring-security-config:5.8.16',
-            'org.springframework.security:spring-security-web:5.8.16',
-            'com.thetransactioncompany:cors-filter:2.10',
-            'org.hibernate:hibernate-core:5.6.15.Final',
-            'org.postgresql:postgresql:42.7.8',
-            'com.vladmihalcea:hibernate-types-52:2.21.1',
-            'com.mchange:c3p0:0.11.2',
-            'javax.media:jai-core:1.1.3',
+        'org.springframework:spring-context:7.0.1',
+        'org.springframework:spring-core:7.0.1',
+        'org.springframework:spring-web:7.0.1',
+        'org.springframework:spring-webmvc:7.0.1',
+        'org.springframework:spring-aspects:7.0.1',
+        'org.springframework:spring-orm:7.0.1',
+        'org.springframework:spring-jdbc:7.0.1',
+        'org.springframework:spring-tx:7.0.1',
+        'org.springframework:spring-test:7.0.1',
+        'org.springframework.security:spring-security-config:7.0.1',
+        'org.springframework.security:spring-security-web:7.0.1',
+        'com.thetransactioncompany:cors-filter:3.1',
+        'org.hibernate:hibernate-core:6.6.38.Final',
+        'org.postgresql:postgresql:42.7.8',
+        'io.hypersistence:hypersistence-utils-hibernate-63:3.13.2',
+        'com.mchange:c3p0:0.11.2',
+        'javax.media:jai-core:1.1.3',
+        'jakarta.annotation:jakarta.annotation-api:3.0.0',
+        'jakarta.persistence:jakarta.persistence-api:3.0.0',
+        'jakarta.servlet:jakarta.servlet-api:6.1.0'
     )
     metrics(
-            'io.dropwizard.metrics:metrics-core:4.2.37',
-            'io.dropwizard.metrics:metrics-servlet:4.2.37',
-            'io.dropwizard.metrics:metrics-httpclient:4.2.37',
-            'io.dropwizard.metrics:metrics-servlets:4.2.37',
-            'io.dropwizard.metrics:metrics-jvm:4.2.37',
-            'io.dropwizard.metrics:metrics-jmx:4.2.37',
-            'io.dropwizard.metrics:metrics-logback:4.2.37',
+        'io.dropwizard.metrics:metrics-core:4.2.37',
+        'io.dropwizard.metrics:metrics-jakarta-servlet:4.2.37',
+        'io.dropwizard.metrics:metrics-jakarta-servlets:4.2.37',
+        'io.dropwizard.metrics:metrics-httpclient:4.2.37',
+        'io.dropwizard.metrics:metrics-jvm:4.2.37',
+        'io.dropwizard.metrics:metrics-jmx:4.2.37',
+        'io.dropwizard.metrics:metrics-logback:4.2.37',
     )
     geotools(
-            'org.geotools:gt-epsg-hsql:34.1',
-            'org.geotools:gt-render:34.1',
-            'org.geotools:gt-geojson:34.1',
-            'org.geotools:gt-geotiff:34.1',
-            'org.geotools:gt-wms:34.1',
-            'org.geotools.xsd:gt-xsd-gml3:34.1',
-            'org.geotools:gt-svg:34.1',
-            'org.geotools:gt-cql:34.1',
+        'org.geotools:gt-epsg-hsql:34.1',
+        'org.geotools:gt-render:34.1',
+        'org.geotools:gt-geojson:34.1',
+        'org.geotools:gt-geotiff:34.1',
+        'org.geotools:gt-wms:34.1',
+        'org.geotools.xsd:gt-xsd-gml3:34.1',
+        'org.geotools:gt-svg:34.1',
+        'org.geotools:gt-cql:34.1',
     )
+    implementation "org.apache.httpcomponents.client5:httpclient5:5.4.4"
     jasper(
-            'ar.com.fdvs:DynamicJasper:5.3.9',
-            'com.itextpdf:itextpdf:5.5.13.4',
-            'net.sf.jasperreports:jasperreports:7.0.3',
-            'net.sf.jasperreports:jasperreports-excel-poi:7.0.3',
-            'net.sf.jasperreports:jasperreports-fonts:7.0.3',
-            'net.sf.jasperreports:jasperreports-functions:7.0.3',
-            'net.sf.jasperreports:jasperreports-json:7.0.3',
-            'net.sf.jasperreports:jasperreports-jdt:7.0.3',
-            'net.sf.jasperreports:jasperreports-pdf:7.0.3',
+        'ar.com.fdvs:DynamicJasper:5.3.9',
+        'com.itextpdf:itextpdf:5.5.13.4',
+        'net.sf.jasperreports:jasperreports:7.0.3',
+        'net.sf.jasperreports:jasperreports-excel-poi:7.0.3',
+        'net.sf.jasperreports:jasperreports-fonts:7.0.3',
+        'net.sf.jasperreports:jasperreports-functions:7.0.3',
+        'net.sf.jasperreports:jasperreports-json:7.0.3',
+        'net.sf.jasperreports:jasperreports-jdt:7.0.3',
+        'net.sf.jasperreports:jasperreports-pdf:7.0.3',
     )
     implementation(
-            'org.slf4j:slf4j-api:2.0.17',
-            'org.slf4j:jcl-over-slf4j:2.0.17',
-            'org.slf4j:jul-to-slf4j:2.0.17',
-            'ch.qos.logback:logback-classic:1.5.21',
-            'ch.qos.logback:logback-access:1.5.21',
-            'org.json:json:20250517',
-            'org.yaml:snakeyaml:2.5',
-            'com.github.spullara.cli-parser:cli-parser:1.1.6',
-            'com.sun.mail:javax.mail:1.6.2',
-            'com.amazonaws:aws-java-sdk-s3:1.12.794',
-            'io.sentry:sentry-logback:8.27.1',
-            // For JSON logs
-            'net.logstash.logback:logstash-logback-encoder:9.0',
-            // For PDF/A
-            'com.adobe.xmp:xmpcore:6.1.11',
-            // For JasperReports
-            'joda-time:joda-time:2.14.0',
-            'org.jfree:jcommon:1.0.24',
-            'org.apache.groovy:groovy-all:5.0.2',
-            'xalan:serializer:2.7.3',
-            // For WebP images
-            'com.twelvemonkeys.imageio:imageio-webp:3.12.0',
+        'org.slf4j:slf4j-api:2.0.17',
+        'org.slf4j:jcl-over-slf4j:2.0.17',
+        'org.slf4j:jul-to-slf4j:2.0.17',
+            'ch.qos.logback:logback-classic:1.5.23',
+            'ch.qos.logback:logback-access:1.5.23',
+        'org.json:json:20250517',
+        'org.yaml:snakeyaml:2.5',
+        'com.github.spullara.cli-parser:cli-parser:1.1.6',
+        'com.sun.mail:javax.mail:1.6.2',
+            'com.amazonaws:aws-java-sdk-s3:1.12.797',
+            'io.sentry:sentry-logback:8.29.0',
+        // For JSON logs
+        'net.logstash.logback:logstash-logback-encoder:9.0',
+        // For PDF/A
+        'com.adobe.xmp:xmpcore:6.1.11',
+        // For JasperReports
+        'joda-time:joda-time:2.14.0',
+        'org.jfree:jcommon:1.0.24',
+            'org.apache.groovy:groovy-all:5.0.3',
+        'xalan:serializer:2.7.3',
+        // For WebP images
+            'com.twelvemonkeys.imageio:imageio-webp:3.13.0',
     )
 
     implementation(
-            'org.apache.xmlgraphics:batik-codec:1.19',
-            'org.apache.xmlgraphics:batik-svg-dom:1.19'
+        'org.apache.xmlgraphics:batik-codec:1.19',
+        'org.apache.xmlgraphics:batik-svg-dom:1.19'
     )
 
-    providedCompile('javax.servlet:javax.servlet-api:4.0.1')
+    //providedCompile('jakarta.servlet:jakarta.servlet-api:6.1.0')
     compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.8'
 
-    testImplementation 'de.saly:javamail-mock2-fullmock:0.5-beta4'
-    testImplementation 'com.h2database:h2:2.4.240'
+    testImplementation (
+        'de.saly:javamail-mock2-fullmock:0.5-beta4',
+        'com.h2database:h2:2.4.240',
+        'org.junit.jupiter:junit-jupiter:6.0.1',
+        'org.junit.jupiter:junit-jupiter-api:6.0.1',
+    )
 }
 
 static def gitRevision() {
@@ -228,14 +239,14 @@ processResources {
 
 def addManifestAttribute(manifest) {
     manifest.mainAttributes(
-            'Mapfish-Print-Version': version,
-            'Git-Revision': gitRevision(),
-            'Build-Time': new Date().getDateTimeString(),
-            'Build-By': System.getProperty('user.name', 'unknown'),
-            'Build-Java-Runtime-Name': System.getProperty('java.runtime.name', 'unknown'),
-            'Build-Java-Version': System.getProperty('java.version', 'unknown'),
-            'Build-OS-Arch': System.getProperty('os.arch', 'unknown'),
-            'Build-OS-Name': System.getProperty('os.name', 'unknown')
+        'Mapfish-Print-Version': version,
+        'Git-Revision': gitRevision(),
+        'Build-Time': new Date().getDateTimeString(),
+        'Build-By': System.getProperty('user.name', 'unknown'),
+        'Build-Java-Runtime-Name': System.getProperty('java.runtime.name', 'unknown'),
+        'Build-Java-Version': System.getProperty('java.version', 'unknown'),
+        'Build-OS-Arch': System.getProperty('os.arch', 'unknown'),
+        'Build-OS-Name': System.getProperty('os.name', 'unknown')
     )
 }
 
@@ -280,7 +291,7 @@ gradle.taskGraph.whenReady { taskGraph ->
             print.args printArgs.toString().split(" ").toList()
         } else {
             throw new IllegalArgumentException('You must supply the -PprintArgs="..." arguments.\nFor Example:\n\n./gradlew print ' +
-                    '-PprintArgs="-config examples/config.yaml -spec examples/spec.json -output ./output.pdf"\n\n')
+                '-PprintArgs="-config examples/config.yaml -spec examples/spec.json -output ./output.pdf"\n\n')
         }
     }
 }

core/src/main/java/org/mapfish/print/ImageInit.java

@@ -1,7 +1,7 @@
 package org.mapfish.print;
 
 import com.twelvemonkeys.imageio.plugins.webp.WebPImageReaderSpi;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import javax.imageio.ImageIO;
 import javax.imageio.spi.IIORegistry;
 import org.slf4j.Logger;

core/src/main/java/org/mapfish/print/MapPrinter.java

@@ -1,5 +1,6 @@
 package org.mapfish.print;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +11,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import javax.annotation.Nonnull;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;

core/src/main/java/org/mapfish/print/VersionInfo.java

@@ -1,14 +1,14 @@
 package org.mapfish.print;
 
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.ServletContext;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
-import javax.servlet.ServletContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

core/src/main/java/org/mapfish/print/attribute/Attribute.java

@@ -1,6 +1,6 @@
 package org.mapfish.print.attribute;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.json.JSONException;
 import org.json.JSONWriter;
 import org.mapfish.print.config.ConfigurationObject;

core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java

@@ -1,10 +1,10 @@
 package org.mapfish.print.attribute;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONWriter;
 import org.mapfish.print.PrintException;