From 53997c2fa3ac52244c1012288a220fd897036def Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 4 Dec 2025 15:54:16 +0100
Subject: [PATCH 01/61] OpenRewrite config

---
 build.gradle | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/build.gradle b/build.gradle
index 0ea89a6ab..c18e27f76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
 
 plugins {
   id("com.github.spotbugs") version "6.4.7"
+  id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -89,3 +90,16 @@ tasks.register('docs') {
     enabled = false
 }
 
+
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.framework.UpgradeSpringFramework_7_0")
+    setExportDatatables(true)
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    rewrite("org.openrewrite.recipe:rewrite-spring:6.19.0")
+}

From a11b240e5a3d8abcc6796a519d9a181d68be9372 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 4 Dec 2025 16:04:57 +0100
Subject: [PATCH 02/61] OpenRewrite automated upgrade

---
 core/build.gradle                             | 17 ++---
 .../http/ConfigFileResolvingRequest.java      |  2 +-
 .../print/http/ConfigurableRequest.java       |  4 +-
 .../mapfish/print/http/HttpCredential.java    |  8 +--
 .../org/mapfish/print/http/HttpProxy.java     |  4 +-
 .../print/http/HttpRequestFetcher.java        |  2 +-
 .../http/MfClientHttpRequestFactoryImpl.java  | 64 +++++++++----------
 .../print/http/MfCredentialsProvider.java     | 10 +--
 .../mapfish/print/http/MfRoutePlanner.java    | 12 ++--
 .../print/http/MfSSLSocketFactory.java        |  8 +--
 .../mapfish/print/http/UserAgentCreator.java  |  2 +-
 .../print/map/geotools/FeaturesParser.java    |  2 +-
 .../map/image/AbstractSingleImageLayer.java   |  4 +-
 .../print/map/image/wms/WmsUtilities.java     |  4 +-
 .../print/map/style/ParserPluginUtils.java    |  2 +-
 .../mapfish/print/map/tiled/CoverageTask.java |  4 +-
 .../print/processor/ExecutionStats.java       |  6 +-
 .../processor/http/matcher/MatchInfo.java     |  2 +-
 .../processor/jasper/HttpImageResolver.java   |  4 +-
 .../processor/jasper/LegendProcessor.java     |  4 +-
 .../servlet/job/HibernateAccountingEntry.java |  2 +-
 .../print/url/data/DataUrlConnection.java     |  2 +-
 .../mapfish/print/TestHttpClientFactory.java  |  4 +-
 .../http/ConfigFileResolvingRequestTest.java  |  6 +-
 .../print/http/HttpCredentialTest.java        |  6 +-
 .../map/style/ParserPluginUtilsTest.java      |  2 +-
 .../map/tiled/SingleTileLoaderTaskTest.java   |  2 +-
 .../http/matcher/AddressHostMatcherTest.java  |  2 +-
 .../http/matcher/DnsHostMatcherTest.java      |  2 +-
 .../http/matcher/HostnameMatcherTest.java     |  2 +-
 .../http/matcher/LocalHostMatcherTest.java    |  2 +-
 docs/build.gradle                             |  8 +--
 examples/build.gradle                         |  4 +-
 33 files changed, 105 insertions(+), 104 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1f82b982e..1bc83ff46 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -125,14 +125,14 @@ 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:spring-context: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:5.8.16',
             'org.springframework.security:spring-security-web:5.8.16',
             'com.thetransactioncompany:cors-filter:2.10',
@@ -161,6 +161,7 @@ dependencies {
             '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',
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
index 304f1590e..9e308dec8 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
@@ -184,7 +184,7 @@ private ClientHttpResponse attemptToFetchResponse(final HttpHeaders headers) thr
     final int minStatusCodeError = HttpStatus.INTERNAL_SERVER_ERROR.value();
     int rawStatusCode = minStatusCodeError;
     try {
-      rawStatusCode = response.getRawStatusCode();
+      rawStatusCode = response.getStatusCode().value();
       if (rawStatusCode < minStatusCodeError) {
         LOGGER.debug("Successfully fetched {}, with status code {}", getURI(), rawStatusCode);
         return response;
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java
index b30361916..e3e026910 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.http;
 
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.mapfish.print.config.Configuration;
 import org.springframework.http.client.ClientHttpRequest;
 
@@ -10,7 +10,7 @@
  */
 public interface ConfigurableRequest extends ClientHttpRequest {
   /** Obtain the request object. */
-  HttpRequestBase getUnderlyingRequest();
+  HttpUriRequestBase getUnderlyingRequest();
 
   /**
    * Set the current configuration object. This should only be called by {@link
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index 63f8fe1e1..cda3bbf32 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -5,9 +5,9 @@
 import java.net.UnknownHostException;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationObject;
 import org.mapfish.print.processor.http.matcher.MatchInfo;
@@ -113,6 +113,6 @@ public final Credentials toCredentials(final AuthScope authscope) {
     } else {
       passwordString = null;
     }
-    return new UsernamePasswordCredentials(this.username, passwordString);
+    return new UsernamePasswordCredentials(this.username, passwordString.toCharArray());
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/HttpProxy.java b/core/src/main/java/org/mapfish/print/http/HttpProxy.java
index eb0e1eb90..b95ce4dac 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpProxy.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpProxy.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
 import java.util.List;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.http.matcher.URIMatcher;
 
@@ -34,7 +34,7 @@ public final class HttpProxy extends HttpCredential {
   private String scheme;
 
   public HttpHost getHttpHost() {
-    return new HttpHost(this.host, this.port, getScheme());
+    return new HttpHost(getScheme(), this.host, this.port);
   }
 
   private String getScheme() {
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
index 51a81325f..18eb0e6ae 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -85,7 +85,7 @@ private final class CachedClientHttpResponse extends AbstractClientHttpResponse
 
     private CachedClientHttpResponse(final ClientHttpResponse originalResponse) throws IOException {
       this.headers = originalResponse.getHeaders();
-      this.status = originalResponse.getRawStatusCode();
+      this.status = originalResponse.getStatusCode().value();
       this.statusText = originalResponse.getStatusText();
       this.cachedFile = createCachedFile(originalResponse.getBody());
     }
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 50c04b769..6ba9d1db6 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -12,24 +12,24 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.apache.http.Header;
-import org.apache.http.HeaderElement;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.SystemDefaultDnsResolver;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpEntityContainer;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,9 +85,9 @@ private static CloseableHttpClient createHttpClient(
       final int socketTimeout) {
     final RequestConfig requestConfig =
         RequestConfig.custom()
-            .setConnectionRequestTimeout(connectionRequestTimeout)
-            .setConnectTimeout(connectTimeout)
-            .setSocketTimeout(socketTimeout)
+            .setConnectionRequestTimeout(connectionRequestTimeout, TimeUnit.MILLISECONDS)
+            .setConnectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+            .setResponseTimeout(socketTimeout, TimeUnit.MILLISECONDS)
             .build();
 
     final HttpClientBuilder httpClientBuilder =
@@ -116,7 +116,7 @@ private static CloseableHttpClient createHttpClient(
   @Nonnull
   public ConfigurableRequest createRequest(
       @Nonnull final URI uri, @Nonnull final HttpMethod httpMethod) {
-    HttpRequestBase httpRequest = (HttpRequestBase) createHttpUriRequest(httpMethod, uri);
+    HttpUriRequestBase httpRequest = (HttpUriRequestBase) createHttpUriRequest(httpMethod, uri);
     return new Request(getHttpClient(), httpRequest, createHttpContext(httpMethod, uri));
   }
 
@@ -146,14 +146,14 @@ public static final class Request extends AbstractClientHttpRequest
       implements ConfigurableRequest {
 
     private final HttpClient client;
-    private final HttpRequestBase request;
+    private final HttpUriRequestBase request;
     private final HttpContext context;
     private final ByteArrayOutputStream outputStream;
     private Configuration configuration;
 
     Request(
         @Nonnull final HttpClient client,
-        @Nonnull final HttpRequestBase request,
+        @Nonnull final HttpUriRequestBase request,
         @Nullable final HttpContext context) {
       this.client = client;
       this.request = request;
@@ -173,7 +173,7 @@ public HttpContext getContext() {
       return this.context;
     }
 
-    public HttpRequestBase getUnderlyingRequest() {
+    public HttpUriRequestBase getUnderlyingRequest() {
       return this.request;
     }
 
@@ -189,7 +189,7 @@ public String getMethodValue() {
 
     @Nonnull
     public URI getURI() {
-      return this.request.getURI();
+      return this.request.getUri();
     }
 
     @Nonnull
@@ -211,19 +211,19 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
 
       for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
         String headerName = entry.getKey();
-        if (!headerName.equalsIgnoreCase(HTTP.CONTENT_LEN)
-            && !headerName.equalsIgnoreCase(HTTP.TRANSFER_ENCODING)) {
+        if (!headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.CONTENT_LENGTH)
+            && !headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
           for (String headerValue : entry.getValue()) {
             this.request.addHeader(headerName, headerValue);
           }
         }
       }
-      if (this.request instanceof HttpEntityEnclosingRequest entityEnclosingRequest) {
+      if (this.request instanceof HttpEntityContainer entityEnclosingRequest) {
         final HttpEntity requestEntity = new ByteArrayEntity(this.outputStream.toByteArray());
         entityEnclosingRequest.setEntity(requestEntity);
       }
-      HttpResponse response = this.client.execute(this.request, this.context);
-      LOGGER.debug("Response: {} -- {}", response.getStatusLine().getStatusCode(), this.getURI());
+      ClassicHttpResponse response = this.client.execute(this.request, this.context);
+      LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
     }
@@ -232,24 +232,24 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
   public static class Response extends AbstractClientHttpResponse {
     private static final Logger LOGGER = LoggerFactory.getLogger(Response.class);
     private static final AtomicInteger ID_COUNTER = new AtomicInteger();
-    private final HttpResponse response;
+    private final ClassicHttpResponse response;
     private final int id = ID_COUNTER.incrementAndGet();
     private InputStream inputStream;
 
-    Response(@Nonnull final HttpResponse response) {
+    Response(@Nonnull final ClassicHttpResponse response) {
       this.response = response;
       LOGGER.trace("Creating Http Response object: {}", this.id);
     }
 
     @Override
     public int getRawStatusCode() {
-      return this.response.getStatusLine().getStatusCode();
+      return this.response.getCode();
     }
 
     @Nonnull
     @Override
     public String getStatusText() {
-      return this.response.getStatusLine().getReasonPhrase();
+      return this.response.getReasonPhrase();
     }
 
     @Override
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 2bf7719b8..98ee84a40 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.SystemDefaultCredentialsProvider;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
 import org.mapfish.print.config.Configuration;
 
 /**
@@ -13,7 +13,7 @@
  * org.mapfish.print.http.MfClientHttpRequestFactoryImpl#CURRENT_CONFIGURATION}.
  *
  * <p>If authentication is not found in configuration then it will fall back to {@link
- * org.apache.http.impl.client.SystemDefaultCredentialsProvider}
+ * org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider}
  *
  * <p>{@link MfClientHttpRequestFactoryImpl.Request} will set the correct configuration before the
  * request is executed so that correct proxies will be set.
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index 68a571a35..dcd469867 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -6,11 +6,11 @@
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.List;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.impl.conn.DefaultRoutePlanner;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.http.HttpMethod;
@@ -30,7 +30,7 @@ public MfRoutePlanner() {
 
   @Override
   protected HttpHost determineProxy(
-      final HttpHost target, final HttpRequest request, final HttpContext context)
+      final HttpHost target, final ClassicHttpRequest request, final HttpContext context)
       throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config == null) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java b/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
index ff52cda70..d761bb6fd 100644
--- a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
+++ b/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
@@ -4,10 +4,10 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import javax.net.ssl.SSLContext;
-import org.apache.http.HttpHost;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 
 /** A ssl socket factory that obtains the keystore from the current configuration. */
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index 6d1ca88a2..a6bc9af55 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.http;
 
-import org.apache.http.util.VersionInfo;
+import org.apache.hc.core5.util.VersionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
index 65f9d9375..5ce2466d1 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
@@ -93,7 +93,7 @@ static CoordinateReferenceSystem parseCoordinateReferenceSystem(
                   requestFactory.createRequest(new URI(uri), HttpMethod.GET);
               try (ClientHttpResponse response = request.execute()) {
 
-                if (response.getRawStatusCode() == HttpStatus.OK.value()) {
+                if (response.getStatusCode().value() == HttpStatus.OK.value()) {
                   final String wkt =
                       IOUtils.toString(response.getBody(), Constants.DEFAULT_ENCODING);
                   try {
diff --git a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
index f7a7c43fb..69489e24c 100644
--- a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
@@ -198,7 +198,7 @@ private boolean isResponseStatusCodeValid(
       final String stringBody,
       final String baseMetricName)
       throws IOException {
-    if (httpResponse.getRawStatusCode() != HttpStatus.OK.value()) {
+    if (httpResponse.getStatusCode().value() != HttpStatus.OK.value()) {
       String message =
           String.format(
               """
@@ -209,7 +209,7 @@ private boolean isResponseStatusCodeValid(
               %s\
               """,
               request.getURI(),
-              httpResponse.getRawStatusCode(),
+              httpResponse.getStatusCode().value(),
               HttpStatus.OK.value(),
               httpResponse.getStatusText(),
               String.join("\n", Utils.getPrintableHeadersList(request.getHeaders())),
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
index ed3acf986..00c003ec6 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -14,8 +14,8 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.hc.core5.net.URLEncodedUtils;
+import org.apache.hc.core5.http.NameValuePair;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.ows.wms.request.GetMapRequest;
diff --git a/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java b/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
index 4fc4635c5..4b6b7c7a5 100644
--- a/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
+++ b/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
@@ -47,7 +47,7 @@ public static Optional<Style> loadStyleAsURI(
     try {
       final ClientHttpRequest request = clientHttpRequestFactory.createRequest(uri, HttpMethod.GET);
       try (ClientHttpResponse response = request.execute()) {
-        httpStatusCode = response.getRawStatusCode();
+        httpStatusCode = response.getStatusCode().value();
         input = IOUtils.toByteArray(response.getBody());
       }
     } catch (Exception e) {
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
index 556fcd197..c57241b4c 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
@@ -251,7 +251,7 @@ protected Tile compute() {
 
     private Tile handleSpecialStatuses(
         final ClientHttpResponse response, final String baseMetricName) throws IOException {
-      final int httpStatusCode = response.getRawStatusCode();
+      final int httpStatusCode = response.getStatusCode().value();
       if (httpStatusCode == HttpStatus.NO_CONTENT.value()
           || httpStatusCode == HttpStatus.NOT_FOUND.value()) {
         if (httpStatusCode == HttpStatus.NOT_FOUND.value()) {
@@ -291,7 +291,7 @@ private BufferedImage getImageFromResponse(
 
     private Tile handleNonOkStatus(final ClientHttpResponse response, final String baseMetricName)
         throws IOException {
-      final int httpStatusCode = response.getRawStatusCode();
+      final int httpStatusCode = response.getStatusCode().value();
       String errorMessage =
           String.format(
               "Error making tile request: %s\n\tStatus: %d\n\tStatus message: %s",
diff --git a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
index 85fb6d45a..6467551c3 100644
--- a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
+++ b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.ObjectNode;
 import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index 5e6548539..e20435adb 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -3,7 +3,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
 
 /** Information required for performing a request match. */
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java b/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
index 5bc6ee6fd..ae6753f49 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
@@ -83,7 +83,7 @@ public BufferedImage resolve(final MfClientHttpRequestFactory requestFactory, fi
 
   private BufferedImage getImageFromResponse(final ClientHttpResponse response, final URI url)
       throws IOException {
-    if (response.getRawStatusCode() == HttpStatus.OK.value()) {
+    if (response.getStatusCode().value() == HttpStatus.OK.value()) {
       try {
         final BufferedImage image = ImageIO.read(response.getBody());
         if (image == null) {
@@ -98,7 +98,7 @@ private BufferedImage getImageFromResponse(final ClientHttpResponse response, fi
       LOGGER.warn(
           "Error loading the table row image: {}.\nStatus Code: {}\nStatus Text: {}",
           url,
-          response.getRawStatusCode(),
+          response.getStatusCode().value(),
           response.getStatusText());
     }
     return this.defaultImage;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
index 12d30a8b5..200435373 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
@@ -386,7 +386,7 @@ private BufferedImage loadImage(final URI uri) {
               this.clientHttpRequestFactory.createRequest(uri, HttpMethod.GET);
           try (Timer.Context ignored = metricRegistry.timer(metricName).time()) {
             try (ClientHttpResponse httpResponse = request.execute()) {
-              if (httpResponse.getRawStatusCode() == HttpStatus.OK.value()) {
+              if (httpResponse.getStatusCode().value() == HttpStatus.OK.value()) {
                 image = ImageIO.read(httpResponse.getBody());
                 if (image == null) {
                   LOGGER.warn("There is no image in this response body {}", httpResponse.getBody());
@@ -419,7 +419,7 @@ private void logNotOkResponseStatus(final ClientHttpResponse httpResponse) throw
           \t{}\
           """,
           this.icon,
-          httpResponse.getRawStatusCode(),
+          httpResponse.getStatusCode().value(),
           httpResponse.getStatusText(),
           String.join("\n\t", Utils.getPrintableHeadersList(httpResponse.getHeaders())));
     }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
index 79f038810..0d79057ab 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.servlet.job;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.ObjectNode;
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import java.util.Date;
 import javax.persistence.Column;
diff --git a/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java b/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java
index 888e3bb14..ea3f2db39 100644
--- a/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java
+++ b/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java
@@ -8,7 +8,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 
 /** Decodes the base64 data and provides an appropriate InputStream. */
 public class DataUrlConnection extends URLConnection {
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index 1af6a56df..dbac83626 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.ConfigurableRequest;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
@@ -85,7 +85,7 @@ private record TestConfigurableRequest(MockClientHttpRequest httpRequest)
       implements ConfigurableRequest {
 
     @Override
-    public HttpRequestBase getUnderlyingRequest() {
+    public HttpUriRequestBase getUnderlyingRequest() {
       throw new UnsupportedOperationException("Not supported");
     }
 
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
index 331d3964b..cff48acf3 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
@@ -46,7 +46,7 @@ public void httpRequestWithRetryShouldSucceedAtSecondAttempt() throws IOExceptio
     var resp = req.executeInternal(new HttpHeaders());
 
     // Then
-    assertEquals(200, resp.getRawStatusCode());
+    assertEquals(200, resp.getStatusCode().value());
     resp.close();
   }
 
@@ -67,7 +67,7 @@ public void httpRequestWithRetryShouldSucceedDespiteException() throws IOExcepti
     var resp = req.executeInternal(new HttpHeaders());
 
     // Then
-    assertEquals(200, resp.getRawStatusCode());
+    assertEquals(200, resp.getStatusCode().value());
     resp.close();
   }
 
@@ -108,7 +108,7 @@ private MfClientHttpRequestFactoryImpl.Request initTestDefaultBehaviour(
 
   private ClientHttpResponse createResponse(final int statusCode) throws IOException {
     var clientHttpResponse = mock(ClientHttpResponse.class);
-    when(clientHttpResponse.getRawStatusCode()).thenReturn(statusCode);
+    when(clientHttpResponse.getStatusCode().value()).thenReturn(statusCode);
     return clientHttpResponse;
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index e2841f952..ccd4e2f2e 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -8,8 +8,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -77,7 +77,7 @@ public void testToCredentials() throws Exception {
     matcher.setHost(HttpProxyTest.LOCALHOST);
     credential.setMatchers(Collections.singletonList(matcher));
 
-    AuthScope authscope = AuthScope.ANY;
+    AuthScope authscope = new AuthScope(null, -1);
     final Credentials object = credential.toCredentials(authscope);
     assertNotNull(object);
     assertEquals(USERNAME, object.getUserPrincipal().getName());
diff --git a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
index 2dfe7cd64..8cac6572b 100644
--- a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
@@ -43,7 +43,7 @@ private static Optional<Style> testLoadingStyleWithStatusCode(
 
     when(factory.createRequest(new URI("http://valid.uri"), HttpMethod.GET)).thenReturn(request);
     when(request.execute()).thenReturn(response);
-    when(response.getRawStatusCode()).thenReturn(httpStatusCode);
+    when(response.getStatusCode().value()).thenReturn(httpStatusCode);
     when(response.getBody())
         .thenReturn(
             new ByteArrayInputStream(
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
index 050725212..f07d3ab50 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
@@ -88,7 +88,7 @@ public void testComputeWithUnsupportedStatusCode() throws IOException, URISyntax
 
   private ClientHttpResponse getMockResponse(int rawStatusCode) throws IOException {
     ClientHttpResponse response = mock(ClientHttpResponse.class);
-    when(response.getRawStatusCode()).thenReturn(rawStatusCode);
+    when(response.getStatusCode().value()).thenReturn(rawStatusCode);
     when(response.getStatusCode())
         .thenThrow(new RuntimeException("Unsupported status code has no HttpStatus"));
     when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index 164fcae0e..b5f7ec604 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -4,7 +4,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index efd55821c..8f022940f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -4,7 +4,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index 0e1461c20..9a8d31e83 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -5,7 +5,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 0359923bc..74d917627 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -9,7 +9,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/docs/build.gradle b/docs/build.gradle
index 242e90c7c..9d1620c55 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -20,14 +20,14 @@ dependencies {
     implementation (
             'org.apache.groovy:groovy-xml:5.0.2',
             'org.apache.groovy:groovy-json:5.0.2',
-            "org.springframework:spring-test:5.3.39",
+            "org.springframework:spring-test:7.0.1",
             'org.ccil.cowan.tagsoup:tagsoup:1.2.1',
             'com.samskivert:jmustache:1.16',
             'com.google.guava:guava:33.5.0-jre',
             'commons-io:commons-io:2.21.0',
-            "org.springframework:spring-beans:5.3.39",
-            "org.springframework:spring-web:5.3.39",
-            "org.springframework:spring-context:5.3.39",
+            "org.springframework:spring-beans:7.0.1",
+            "org.springframework:spring-web:7.0.1",
+            "org.springframework:spring-context:7.0.1",
             'javax.servlet:javax.servlet-api:4.0.1'
     )
 }
diff --git a/examples/build.gradle b/examples/build.gradle
index 8e058e354..5eb716a0d 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -15,12 +15,12 @@ dependencies {
     testImplementation(
         project(':core'),
         'commons-io:commons-io:2.17.0',
-        "org.springframework:spring-web:5.3.39",
+        "org.springframework:spring-web:7.0.1",
         'org.json:json:20240303',
         'org.apache.commons:commons-lang3:3.5',
         "org.locationtech.jts:jts-core:1.18.2",
         "org.slf4j:slf4j-api:2.0.16",
-        "org.springframework:spring-test:5.3.39",
+        "org.springframework:spring-test:7.0.1",
         "ch.qos.logback:logback-classic:1.5.15",
         "org.verapdf:validation-model:1.24.1",
         "junit:junit:4.13.2",

From 26a3b7ac07d7cd161e0fbceb1332545821e0b07d Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 11:04:24 +0100
Subject: [PATCH 03/61] Moved metrics from javax.servlet to jakarta.servlet

---
 core/build.gradle                                      |  4 ++--
 .../metrics/HealthCheckRegistryContextListener.java    |  6 +++---
 .../MapfishPrintInstrumentedFilterContextListener.java |  6 ++++--
 .../print/metrics/MetricsRegistryContextListener.java  | 10 ++++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 1bc83ff46..2461230a5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -144,9 +144,9 @@ dependencies {
     )
     metrics(
             'io.dropwizard.metrics:metrics-core:4.2.37',
-            'io.dropwizard.metrics:metrics-servlet: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-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',
diff --git a/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java
index c81f193ad..c39d8b7b4 100644
--- a/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java
@@ -3,9 +3,9 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.health.HealthCheckRegistry;
-import com.codahale.metrics.servlets.HealthCheckServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import io.dropwizard.metrics.servlets.HealthCheckServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
diff --git a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
index 6aebdf4ae..02b05f82a 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
@@ -3,9 +3,10 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.MetricRegistry;
+import io.dropwizard.metrics.servlets.HealthCheckServlet;
 import com.codahale.metrics.servlet.InstrumentedFilterContextListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -18,6 +19,7 @@ public class MapfishPrintInstrumentedFilterContextListener
 
   @Override
   protected final MetricRegistry getMetricRegistry() {
+
     final WebApplicationContext webApplicationContext =
         getWebApplicationContext(this.servletContext);
     return webApplicationContext.getBean(MetricRegistry.class);
diff --git a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
index b53e87ac2..aacdd0ba6 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
@@ -3,9 +3,9 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.servlets.MetricsServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import io.dropwizard.metrics.servlets.MetricsServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -17,14 +17,16 @@ public class MetricsRegistryContextListener extends MetricsServlet.ContextListen
 
   @Override
   public final void contextInitialized(final ServletContextEvent event) {
+
     this.servletContext = event.getServletContext();
     super.contextInitialized(event);
   }
 
   @Override
   protected final MetricRegistry getMetricRegistry() {
+    // In Spring 6+, getWebApplicationContext accepts jakarta.servlet.ServletContext
     final WebApplicationContext webApplicationContext =
-        getWebApplicationContext(this.servletContext);
+      getWebApplicationContext(this.servletContext);
     return webApplicationContext.getBean(MetricRegistry.class);
   }
 }

From 7a8a7dba33ea3d9716401f415f5b4292a9090197 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 13:27:39 +0100
Subject: [PATCH 04/61] Completed refactored core

---
 .../http/ConfigFileResolvingRequest.java      | 13 +---
 .../http/ErrorResponseClientHttpResponse.java | 11 +--
 .../print/http/HttpRequestFetcher.java        | 21 +++---
 .../http/MfClientHttpRequestFactoryImpl.java  | 68 +++++++++---------
 .../print/http/MfCredentialsProvider.java     | 19 ++---
 .../mapfish/print/http/MfRoutePlanner.java    | 15 ++--
 .../print/http/MfSSLSocketFactory.java        | 54 --------------
 .../print/http/MfTLSSocketStrategy.java       | 28 ++++++++
 .../mapfish/print/http/UserAgentCreator.java  | 10 ++-
 .../java/org/mapfish/print/http/Utils.java    |  6 +-
 .../print/map/image/wms/WmsUtilities.java     | 55 +++++++-------
 ...rintInstrumentedFilterContextListener.java |  3 +-
 .../processor/http/matcher/MatchInfo.java     | 71 +++++++++++--------
 .../print/servlet/MapPrinterServlet.java      | 10 +--
 .../mapfish/print/TestHttpClientFactory.java  |  7 --
 15 files changed, 180 insertions(+), 211 deletions(-)
 delete mode 100644 core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
 create mode 100644 core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java

diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
index 9e308dec8..72f766eee 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
@@ -171,7 +171,7 @@ private void logFetchingURIResource(final HttpHeaders headers) {
     LOGGER.debug(
         "Fetching {}, using headers:\n{}",
         this.getURI(),
-        headers.entrySet().stream()
+        headers.headerSet().stream()
             .map(entry -> entry.getKey() + "=" + String.join(", ", entry.getValue()))
             .collect(Collectors.joining("\n")));
   }
@@ -246,12 +246,6 @@ public HttpMethod getMethod() {
     return this.httpMethod;
   }
 
-  @Override
-  @Nonnull
-  public String getMethodValue() {
-    return this.httpMethod.name();
-  }
-
   @Override
   @Nonnull
   public URI getURI() {
@@ -267,11 +261,6 @@ public HttpStatus getStatusCode() {
       return HttpStatus.OK;
     }
 
-    @Override
-    public int getRawStatusCode() {
-      return getStatusCode().value();
-    }
-
     @Override
     @Nonnull
     public String getStatusText() {
diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index c21874a2b..9eb30ab35 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -1,16 +1,19 @@
 package org.mapfish.print.http;
 
+import java.io.IOException;
 import java.io.InputStream;
 import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.StreamUtils;
 
-public class ErrorResponseClientHttpResponse extends AbstractClientHttpResponse {
+public class ErrorResponseClientHttpResponse implements ClientHttpResponse {
   private final Exception exception;
 
   /** HTTP code use in response for non HTTP errors, (Not Acceptable). */
-  private static final int FAKE_HTTP_ERROR_CODE = 406;
+  private static final HttpStatusCode FAKE_HTTP_ERROR_CODE = HttpStatusCode.valueOf(406);
 
   public ErrorResponseClientHttpResponse(final Exception e) {
     assert e != null;
@@ -30,7 +33,7 @@ public InputStream getBody() {
   }
 
   @Override
-  public int getRawStatusCode() {
+  public HttpStatusCode getStatusCode() throws IOException {
     return FAKE_HTTP_ERROR_CODE;
   }
 
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
index 18eb0e6ae..3c72e5849 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -9,6 +9,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.file.Files;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -21,7 +22,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 
@@ -75,17 +76,17 @@ public ClientHttpRequest register(final ClientHttpRequest originalRequest) {
     return add(new CachedClientHttpRequest(originalRequest, this.context));
   }
 
-  private final class CachedClientHttpResponse extends AbstractClientHttpResponse {
+  private final class CachedClientHttpResponse implements ClientHttpResponse {
 
     private final File cachedFile;
     private final HttpHeaders headers;
-    private final int status;
+    private final HttpStatusCode status;
     private final String statusText;
     private InputStream body;
 
     private CachedClientHttpResponse(final ClientHttpResponse originalResponse) throws IOException {
       this.headers = originalResponse.getHeaders();
-      this.status = originalResponse.getStatusCode().value();
+      this.status = originalResponse.getStatusCode();
       this.statusText = originalResponse.getStatusText();
       this.cachedFile = createCachedFile(originalResponse.getBody());
     }
@@ -122,7 +123,7 @@ public HttpHeaders getHeaders() {
     }
 
     @Override
-    public int getRawStatusCode() {
+    public HttpStatusCode getStatusCode() throws IOException {
       return this.status;
     }
 
@@ -165,15 +166,13 @@ public HttpMethod getMethod() {
 
     @Override
     @Nonnull
-    public String getMethodValue() {
-      final HttpMethod method = getMethod();
-      return method != null ? method.name() : "";
+    public URI getURI() {
+      return this.originalRequest.getURI();
     }
 
     @Override
-    @Nonnull
-    public URI getURI() {
-      return this.originalRequest.getURI();
+    public Map<String, Object> getAttributes() {
+      return this.originalRequest.getAttributes();
     }
 
     @Override
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 6ba9d1db6..736f16783 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -7,6 +7,7 @@
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,12 +20,10 @@
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
-import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HeaderElement;
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpEntityContainer;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.core5.http.*;
 import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -35,8 +34,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.AbstractClientHttpRequest;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 
 /** Default implementation. */
@@ -91,16 +91,18 @@ private static CloseableHttpClient createHttpClient(
             .build();
 
     final HttpClientBuilder httpClientBuilder =
-        HttpClients.custom()
-            .disableCookieManagement()
-            .setDnsResolver(new RandomizingDnsResolver())
-            .setRoutePlanner(new MfRoutePlanner())
-            .setSSLSocketFactory(new MfSSLSocketFactory())
-            .setDefaultCredentialsProvider(new MfCredentialsProvider())
-            .setDefaultRequestConfig(requestConfig)
-            .setMaxConnTotal(maxConnTotal)
-            .setMaxConnPerRoute(maxConnPerRoute)
-            .setUserAgent(UserAgentCreator.getUserAgent());
+      HttpClients.custom()
+        .disableCookieManagement()
+        .setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
+          .setTlsSocketStrategy(new MfTLSSocketStrategy())
+          .setDnsResolver(new RandomizingDnsResolver())
+          .setMaxConnPerRoute(maxConnTotal)
+          .setMaxConnPerRoute(maxConnPerRoute)
+          .build())
+        .setRoutePlanner(new MfRoutePlanner())
+        .setDefaultCredentialsProvider(new MfCredentialsProvider())
+        .setDefaultRequestConfig(requestConfig)
+        .setUserAgent(UserAgentCreator.getUserAgent());
     CloseableHttpClient closeableHttpClient = httpClientBuilder.build();
     LOGGER.debug(
         "Created CloseableHttpClient using connectionRequestTimeout: {} connectTimeout: {}"
@@ -177,19 +179,18 @@ public HttpUriRequestBase getUnderlyingRequest() {
       return this.request;
     }
 
+    @Override
     public HttpMethod getMethod() {
       return HttpMethod.valueOf(this.request.getMethod());
     }
 
-    @Nonnull
-    @Override
-    public String getMethodValue() {
-      return this.request.getMethod();
-    }
-
     @Nonnull
     public URI getURI() {
-      return this.request.getUri();
+      try {
+        return this.request.getUri();
+      } catch (URISyntaxException ex) {
+        throw new RuntimeException(ex);
+      }
     }
 
     @Nonnull
@@ -209,7 +210,7 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
           this.getURI(),
           String.join("\n", Utils.getPrintableHeadersList(headers)));
 
-      for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+      for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
         String headerName = entry.getKey();
         if (!headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.CONTENT_LENGTH)
             && !headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
@@ -219,17 +220,20 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
         }
       }
       if (this.request instanceof HttpEntityContainer entityEnclosingRequest) {
-        final HttpEntity requestEntity = new ByteArrayEntity(this.outputStream.toByteArray());
+        var bytes = this.outputStream.toByteArray();
+        final HttpEntity requestEntity = new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
         entityEnclosingRequest.setEntity(requestEntity);
       }
-      ClassicHttpResponse response = this.client.execute(this.request, this.context);
+
+      ClassicHttpResponse response = this.client.executeOpen(null, this.request, this.context);
       LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
     }
   }
 
-  public static class Response extends AbstractClientHttpResponse {
+  // TODO: Do we need this class after all?
+  public static class Response implements ClientHttpResponse {
     private static final Logger LOGGER = LoggerFactory.getLogger(Response.class);
     private static final AtomicInteger ID_COUNTER = new AtomicInteger();
     private final ClassicHttpResponse response;
@@ -242,8 +246,8 @@ public static class Response extends AbstractClientHttpResponse {
     }
 
     @Override
-    public int getRawStatusCode() {
-      return this.response.getCode();
+    public HttpStatusCode getStatusCode() throws IOException {
+      return HttpStatusCode.valueOf(this.response.getCode());
     }
 
     @Nonnull
@@ -290,11 +294,9 @@ public synchronized InputStream getBody() throws IOException {
     @Override
     public HttpHeaders getHeaders() {
       final HttpHeaders translatedHeaders = new HttpHeaders();
-      final Header[] allHeaders = this.response.getAllHeaders();
+      final Header[] allHeaders = this.response.getHeaders();
       for (Header header : allHeaders) {
-        for (HeaderElement element : header.getElements()) {
-          translatedHeaders.add(header.getName(), element.toString());
-        }
+          translatedHeaders.add(header.getName(), header.getValue());
       }
       return translatedHeaders;
     }
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 98ee84a40..861673a44 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -6,6 +6,7 @@
 import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 
 /**
@@ -22,13 +23,7 @@ public final class MfCredentialsProvider implements CredentialsProvider {
   private final CredentialsProvider fallback = new SystemDefaultCredentialsProvider();
 
   @Override
-  public void setCredentials(final AuthScope authscope, final Credentials credentials) {
-    throw new UnsupportedOperationException(
-        "Credentials should be set the default Java way or in the configuration yaml file.");
-  }
-
-  @Override
-  public Credentials getCredentials(final AuthScope authscope) {
+  public Credentials getCredentials(AuthScope authScope, HttpContext context) {
 
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config != null) {
@@ -36,18 +31,12 @@ public Credentials getCredentials(final AuthScope authscope) {
       allCredentials.addAll(config.getProxies());
 
       for (HttpCredential credential : allCredentials) {
-        final Credentials credentials = credential.toCredentials(authscope);
+        final Credentials credentials = credential.toCredentials(authScope);
         if (credentials != null) {
           return credentials;
         }
       }
     }
-    return this.fallback.getCredentials(authscope);
-  }
-
-  @Override
-  public void clear() {
-    throw new UnsupportedOperationException(
-        "Credentials should be set the default Java way or in the configuration yaml file.");
+    return this.fallback.getCredentials(authScope, context);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index dcd469867..d926c29f0 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -10,7 +10,9 @@
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.http.HttpMethod;
@@ -29,20 +31,23 @@ public MfRoutePlanner() {
   }
 
   @Override
-  protected HttpHost determineProxy(
-      final HttpHost target, final ClassicHttpRequest request, final HttpContext context)
-      throws HttpException {
+  protected HttpHost determineProxy(HttpHost target, HttpContext context) throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config == null) {
       return null;
     }
+    var coreCtx = HttpCoreContext.cast(context);
+    if (coreCtx == null || coreCtx.getRequest() == null) {
+      return null;
+    }
+    var request = coreCtx.getRequest();
     final URI uri;
     try {
-      uri = new URI(request.getRequestLine().getUri());
+      uri = request.getUri();
     } catch (URISyntaxException e) {
       throw new RuntimeException(e);
     }
-    HttpMethod method = HttpMethod.valueOf(request.getRequestLine().getMethod());
+    HttpMethod method = HttpMethod.valueOf(request.getMethod());
 
     final List<HttpProxy> proxies = config.getProxies();
     for (HttpProxy proxy : proxies) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java b/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
deleted file mode 100644
index d761bb6fd..000000000
--- a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.mapfish.print.http;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import javax.net.ssl.SSLContext;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.mapfish.print.config.Configuration;
-
-/** A ssl socket factory that obtains the keystore from the current configuration. */
-public final class MfSSLSocketFactory implements LayeredConnectionSocketFactory {
-  private LayeredConnectionSocketFactory defaultFactory =
-      SSLConnectionSocketFactory.getSystemSocketFactory();
-
-  @Override
-  public Socket createLayeredSocket(
-      final Socket socket, final String target, final int port, final HttpContext context)
-      throws IOException {
-    LayeredConnectionSocketFactory factory = getSSLSocketFactory();
-    return factory.createLayeredSocket(socket, target, port, context);
-  }
-
-  @Override
-  public Socket createSocket(final HttpContext context) throws IOException {
-    LayeredConnectionSocketFactory factory = getSSLSocketFactory();
-    return factory.createSocket(context);
-  }
-
-  @Override
-  public Socket connectSocket(
-      final int connectTimeout,
-      final Socket sock,
-      final HttpHost host,
-      final InetSocketAddress remoteAddress,
-      final InetSocketAddress localAddress,
-      final HttpContext context)
-      throws IOException {
-    LayeredConnectionSocketFactory factory = getSSLSocketFactory();
-    return factory.connectSocket(connectTimeout, sock, host, remoteAddress, localAddress, context);
-  }
-
-  private LayeredConnectionSocketFactory getSSLSocketFactory() {
-    final Configuration currentConfiguration =
-        MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
-    if (currentConfiguration == null || currentConfiguration.getCertificateStore() == null) {
-      return this.defaultFactory;
-    }
-    SSLContext context = currentConfiguration.getCertificateStore().getSSLContext();
-    return new SSLConnectionSocketFactory(context);
-  }
-}
diff --git a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
new file mode 100644
index 000000000..5be4447bc
--- /dev/null
+++ b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
@@ -0,0 +1,28 @@
+package org.mapfish.print.http;
+
+import java.io.IOException;
+import java.net.Socket;
+import javax.net.ssl.SSLSocket;
+
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.mapfish.print.config.Configuration;
+
+/** A ssl socket factory that obtains the keystore from the current configuration. */
+public final class MfTLSSocketStrategy implements TlsSocketStrategy {
+  private final TlsSocketStrategy defaultStrategy = DefaultClientTlsStrategy.createDefault();
+
+  @Override
+  public SSLSocket upgrade(Socket socket, String target, int port, Object attachment, HttpContext context) throws IOException {
+    return getSocketStrategy().upgrade(socket, target, port, attachment, context);
+  }
+
+  private TlsSocketStrategy getSocketStrategy() {
+    final Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
+    if (config == null || config.getCertificateStore() == null) {
+      return this.defaultStrategy;
+    }
+    return new DefaultClientTlsStrategy(config.getCertificateStore().getSSLContext());
+  }
+}
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index a6bc9af55..9633bc162 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -24,8 +24,7 @@ private UserAgentCreator() {}
    */
   public static String getUserAgent() {
 
-    final String httpClientUserAgent =
-        VersionInfo.getUserAgent(
+    final String httpClientUserAgent = getUserAgent(
             "Apache-HttpClient", "org.apache.http.client", UserAgentCreator.class);
 
     // This is based on the code from HttpClient:
@@ -41,4 +40,11 @@ public static String getUserAgent() {
 
     return String.format("%s/%s %s", AGENT_NAME, mfpRelease, httpClientUserAgent);
   }
+
+  public static String getUserAgent(String name, String pkg, Class<?> cls) {
+    var vi = VersionInfo.loadVersionInfo(pkg, cls.getClassLoader());
+    String release = vi != null ? vi.getRelease() : "UNAVAILABLE";
+    String javaVersion = System.getProperty("java.version");
+    return String.format("%s/%s (Java/%s)", name, release, javaVersion);
+  }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/Utils.java b/core/src/main/java/org/mapfish/print/http/Utils.java
index 3ad7b8642..9ed7df29e 100644
--- a/core/src/main/java/org/mapfish/print/http/Utils.java
+++ b/core/src/main/java/org/mapfish/print/http/Utils.java
@@ -1,5 +1,7 @@
 package org.mapfish.print.http;
 
+import org.springframework.http.HttpHeaders;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -17,9 +19,9 @@ private Utils() {}
    *
    * @param headers The headers
    */
-  public static List<String> getPrintableHeadersList(final Map<String, List<String>> headers) {
+  public static List<String> getPrintableHeadersList(HttpHeaders headers) {
     final List<String> result = new ArrayList<>();
-    for (String header : headers.keySet()) {
+    for (String header : headers.headerNames()) {
       List<String> value = headers.get(header);
       if (AUTH_HEADERS.contains(header.toLowerCase())) {
         value = Arrays.asList(new String[] {"***"});
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
index 00c003ec6..441a26147 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -193,34 +193,33 @@ private static void setDpiValue(final Multimap<String, String> extraParams, fina
   public static ClientHttpRequest createWmsRequest(
       final MfClientHttpRequestFactory httpRequestFactory, final URI uri, final HttpMethod method)
       throws IOException {
-    switch (method) {
-      case GET:
-        return httpRequestFactory.createRequest(uri, method);
-      case POST:
-        final String params = uri.getQuery();
-        final URI paramlessUri;
-        try {
-          paramlessUri =
-              new URI(
-                  uri.getScheme(),
-                  uri.getUserInfo(),
-                  uri.getHost(),
-                  uri.getPort(),
-                  uri.getPath(),
-                  null,
-                  null);
-        } catch (URISyntaxException e) {
-          throw new RuntimeException(e);
-        }
-        final ClientHttpRequest request = httpRequestFactory.createRequest(paramlessUri, method);
-        final byte[] encodedParams = params.getBytes(StandardCharsets.UTF_8);
-        request.getHeaders().set("Content-Type", "application/x-www-form-urlencoded");
-        request.getHeaders().set("Charset", "utf-8");
-        request.getHeaders().set("Content-Length", Integer.toString(encodedParams.length));
-        request.getBody().write(encodedParams);
-        return request;
-      default:
-        throw new RuntimeException("Unsupported WMS request method: " + method);
+    if (method.equals(HttpMethod.GET)) {
+      return httpRequestFactory.createRequest(uri, method);
+    }
+    if (method.equals(HttpMethod.POST)) {
+      final String params = uri.getQuery();
+      final URI paramlessUri;
+      try {
+        paramlessUri =
+          new URI(
+            uri.getScheme(),
+            uri.getUserInfo(),
+            uri.getHost(),
+            uri.getPort(),
+            uri.getPath(),
+            null,
+            null);
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+      final ClientHttpRequest request = httpRequestFactory.createRequest(paramlessUri, method);
+      final byte[] encodedParams = params.getBytes(StandardCharsets.UTF_8);
+      request.getHeaders().set("Content-Type", "application/x-www-form-urlencoded");
+      request.getHeaders().set("Charset", "utf-8");
+      request.getHeaders().set("Content-Length", Integer.toString(encodedParams.length));
+      request.getBody().write(encodedParams);
+      return request;
     }
+    throw new RuntimeException("Unsupported WMS request method: " + method);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
index 02b05f82a..d84d3d1e8 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
@@ -3,8 +3,7 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.MetricRegistry;
-import io.dropwizard.metrics.servlets.HealthCheckServlet;
-import com.codahale.metrics.servlet.InstrumentedFilterContextListener;
+import io.dropwizard.metrics.servlet.InstrumentedFilterContextListener;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index e20435adb..b8db087a4 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -2,34 +2,54 @@
 
 import java.net.MalformedURLException;
 import java.net.URI;
+
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
 
-/** Information required for performing a request match. */
+/**
+ * Information required for performing a request match.
+ */
 public final class MatchInfo {
-  /** A value representing all and any schemes. */
+  /**
+   * A value representing all and any schemes.
+   */
   public static final String ANY_SCHEME = null;
 
-  /** A value representing all and any hosts. */
+  /**
+   * A value representing all and any hosts.
+   */
   public static final String ANY_HOST = null;
 
-  /** A value representing all and any realms. */
+  /**
+   * A value representing all and any realms.
+   */
   public static final String ANY_REALM = null;
 
-  /** A value representing all and any paths. */
+  /**
+   * A value representing all and any paths.
+   */
   public static final String ANY_PATH = null;
 
-  /** A value representing all and any fragments. */
+  /**
+   * A value representing all and any fragments.
+   */
   public static final String ANY_FRAGMENT = null;
 
-  /** A value representing all and any queries. */
+  /**
+   * A value representing all and any queries.
+   */
   public static final String ANY_QUERY = null;
 
-  /** A value representing all and any queries. */
+  /**
+   * A value representing all and any queries.
+   */
   public static final HttpMethod ANY_METHOD = null;
 
-  /** A value representing all and any ports. */
+  /**
+   * A value representing all and any ports.
+   */
   public static final int ANY_PORT = -1;
 
   private final String scheme;
@@ -45,9 +65,9 @@ public final class MatchInfo {
    * Constructor.
    *
    * @param scheme the scheme to match.
-   * @param host the host to match.
-   * @param port the host to match.
-   * @param realm the realm to match.
+   * @param host   the host to match.
+   * @param port   the host to match.
+   * @param realm  the realm to match.
    */
   private MatchInfo(final String scheme, final String host, final int port, final String realm) {
     this.scheme = scheme;
@@ -63,8 +83,8 @@ private MatchInfo(final String scheme, final String host, final int port, final
   /**
    * Constructor.
    *
-   * @param uri the uri containing the parameters to match.
-   * @param port the host to match.
+   * @param uri    the uri containing the parameters to match.
+   * @param port   the host to match.
    * @param method the method to match.
    */
   private MatchInfo(final URI uri, final int port, final HttpMethod method) {
@@ -81,7 +101,7 @@ private MatchInfo(final URI uri, final int port, final HttpMethod method) {
   /**
    * Create an info object from a uri and the http method object.
    *
-   * @param uri the uri
+   * @param uri    the uri
    * @param method the method
    */
   public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
@@ -103,19 +123,14 @@ public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
    * @param authscope the authscope
    */
   public static MatchInfo fromAuthScope(final AuthScope authscope) {
-    String newScheme =
-        StringUtils.equals(authscope.getScheme(), AuthScope.ANY_SCHEME)
-            ? ANY_SCHEME
-            : authscope.getScheme();
-    String newHost =
-        StringUtils.equals(authscope.getHost(), AuthScope.ANY_HOST)
-            ? ANY_HOST
-            : authscope.getHost();
-    int newPort = authscope.getPort() == AuthScope.ANY_PORT ? ANY_PORT : authscope.getPort();
-    String newRealm =
-        StringUtils.equals(authscope.getRealm(), AuthScope.ANY_REALM)
-            ? ANY_REALM
-            : authscope.getRealm();
+
+    String newScheme = Strings.CS.equals(authscope.getSchemeName(), ANY_SCHEME) ? ANY_SCHEME
+      : authscope.getSchemeName();
+    String newHost = Strings.CS.equals(authscope.getHost(), ANY_HOST) ? ANY_HOST
+      : authscope.getHost();
+    int newPort = authscope.getPort() == ANY_PORT ? ANY_PORT : authscope.getPort();
+    String newRealm = Strings.CS.equals(authscope.getRealm(), ANY_REALM) ? ANY_REALM
+      : authscope.getRealm();
 
     return new MatchInfo(newScheme, newHost, newPort, newRealm);
   }
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index 967257e62..12a635b5b 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -21,13 +21,7 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
@@ -1173,7 +1167,7 @@ private boolean checkReferer(final HttpServletRequest request, final MapPrinter
       referrer = "http://localhost/";
     }
     try {
-      return allowedReferers.matches(new URI(referrer), HttpMethod.resolve(request.getMethod()));
+      return allowedReferers.matches(new URI(referrer), HttpMethod.valueOf(request.getMethod().toUpperCase(Locale.ROOT)));
     } catch (SocketException
         | UnknownHostException
         | URISyntaxException
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index dbac83626..087adc618 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -111,13 +111,6 @@ public HttpMethod getMethod() {
       return httpRequest.getMethod();
     }
 
-    @Nonnull
-    @Override
-    public String getMethodValue() {
-      final HttpMethod method = httpRequest.getMethod();
-      return method.name();
-    }
-
     @Nonnull
     @Override
     public URI getURI() {

From 03aa703cdf0ca1b6d082f599a67f6c171da26979 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 13:48:33 +0100
Subject: [PATCH 05/61] Fixed checkstyle issues

---
 .../http/ErrorResponseClientHttpResponse.java    |  1 -
 .../http/MfClientHttpRequestFactoryImpl.java     |  7 +++++--
 .../print/http/MfCredentialsProvider.java        |  2 +-
 .../org/mapfish/print/http/MfRoutePlanner.java   |  4 +---
 .../mapfish/print/http/MfTLSSocketStrategy.java  |  6 +++++-
 .../org/mapfish/print/http/UserAgentCreator.java |  2 +-
 .../main/java/org/mapfish/print/http/Utils.java  |  5 ++---
 .../print/processor/http/matcher/MatchInfo.java  |  1 -
 .../mapfish/print/servlet/BaseMapServlet.java    |  4 ++--
 .../servlet/BooleanHandleReportLoadResult.java   |  2 +-
 .../print/servlet/HandleReportLoadResult.java    |  2 +-
 .../mapfish/print/servlet/MapPrinterServlet.java | 15 +++++++++++----
 .../servlet/VoidHandleReportLoadResult.java      |  2 +-
 .../fileloader/ServletConfigFileLoader.java      |  2 +-
 .../org/mapfish/print/TestHttpClientFactory.java |  5 +++++
 .../mapfish/print/http/HttpCredentialTest.java   | 16 +++++++++-------
 .../http/matcher/AddressHostMatcherTest.java     | 12 ++++++------
 .../http/matcher/DnsHostMatcherTest.java         |  6 +++---
 .../http/matcher/HostnameMatcherTest.java        |  6 +++---
 .../http/matcher/LocalHostMatcherTest.java       |  6 +++---
 .../print/servlet/MapPrinterServletTest.java     |  4 ++--
 21 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index 9eb30ab35..37e85c438 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.StreamUtils;
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 736f16783..6610bef3f 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -21,9 +21,12 @@
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.core5.http.*;
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpEntityContainer;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 861673a44..3edecb2e4 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -23,7 +23,7 @@ public final class MfCredentialsProvider implements CredentialsProvider {
   private final CredentialsProvider fallback = new SystemDefaultCredentialsProvider();
 
   @Override
-  public Credentials getCredentials(AuthScope authScope, HttpContext context) {
+  public Credentials getCredentials(final AuthScope authScope, final HttpContext context) {
 
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config != null) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index d926c29f0..7598c812c 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -7,10 +7,8 @@
 import java.net.UnknownHostException;
 import java.util.List;
 import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner;
-import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.mapfish.print.config.Configuration;
@@ -31,7 +29,7 @@ public MfRoutePlanner() {
   }
 
   @Override
-  protected HttpHost determineProxy(HttpHost target, HttpContext context) throws HttpException {
+  protected HttpHost determineProxy(final HttpHost target, final HttpContext context) throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config == null) {
       return null;
diff --git a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
index 5be4447bc..f54b3de3d 100644
--- a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
+++ b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
@@ -14,7 +14,11 @@ public final class MfTLSSocketStrategy implements TlsSocketStrategy {
   private final TlsSocketStrategy defaultStrategy = DefaultClientTlsStrategy.createDefault();
 
   @Override
-  public SSLSocket upgrade(Socket socket, String target, int port, Object attachment, HttpContext context) throws IOException {
+  public SSLSocket upgrade(final Socket socket,
+                           final String target,
+                           final int port,
+                           final Object attachment,
+                           final HttpContext context) throws IOException {
     return getSocketStrategy().upgrade(socket, target, port, attachment, context);
   }
 
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index 9633bc162..16dd0a164 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -41,7 +41,7 @@ public static String getUserAgent() {
     return String.format("%s/%s %s", AGENT_NAME, mfpRelease, httpClientUserAgent);
   }
 
-  public static String getUserAgent(String name, String pkg, Class<?> cls) {
+  public static String getUserAgent(final String name, final String pkg, final Class<?> cls) {
     var vi = VersionInfo.loadVersionInfo(pkg, cls.getClassLoader());
     String release = vi != null ? vi.getRelease() : "UNAVAILABLE";
     String javaVersion = System.getProperty("java.version");
diff --git a/core/src/main/java/org/mapfish/print/http/Utils.java b/core/src/main/java/org/mapfish/print/http/Utils.java
index 9ed7df29e..50b19a27a 100644
--- a/core/src/main/java/org/mapfish/print/http/Utils.java
+++ b/core/src/main/java/org/mapfish/print/http/Utils.java
@@ -5,21 +5,20 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /** Network utils class. */
 public final class Utils {
   private Utils() {}
 
   private static final List<String> AUTH_HEADERS =
-      Arrays.asList(new String[] {"cookie", "set-cookie", "authorization", "x-csrf-token"});
+      Arrays.asList("cookie", "set-cookie", "authorization", "x-csrf-token");
 
   /**
    * Get a list of printable (auth header will be hidden) headers 'header=value'.
    *
    * @param headers The headers
    */
-  public static List<String> getPrintableHeadersList(HttpHeaders headers) {
+  public static List<String> getPrintableHeadersList(final HttpHeaders headers) {
     final List<String> result = new ArrayList<>();
     for (String header : headers.headerNames()) {
       List<String> value = headers.get(header);
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index b8db087a4..f5696be13 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -3,7 +3,6 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
index 1675be4b0..e835f518e 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.PrintException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
index 3007ae866..2b15ffbb7 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
index 7b864b64d..eadca958b 100644
--- a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
@@ -8,7 +8,7 @@
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.slf4j.Logger;
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index 12a635b5b..c0dbc0a37 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -21,12 +21,19 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jasperreports.engine.fonts.FontFamily;
 import net.sf.jasperreports.extensions.ExtensionsEnvironment;
 import org.apache.commons.io.FilenameUtils;
diff --git a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
index bba96e3c9..47abe82c9 100644
--- a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
index ae51d4ab2..bc67539f5 100644
--- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
+++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
@@ -4,7 +4,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.Iterator;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** A plugin that loads the config resources from urls starting with prefix: {@value #PREFIX}://. */
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index 087adc618..9119c352b 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -117,6 +117,11 @@ public URI getURI() {
       return httpRequest.getURI();
     }
 
+    @Override
+    public Map<String, Object> getAttributes() {
+      return Map.of();
+    }
+
     @Nonnull
     @Override
     public HttpHeaders getHeaders() {
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index ccd4e2f2e..b05488860 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -18,6 +18,7 @@
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
 import org.mapfish.print.processor.http.matcher.DnsHostMatcher;
+import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -85,25 +86,26 @@ public void testToCredentials() throws Exception {
 
     authscope =
         new AuthScope(
-            AuthScope.ANY_HOST, AuthScope.ANY_PORT, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME);
+            MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
         new AuthScope(
-            AuthScope.ANY_HOST,
+          MatchInfo.ANY_SCHEME,
+          MatchInfo.ANY_HOST,
             HttpProxyTest.HTTPS_PROXY_PORT,
-            AuthScope.ANY_REALM,
-            AuthScope.ANY_SCHEME);
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME);
+    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
-        new AuthScope("google.com", AuthScope.ANY_PORT, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME);
+        new AuthScope(MatchInfo.ANY_SCHEME, "google.com", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
     assertNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http");
+    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http");
     assertNotNull(credential.toCredentials(authscope));
   }
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index b5f7ec604..523c76e27 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -20,15 +20,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setMask("255.255.255.0");
     addressHostMatcher.setIp("127.0.0.0");
@@ -42,15 +42,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setPort(8080);
     assertMatch(addressHostMatcher, true, new URI("http://127.0.0.1:8080"), HttpMethod.GET);
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index 8f022940f..b6166b52a 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -30,15 +30,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("localhost", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     dnsHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index 9a8d31e83..bb9cdbe2f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -39,15 +39,15 @@ public void testNoSubdomain() throws Exception {
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("localhost", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertFalse(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     hostnameHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 74d917627..4980b1789 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -47,15 +47,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     assertMatch(localHostMatcher, false, new URI("http://www.camptocamp.com/"), HttpMethod.GET);
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
index f478aa6d2..6dc7261e6 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
@@ -27,8 +27,8 @@
 import javax.mail.Multipart;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMultipart;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;

From cc203f1d1d38a9d4594a582ce8f04f2bdf2cd822 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 16:23:23 +0100
Subject: [PATCH 06/61] OpenRewrite migration from junit4 to junit6

---
 build.gradle                                  |   3 +-
 core/build.gradle                             |   1 +
 .../mapfish/print/cli/CliServletContext.java  |  42 ++-----
 .../print/config/WorkingDirectories.java      |   2 +-
 .../resources/mapfish-spring-hibernate.xml    |   4 +-
 .../print/AbstractMapfishSpringTest.java      |  49 ++++----
 .../org/mapfish/print/StatsUtilsTest.java     |   4 +-
 .../java/org/mapfish/print/URIUtilsTest.java  |   6 +-
 .../attribute/AbstractAttributeTest.java      |  12 +-
 ...eredReflectiveAttributeValidationTest.java |  17 +--
 .../print/attribute/BooleanAttributeTest.java |   6 +-
 .../attribute/DataSourceAttributeTest.java    |   6 +-
 .../JsonDatasourceAttributeTest.java          |   6 +-
 .../attribute/ReflectiveAttributeTest.java    |  29 +++--
 .../attribute/ScalebarAttributeTest.java      |  44 ++++---
 .../attribute/StringArrayAttributeTest.java   |   4 +-
 .../print/attribute/StringAttributeTest.java  |  35 +++---
 .../print/attribute/StyleAttributeTest.java   |  11 +-
 .../attribute/map/BBoxMapBoundsTest.java      |   4 +-
 .../map/CenterScaleMapBoundsTest.java         |   6 +-
 .../map/GenericMapAttributeTest.java          |  16 ++-
 .../print/attribute/map/MapAttributeTest.java |  49 ++++----
 .../map/OverviewMapAttributeTest.java         |  10 +-
 .../map/ScaleAdjustmentAccuracyTest.java      |   4 +-
 .../print/attribute/map/ZoomLevelsTest.java   |   6 +-
 .../java/org/mapfish/print/cli/MainTest.java  |   6 +-
 .../AttributeWithConfigurationInjection.java  |   2 +-
 .../config/AttributeWithSpringInjection.java  |   2 +-
 ...oryAllConfigObjectMustBePrototypeTest.java |  25 ++--
 .../config/ConfigurationFactoryTest.java      |  36 +++---
 .../print/config/ConfigurationTest.java       |  18 +--
 .../print/config/CustomFontLoaderTest.java    |   4 +-
 .../ProcessorWithConfigurationInjection.java  |   2 +-
 .../config/ProcessorWithSpringInjection.java  |   2 +-
 .../print/config/WorkingDirectoriesTest.java  |   6 +-
 .../access/AccessAssertionPersisterTest.java  |   6 +-
 .../access/AlwaysAllowAssertionTest.java      |   2 +-
 .../config/access/AndAccessAssertionTest.java |  39 +++---
 .../access/RoleAccessAssertionTest.java       | 107 +++++++++-------
 ...igFileResolvingHttpRequestFactoryTest.java |  20 +--
 .../http/ConfigFileResolvingRequestTest.java  |   6 +-
 .../print/http/HttpConfigurationTest.java     |   6 +-
 .../print/http/HttpCredentialTest.java        |  14 +--
 .../org/mapfish/print/http/HttpProxyTest.java |  14 +--
 .../MfClientHttpRequestFactoryImplTest.java   |  12 +-
 .../mapfish/print/map/DistanceUnitTest.java   |   7 +-
 .../java/org/mapfish/print/map/ScaleTest.java |   4 +-
 .../map/geotools/FeaturesParserTest.java      |  10 +-
 .../print/map/geotools/GeoJsonLayerTest.java  | 117 +++++++++---------
 .../GeotiffLayerFactoryPluginTest.java        |  58 +++++----
 .../map/geotools/grid/GridUtilsTest.java      |   4 +-
 .../geotools/grid/LineGridStrategyTest.java   |   6 +-
 .../geotools/grid/PointGridStrategyTest.java  |  18 +--
 .../image/AbstractSingleImageLayerTest.java   |   8 +-
 .../print/map/image/wms/WmsUtilitiesTest.java |   7 +-
 .../map/style/FileSLDParserPluginTest.java    |   6 +-
 .../map/style/ParserPluginUtilsTest.java      |   6 +-
 .../map/style/URLSLDParserPluginTest.java     |   6 +-
 .../print/map/style/json/ColorParserTest.java |   4 +-
 .../style/json/JsonStyleParserHelperTest.java |  34 +++--
 .../json/MapfishJsonFileResolverTest.java     |   6 +-
 .../json/MapfishJsonStyleVersion2Test.java    |   4 +-
 .../json/MapfishStyleParserPluginTest.java    |   8 +-
 .../map/tiled/AbstractWMXLayerParamsTest.java |   6 +-
 .../map/tiled/SingleTileLoaderTaskTest.java   |   6 +-
 .../map/tiled/osm/OsmLayerParamTest.java      |   6 +-
 .../print/map/tiled/osm/OsmLayerTest.java     |   9 +-
 .../map/tiled/wmts/WMTSLayerParamTest.java    |   6 +-
 .../print/map/tiled/wmts/WMTSLayerTest.java   |  26 ++--
 .../metrics/JobQueueHealthCheckTest.java      |  11 +-
 .../UnhealthyCountersHealthCheckTest.java     |   6 +-
 .../AbstractJasperReportOutputFormatTest.java |  14 +--
 .../output/JRPdfExporterWeakHashMapTest.java  |  10 +-
 ...JasperReportOutputFormatSimpleMapTest.java |  46 +++----
 .../JasperReportPDFOutputFormatTest.java      |   6 +-
 .../JasperReportSvgOutputFormatTest.java      |   6 +-
 .../org/mapfish/print/output/ValuesTest.java  |  95 +++++++-------
 .../print/parser/MapfishParserTest.java       | 103 ++++++++-------
 .../processor/AbstractProcessorTest.java      |   6 +-
 .../PdfConfigurationProcessorTest.java        |  61 ++++-----
 .../ProcessorDependencyGraphFactoryTest.java  |  67 +++++-----
 .../ProcessorDependencyGraphTest.java         |  36 +++---
 .../processor/ProcessorGraphNodeTest.java     |  35 +++---
 .../processor/SetStyleProcessorTest.java      |  11 +-
 .../http/AbstractHttpProcessorTest.java       |   4 +-
 .../http/AddHeadersProcessorTest.java         |   4 +-
 ...ClientHttpRequestFactoryProcessorTest.java |   4 +-
 .../http/ForwardHeadersProcessorTest.java     |   6 +-
 .../http/MapUriBug228ProcessorTest.java       |  12 +-
 .../processor/http/MapUriProcessorTest.java   |   2 +-
 .../http/RestrictUrisProcessorTest.java       |  37 +++---
 .../http/UseHttpForHttpsProcessorTest.java    |   2 +-
 .../http/matcher/AcceptAllMatcherTest.java    |   2 +-
 .../http/matcher/AddressHostMatcherTest.java  |   4 +-
 .../http/matcher/DnsHostMatcherTest.java      |   4 +-
 .../http/matcher/HostnameMatcherTest.java     |   6 +-
 .../http/matcher/LocalHostMatcherTest.java    |   4 +-
 .../http/matcher/MatcherTestUtils.java        |   2 +-
 .../jasper/DataSourceProcessorTest.java       |   6 +-
 .../jasper/DateFormatProcessorTest.java       |   4 +-
 .../jasper/HttpImageResolverTest.java         |   7 +-
 .../print/processor/jasper/IconTaskTest.java  |   4 +-
 .../processor/jasper/LegendProcessorTest.java |   6 +-
 .../processor/jasper/MapSubReportTest.java    |  13 +-
 ...rgeDataSourceProcessorIntegrationTest.java |   8 +-
 .../jasper/MergeDataSourceProcessorTest.java  |   8 +-
 .../processor/jasper/TableProcessorTest.java  |   4 +-
 .../map/AddBackgroundLayersTest.java          |   4 +-
 .../processor/map/AddOverlayLayersTest.java   |   4 +-
 ...reateMapPagesFailOnErrorProcessorTest.java |  18 +--
 ...MapPagesForceFailOnErrorProcessorTest.java |  22 ++--
 .../map/CreateMapPagesProcessorTest.java      |   8 +-
 ...ateMapPagesProcessorZoomToFeatureTest.java |   8 +-
 .../CreateMapProcessorAoiForBoundsTest.java   |   4 +-
 .../map/CreateMapProcessorAoiTest.java        |   6 +-
 ...rGeoJsonZoomToExtentFlexibleScaleTest.java |   4 +-
 ...CenterGeoJsonZoomToExtentMinScaleTest.java |   4 +-
 ...rocessorCenterGeoJsonZoomToExtentTest.java |   4 +-
 ...teMapProcessorCenterGeoJsonZoomToTest.java |   4 +-
 ...ProcessorCenterGeojsonEmptyCollection.java |   4 +-
 ...rocessorCenterGeojsonJsonStyleHighDpi.java |   4 +-
 ...eMapProcessorCenterGeojsonJsonStyleV1.java |   4 +-
 ...cessorCenterWMSRotationSmallTilesTest.java |   4 +-
 ...cessorFixedScaleAndCenterWMTSRestTest.java |   4 +-
 ...orFixedScaleAndCenterWMTSRotationTest.java |   4 +-
 ...pProcessorFixedScaleAndCenterWMTSTest.java |   4 +-
 ...MapProcessorFixedScaleBBoxGeoJsonTest.java |   4 +-
 ...ScaleCenterGridFixedNumlinesPointTest.java |   4 +-
 ...FixedScaleCenterGridFixedNumlinesTest.java |   4 +-
 ...dScaleCenterGridFixedSpacingPointTest.java |   4 +-
 ...cessorFixedScaleCenterGridSpacingTest.java |   4 +-
 ...apProcessorFixedScaleCenterOsmDpiTest.java |   4 +-
 ...cessorFixedScaleCenterOsmRotationTest.java |   4 +-
 ...teMapProcessorFixedScaleCenterOsmTest.java |   4 +-
 ...ssorFlexibleScaleAndCenterGeoTiffTest.java |   4 +-
 ...ProcessorFlexibleScaleBBoxGeoJsonTest.java |   4 +-
 ...eMapProcessorFlexibleScaleBBoxGmlTest.java |   4 +-
 ...cessorFlexibleScaleCenterTiledWmsTest.java |   4 +-
 ...cessorFlexibleScaleCenterWms1_0_0Test.java |  40 +++---
 ...orFlexibleScaleCenterWms1_0_0_DPITest.java |  40 +++---
 ...xibleScaleCenterWms1_0_0_DPI_SVG_Test.java |  40 +++---
 ...dFixedNumlinesLinesNoRotateLabelsTest.java |   4 +-
 ...ridFixedNumlinesPointAltLabelProjTest.java |   4 +-
 ...cessorGridFixedNumlinesPointCRS84Test.java |   4 +-
 ...ssorGridFixedNumlinesPointRotatedTest.java |   4 +-
 .../map/CreateMapProcessorImageLayerTest.java |   4 +-
 .../CreateMapProcessorLabelGeoJsonTest.java   |   4 +-
 ...rocessorLineVsPolygonStyleGeoJsonTest.java |   4 +-
 .../CreateMapProcessorOpacityWMTSTest.java    |   4 +-
 .../map/CreateMapProcessorRenderTypeTest.java |   6 +-
 ...orScaleBBoxNativeRotationWms1_3_0Test.java |  36 +++---
 .../map/CreateMapProcessorWmtsBufferTest.java |   4 +-
 .../map/CreateNorthArrowProcessorSvgTest.java |   2 +-
 .../map/CreateNorthArrowProcessorTest.java    |   6 +-
 ...reateOverviewMapProcessorCustomBounds.java |   4 +-
 ...teOverviewMapProcessorCustomLayerTest.java |   4 +-
 .../CreateOverviewMapProcessorRotateTest.java |   4 +-
 .../CreateOverviewMapProcessorStyleTest.java  |   4 +-
 .../map/CreateOverviewMapProcessorTest.java   |   4 +-
 .../processor/map/MapfishMapContextTest.java  |   8 +-
 .../processor/map/NorthArrowGraphicTest.java  |   6 +-
 .../map/SetFeaturesProcessorTest.java         |   4 +-
 .../map/SetTiledWmsProcessorTest.java         |   4 +-
 .../map/SetWmsCustomParamProcessorTest.java   |  38 +++---
 ...leBarProcessorFixedScaleCenterOsmTest.java |   6 +-
 .../map/scalebar/ScalebarDrawerTest.java      |   4 +-
 .../map/scalebar/ScalebarGraphicTest.java     |  19 ++-
 .../MapPrinterServletSecurityTest.java        |  56 +++++----
 .../print/servlet/MapPrinterServletTest.java  | 108 ++++++++++------
 .../fileloader/AbstractConfigLoaderTest.java  |  23 ++--
 .../ClasspathConfigFileLoaderTest.java        |  67 +++++-----
 .../fileloader/FileConfigFileLoaderTest.java  |  43 ++++---
 .../ServletConfigFileLoaderTest.java          |  41 +++---
 .../print/servlet/job/ClusteringTaskTest.java |  15 ++-
 .../job/PostResultToRegistryTaskTest.java     |   6 +-
 .../servlet/registry/BasicRegistryTest.java   |   4 +-
 .../print/test/util/ImageSimilarityTest.java  |   8 +-
 .../print/url/data/TestDataUrlConnection.java |   4 +-
 .../mapfish/print/url/data/TestHandler.java   |   4 +-
 .../print/wrapper/yaml/PYamlArrayTest.java    |   6 +-
 .../print/wrapper/yaml/PYamlObjectTest.java   |   6 +-
 .../resources/mapfish-spring-hibernate.xml    |   4 +-
 docs/build.gradle                             |   3 +
 examples/build.gradle                         |   4 +-
 .../java/org/mapfish/print/ExamplesTest.java  |  16 +--
 .../org/mapfish/print/MetricsApiTest.java     |   7 +-
 .../java/org/mapfish/print/PrintApiTest.java  |  34 ++---
 gradle.properties                             |   1 +
 188 files changed, 1372 insertions(+), 1312 deletions(-)

diff --git a/build.gradle b/build.gradle
index c18e27f76..5b15fcf76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 
     dependencies {
         testImplementation(
+                'org.junit.jupiter:junit-jupiter:6.0.1',
                 'org.mockito:mockito-core:5.20.0',
         )
     }
@@ -92,7 +93,7 @@ tasks.register('docs') {
 
 
 rewrite {
-    activeRecipe("org.openrewrite.java.spring.framework.UpgradeSpringFramework_7_0")
+    activeRecipe("org.openrewrite.java.testing.junit5.JUnit4to5Migration")
     setExportDatatables(true)
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 2461230a5..04ce88c3d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,6 +91,7 @@ test {
         junitXml.getRequired().set(true)
         html.getRequired().set(true)
     }
+    useJUnitPlatform()
 }
 
 build {
diff --git a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
index 02707104e..38ccc0917 100644
--- a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
+++ b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
@@ -6,15 +6,15 @@
 import java.util.EventListener;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * An essentially non-functional servlet context that is used by the CLI application to satisfy the
@@ -81,31 +81,9 @@ public RequestDispatcher getNamedDispatcher(final String name) {
     return null;
   }
 
-  @Override
-  @Deprecated
-  public Servlet getServlet(final String name) {
-    return null;
-  }
-
-  @Override
-  @Deprecated
-  public Enumeration<Servlet> getServlets() {
-    return null;
-  }
-
-  @Override
-  @Deprecated
-  public Enumeration<String> getServletNames() {
-    return null;
-  }
-
   @Override
   public void log(final String msg) {}
 
-  @Override
-  @Deprecated
-  public void log(final Exception exception, final String msg) {}
-
   @Override
   public void log(final String message, final Throwable throwable) {}
 
@@ -292,7 +270,7 @@ public int getSessionTimeout() {
   }
 
   @Override
-  public javax.servlet.ServletRegistration.Dynamic addJspFile(final String p1, final String p2) {
+  public jakarta.servlet.ServletRegistration.Dynamic addJspFile(final String p1, final String p2) {
     return null;
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
index ff001e3f8..15a001739 100644
--- a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
+++ b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
@@ -7,7 +7,7 @@
 import java.util.Date;
 import java.util.Objects;
 import javax.annotation.PostConstruct;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;
diff --git a/core/src/main/resources/mapfish-spring-hibernate.xml b/core/src/main/resources/mapfish-spring-hibernate.xml
index 7d1f8b8ef..77c884d33 100644
--- a/core/src/main/resources/mapfish-spring-hibernate.xml
+++ b/core/src/main/resources/mapfish-spring-hibernate.xml
@@ -6,7 +6,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-    <bean id="mfSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+    <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
         <property name="annotatedClasses">
             <list>
@@ -28,7 +28,7 @@
         </property>
     </bean>
 
-    <bean id="transactionManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+    <bean id="transactionManager" class="org.springframework.orm.jpa.hibernate.HibernateTransactionManager">
         <property name="sessionFactory" ref="mfSessionFactory"/>
     </bean>
     <tx:annotation-driven transaction-manager="transactionManager"/>
diff --git a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
index ba0ca5789..ac1c80871 100644
--- a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
+++ b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
@@ -14,7 +14,8 @@
 import java.util.regex.Pattern;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.referencing.CRS;
-import org.junit.runner.RunWith;
+// JUnit 5 Imports
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.attribute.map.CenterScaleMapBounds;
 import org.mapfish.print.attribute.map.MapfishMapContext;
 import org.mapfish.print.config.WorkingDirectories;
@@ -25,32 +26,32 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Class that loads the normal spring application context from the spring config file. Subclasses
  * can use Autowired to get dependencies from the application context.
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
-    locations = {
-      AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
-      AbstractMapfishSpringTest.TEST_SPRING_XML,
-      AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
-    })
+  locations = {
+    AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
+    AbstractMapfishSpringTest.TEST_SPRING_XML,
+    AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
+  })
 public abstract class AbstractMapfishSpringTest {
   public static final String DEFAULT_SPRING_XML =
-      "classpath:mapfish-spring-application-context.xml";
+    "classpath:mapfish-spring-application-context.xml";
   public static final String TEST_SPRING_XML =
-      "classpath:test-http-request-factory-application-context.xml";
+    "classpath:test-http-request-factory-application-context.xml";
   public static final String TEST_SPRING_FONT_XML =
-      "classpath:test-mapfish-spring-custom-fonts.xml";
+    "classpath:test-mapfish-spring-custom-fonts.xml";
   // The maximum number of times to retry fetching a resource used in tests
   public static final int HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY = 2;
   // The interval between retries used in tests
   public static final int HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS = 1;
   protected static final Processor.ExecutionContext CONTEXT =
-      new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
+    new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
   static final Pattern IMPORT_PATTERN = Pattern.compile("@@importFile\\((\\S+)\\)@@");
 
   @Autowired private WorkingDirectories workingDirectories;
@@ -66,7 +67,7 @@ public static File getFile(Class<?> testClass, String fileName) {
     final URL resource = testClass.getResource(fileName);
     if (resource == null) {
       throw new AssertionError(
-          "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
+        "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
     }
 
     return new File(resource.getFile());
@@ -86,7 +87,7 @@ public static PJsonObject parseJSONObjectFromString(String jsonString) {
   }
 
   public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fileName)
-      throws IOException {
+    throws IOException {
     final File file = getFile(testClass, fileName);
     String jsonString = Files.readString(file.toPath(), Constants.DEFAULT_CHARSET);
     Matcher matcher = IMPORT_PATTERN.matcher(jsonString);
@@ -104,7 +105,7 @@ public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fil
   public static MapfishMapContext createTestMapContext() {
     try {
       final CenterScaleMapBounds bounds =
-          new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
+        new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
       return new MapfishMapContext(bounds, new Dimension(500, 500), 0, 72, true, true);
     } catch (FactoryException e) {
       throw new RuntimeException(e);
@@ -186,13 +187,13 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     }
 
     String platformVersionName =
-        "expectedSimpleImage"
-            + classifier
-            + "-"
-            + normalizedOSName()
-            + "-jdk"
-            + javaVersion
-            + ".png";
+      "expectedSimpleImage"
+        + classifier
+        + "-"
+        + normalizedOSName()
+        + "-jdk"
+        + javaVersion
+        + ".png";
     String platformName = "expectedSimpleImage" + classifier + "-" + normalizedOSName() + ".png";
     String defaultName = "expectedSimpleImage" + classifier + ".png";
 
@@ -202,8 +203,8 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     //        ImageIO.write(actualImage, "png", new File(TMP, baseDir + "/" + defaultName));
 
     return OptionalUtils.or(
-            () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
-        .orElse(defaultName);
+        () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
+      .orElse(defaultName);
   }
 
   private Optional<String> findImage(final String baseDir, final String fileName) {
diff --git a/core/src/test/java/org/mapfish/print/StatsUtilsTest.java b/core/src/test/java/org/mapfish/print/StatsUtilsTest.java
index ec99a57b0..d0a537259 100644
--- a/core/src/test/java/org/mapfish/print/StatsUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/StatsUtilsTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StatsUtilsTest {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/URIUtilsTest.java b/core/src/test/java/org/mapfish/print/URIUtilsTest.java
index 7fe7aa6f0..4719dfc48 100644
--- a/core/src/test/java/org/mapfish/print/URIUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/URIUtilsTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.LinkedListMultimap;
@@ -10,7 +8,7 @@
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class URIUtilsTest {
 
diff --git a/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java
index fd28a9981..7fd42c231 100644
--- a/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_TYPE;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_NAME;
 
@@ -10,7 +10,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
 import org.mockito.Mockito;
@@ -34,10 +34,10 @@ public void testPrintClientConfig() {
     Template template = Mockito.mock(Template.class);
     JSONObject capabilities = getClientConfig(attribute, template);
     assertTrue(
-        "Missing " + JSON_NAME + " in: \n" + capabilities.toString(2), capabilities.has(JSON_NAME));
+        capabilities.has(JSON_NAME), "Missing " + JSON_NAME + " in: \n" + capabilities.toString(2));
     assertTrue(
-        "Missing " + JSON_ATTRIBUTE_TYPE + " in: \n" + capabilities.toString(2),
-        capabilities.has(JSON_ATTRIBUTE_TYPE));
+        capabilities.has(JSON_ATTRIBUTE_TYPE),
+        "Missing " + JSON_ATTRIBUTE_TYPE + " in: \n" + capabilities.toString(2));
   }
 
   @Test
@@ -46,7 +46,7 @@ public void testValidate() {
     Configuration configuration = new Configuration();
     createAttribute().validate(errors, configuration);
 
-    assertTrue(errors.toString(), errors.isEmpty());
+    assertTrue(errors.isEmpty(), errors.toString());
   }
 
   protected abstract Attribute createAttribute();
diff --git a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
index d1cf95a7b..6fc2383f2 100644
--- a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.StringWriter;
 import java.util.HashMap;
@@ -9,7 +8,7 @@
 import java.util.Map;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
@@ -21,11 +20,15 @@ public class AllRegisteredReflectiveAttributeValidationTest extends AbstractMapf
 
   @Autowired List<Attribute> allAttributes;
 
-  @Test(expected = Test.None.class /* no exception expected */)
+  @Test
   public void testAllAttributesHaveLegalValues() {
-    for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
-      attribute.init();
-    }
+    assertDoesNotThrow(() -> {
+      for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
+        attribute.init();
+      }
+
+      // no exception... good
+    });
 
     // no exception... good
   }
diff --git a/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java
index 980df06fa..7edd3363b 100644
--- a/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java
index 18a0d2d60..aee17f7d8 100644
--- a/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java
@@ -1,11 +1,9 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java
index fae960a3e..def3aef07 100644
--- a/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -9,7 +9,7 @@
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.design.JRDesignField;
 import net.sf.jasperreports.json.data.JsonDataSource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
index 7c8ae62fa..f3c974deb 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
@@ -1,9 +1,11 @@
 package org.mapfish.print.attribute;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.List;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
@@ -11,29 +13,34 @@
 import org.mapfish.print.wrapper.json.PJsonObject;
 
 public class ReflectiveAttributeTest {
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testPJsonObjIllegal() {
-    new TestReflectiveAtt(PJsonObjParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(PJsonObjParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testPJsonArrayIllegal() {
-    new TestReflectiveAtt(PJsonArrayParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(PJsonArrayParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testJsonObjIllegal() {
-    new TestReflectiveAtt(JsonObjParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(JsonObjParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testJsonArrayIllegal() {
-    new TestReflectiveAtt(JsonArrayParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(JsonArrayParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testEmpty() {
-    new TestReflectiveAtt(Empty.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(Empty.class).init());
   }
 
   private static class TestReflectiveAtt extends ReflectiveAttribute<Object> {
diff --git a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
index 7ee45f79f..f52e6d39a 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.Dimension;
 import java.io.File;
@@ -9,7 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.ScalebarAttribute.ScalebarAttributeValues;
@@ -42,35 +41,44 @@ public void testCreateValue() {
     assertEquals(new Dimension(300, 120), values.getSize());
   }
 
-  @Test(expected = Test.None.class /* no exception expected */)
+  @Test
   public void testPostConstruct() {
-    ScalebarAttributeValues values = getValues();
-    values.postConstruct();
+    assertDoesNotThrow(() -> {
+      ScalebarAttributeValues values = getValues();
+      values.postConstruct();
+      // passes.. ok
+    });
     // passes.. ok
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testPostConstructInvalidColor() {
-    ScalebarAttributeValues values = getValues();
+    assertThrows(IllegalArgumentException.class, () -> {
+      ScalebarAttributeValues values = getValues();
 
-    values.backgroundColor = "sun-yellow";
-    values.postConstruct();
+      values.backgroundColor = "sun-yellow";
+      values.postConstruct();
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testPostConstructInvalidUnit() {
-    ScalebarAttributeValues values = getValues();
+    assertThrows(IllegalArgumentException.class, () -> {
+      ScalebarAttributeValues values = getValues();
 
-    values.unit = "light-years";
-    values.postConstruct();
+      values.unit = "light-years";
+      values.postConstruct();
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testPostConstructInvalidIntervals() {
-    ScalebarAttributeValues values = getValues();
+    assertThrows(IllegalArgumentException.class, () -> {
+      ScalebarAttributeValues values = getValues();
 
-    values.intervals = 0;
-    values.postConstruct();
+      values.intervals = 0;
+      values.postConstruct();
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java
index fc59e6ce9..bf50fcfb5 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.simple.JSONArray;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
index feb9f762f..791e5c3c8 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
@@ -1,11 +1,12 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -44,22 +45,24 @@ public void testParsableByValues() throws Exception {
     assertEquals("a short text", values.getString("field2"));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testParsableByValuesError() throws Exception {
-    final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-    PJsonObject requestData = loadJsonRequestDataError();
+    assertThrows(IllegalArgumentException.class, () -> {
+      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+      PJsonObject requestData = loadJsonRequestDataError();
 
-    Template template = config.getTemplate("main");
-    new Values(
-        new HashMap<>(),
-        requestData,
-        template,
-        config.getDirectory(),
-        httpClientFactory,
-        config.getDirectory(),
-        HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-        HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-        new AtomicBoolean(false));
+      Template template = config.getTemplate("main");
+      new Values(
+          new HashMap<>(),
+          requestData,
+          template,
+          config.getDirectory(),
+          httpClientFactory,
+          config.getDirectory(),
+          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+          new AtomicBoolean(false));
+    });
   }
 
   private PJsonObject loadJsonRequestData() throws IOException {
diff --git a/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java
index ebec0cf1b..471af6c3b 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java
@@ -1,13 +1,12 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -18,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class StyleAttributeTest extends AbstractMapfishSpringTest {
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private TestHttpClientFactory clientHttpRequestFactory;
 
@@ -35,7 +34,7 @@ public void testAttributesFromJson() throws Exception {
             new HashMap<>(),
             pJsonObject,
             template,
-            this.folder.getRoot(),
+            this.folder,
             this.clientHttpRequestFactory,
             new File("."),
             HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java b/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java
index b434a6893..1326a4feb 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute.map;
 
 import static org.geotools.referencing.crs.DefaultGeographicCRS.WGS84;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 import static org.mapfish.print.attribute.map.CenterScaleMapBoundsTest.CH1903;
 
@@ -10,7 +10,7 @@
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BBoxMapBoundsTest {
   public static final CoordinateReferenceSystem SPHERICAL_MERCATOR;
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java b/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java
index fb937911d..9dfa3ace0 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.awt.Rectangle;
 import org.geotools.api.referencing.FactoryException;
@@ -9,7 +9,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Test bounds implementation. */
 public class CenterScaleMapBoundsTest {
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java
index 7f4693965..c8f9686fa 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_DEFAULT;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_EMBEDDED_TYPE;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_IS_ARRAY;
@@ -16,7 +14,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.ReflectiveAttribute;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.parser.MapfishParser;
@@ -46,10 +44,10 @@ public void testPrintClientConfig() {
 
     assertEquals(mapAttName, json.getString(ReflectiveAttribute.JSON_NAME));
     assertTrue(json.has(JSON_CLIENT_PARAMS));
-    assertTrue(json.toString(2), json.has(JSON_CLIENT_INFO));
+    assertTrue(json.has(JSON_CLIENT_INFO), json.toString(2));
 
     final JSONObject required = json.getJSONObject(JSON_CLIENT_PARAMS);
-    assertEquals(required.toString(2), 16, required.length());
+    assertEquals(16, required.length(), required.toString(2));
 
     assertElem(required, "requiredElem", "int", null, false);
     assertElem(required, "pArray", "array", null, false);
@@ -121,9 +119,9 @@ private void assertElem(
     final JSONObject elem = required.getJSONObject(elemName);
     assertEquals(type, elem.getString(JSON_ATTRIBUTE_TYPE));
     if (defaultVal != null) {
-      assertEquals(required.toString(2), defaultVal, elem.get(JSON_ATTRIBUTE_DEFAULT).toString());
+      assertEquals(defaultVal, elem.get(JSON_ATTRIBUTE_DEFAULT).toString(), required.toString(2));
     } else {
-      assertFalse(required.toString(2), elem.has(JSON_ATTRIBUTE_DEFAULT));
+      assertFalse(elem.has(JSON_ATTRIBUTE_DEFAULT), required.toString(2));
     }
     if (isArray) {
       assertTrue(elem.getBoolean(JSON_ATTRIBUTE_IS_ARRAY));
@@ -146,7 +144,7 @@ private void assertEmbedded(JSONObject required, boolean hasDefault, String attN
         embedded.get(JSON_ATTRIBUTE_TYPE));
     final JSONObject typeDescriptor = embedded.getJSONObject(JSON_ATTRIBUTE_EMBEDDED_TYPE);
     assertTrue(typeDescriptor.has("embeddedElem"));
-    assertEquals(typeDescriptor.toString(2), 1, typeDescriptor.length());
+    assertEquals(1, typeDescriptor.length(), typeDescriptor.toString(2));
     assertElem(typeDescriptor, "embeddedElem", "boolean", null, false);
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
index 694c0162d..6f20799ec 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
@@ -1,11 +1,6 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.processor.map.CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR;
 import static org.mapfish.print.processor.map.CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.loadJsonRequestData;
 
@@ -17,8 +12,8 @@
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.ReflectiveAttribute;
@@ -37,30 +32,32 @@ public class MapAttributeTest extends AbstractMapfishSpringTest {
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private TestHttpClientFactory httpRequestFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.configurationFactory.setDoValidation(false);
   }
 
   @SuppressWarnings("unchecked")
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testMaxDpi() throws Exception {
-    final File configFile =
-        getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
-    final Configuration config = configurationFactory.getConfig(configFile);
-    final Template template = config.getTemplate("main");
-
-    final PJsonObject pJsonObject = loadJsonRequestData();
-    final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
-    final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
-    map.remove("dpi");
-    map.accumulate("dpi", 1000);
-
-    final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
-        (ReflectiveAttribute<MapAttribute.MapAttributeValues>) template.getAttributes().get("map");
-
-    final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
-    MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final File configFile =
+          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
+      final Configuration config = configurationFactory.getConfig(configFile);
+      final Template template = config.getTemplate("main");
+
+      final PJsonObject pJsonObject = loadJsonRequestData();
+      final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
+      final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
+      map.remove("dpi");
+      map.accumulate("dpi", 1000);
+
+      final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
+          (ReflectiveAttribute<MapAttribute.MapAttributeValues>) template.getAttributes().get("map");
+
+      final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
+      MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java
index a95c3131f..701c6c139 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java
@@ -1,16 +1,14 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -25,7 +23,7 @@ public class OverviewMapAttributeTest extends AbstractMapfishSpringTest {
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private TestHttpClientFactory httpRequestFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.configurationFactory.setDoValidation(false);
   }
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java b/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java
index 68872a701..f68a789f2 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.CLOSEST_HIGHER_SCALE_ON_TIE;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.CLOSEST_LOWER_SCALE_ON_TIE;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.HIGHER_SCALE;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.LOWER_SCALE;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.map.DistanceUnit;
 import org.mapfish.print.map.Scale;
 
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java b/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java
index 358bf3921..d8cd1e1ca 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.map.DistanceUnit;
 
 public class ZoomLevelsTest {
diff --git a/core/src/test/java/org/mapfish/print/cli/MainTest.java b/core/src/test/java/org/mapfish/print/cli/MainTest.java
index 3c5a81346..4f1843e35 100644
--- a/core/src/test/java/org/mapfish/print/cli/MainTest.java
+++ b/core/src/test/java/org/mapfish/print/cli/MainTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.cli;
 
 import java.io.File;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.test.util.ImageSimilarity;
 
@@ -12,7 +12,7 @@ public class MainTest {
   private File configFile;
   private File v3ApiRequestFile;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     this.outputFile = File.createTempFile("main-test", ".png");
     this.configFile = getFile("config.yaml");
diff --git a/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java
index c933237a5..e4c29472b 100644
--- a/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.mapfish.print.attribute.PrimitiveAttribute;
 
diff --git a/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java
index f22cd5621..e6c06d7ce 100644
--- a/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.codahale.metrics.MetricRegistry;
 import org.mapfish.print.attribute.PrimitiveAttribute;
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
index c2fe48268..7bd6aa253 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
@@ -1,9 +1,10 @@
 package org.mapfish.print.config;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mapfish.print.AbstractMapfishSpringTest.DEFAULT_SPRING_XML;
 
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -14,16 +15,18 @@ public class ConfigurationFactoryAllConfigObjectMustBePrototypeTest {
   public static final String TEST_SPRING_XML =
       "classpath:org/mapfish/print/config/config-test-no-prototype-application-context.xml";
 
-  @Test(expected = BeanCreationException.class)
+  @Test
   public void testAll() throws Exception {
-    ClassPathXmlApplicationContext applicationContext =
-        new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
-    ConfigurationFactory configurationFactory =
-        applicationContext.getBean(ConfigurationFactory.class);
-    File configFile =
-        AbstractMapfishSpringTest.getFile(
-            ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
-            "configRequiringSpringInjection.yaml");
-    configurationFactory.getConfig(configFile);
+    assertThrows(BeanCreationException.class, () -> {
+      ClassPathXmlApplicationContext applicationContext =
+          new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
+      ConfigurationFactory configurationFactory =
+          applicationContext.getBean(ConfigurationFactory.class);
+      File configFile =
+          AbstractMapfishSpringTest.getFile(
+              ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
+              "configRequiringSpringInjection.yaml");
+      configurationFactory.getConfig(configFile);
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
index ff6eec131..b12d104e7 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.util.concurrent.Callable;
@@ -10,8 +8,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.Attribute;
 import org.mapfish.print.processor.Processor;
@@ -27,7 +25,7 @@ public class ConfigurationFactoryTest extends AbstractMapfishSpringTest {
       "classpath:org/mapfish/print/config/config-test-application-context.xml";
   @Autowired private ConfigurationFactory configurationFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.configurationFactory.setDoValidation(false);
   }
@@ -51,7 +49,7 @@ public void testSpringInjection() throws Exception {
     assertEquals(1, template.getProcessorGraph().getAllProcessors().size());
     assertEquals(1, template.getProcessorGraph().getRoots().size());
     Processor<?, ?> processor = template.getProcessorGraph().getRoots().getFirst().getProcessor();
-    assertTrue(processor.toString(), processor instanceof ProcessorWithSpringInjection);
+    assertTrue(processor instanceof ProcessorWithSpringInjection, processor.toString());
     ((ProcessorWithSpringInjection) processor).assertInjected();
   }
 
@@ -91,8 +89,8 @@ public void testParallelConfigLoading() throws Exception {
     boolean thread1Result = thread1Futur.get();
     boolean thread2Result = thread2Futur.get();
 
-    assertTrue("thread 1 configuration loading was not OK", thread1Result);
-    assertTrue("thread 2 configuration loading was not OK", thread2Result);
+    assertTrue(thread1Result, "thread 1 configuration loading was not OK");
+    assertTrue(thread2Result, "thread 2 configuration loading was not OK");
 
     executor.shutdown();
   }
@@ -120,17 +118,21 @@ public void testConfigurationInjection() throws Exception {
     ((ProcessorWithConfigurationInjection) processor).assertInjected();
   }
 
-  @Test(expected = ConstructorException.class)
+  @Test
   public void testConfigurationAttributeMustImplementAttribute() throws Exception {
-    File configFile =
-        getFile(ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
-    configurationFactory.getConfig(configFile);
+    assertThrows(ConstructorException.class, () -> {
+      File configFile =
+          getFile(ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
+      configurationFactory.getConfig(configFile);
+    });
   }
 
-  @Test(expected = ConstructorException.class)
+  @Test
   public void testConfigurationProcessorMustImplementProcessor() throws Exception {
-    File configFile =
-        getFile(ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
-    configurationFactory.getConfig(configFile);
+    assertThrows(ConstructorException.class, () -> {
+      File configFile =
+          getFile(ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
+      configurationFactory.getConfig(configFile);
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
index 33518ea39..093cc5d9f 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
@@ -1,12 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.StringWriter;
 import java.util.Arrays;
@@ -27,8 +21,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mockito.Mockito;
@@ -42,7 +36,7 @@
 /** Tests for {@link org.mapfish.print.config.Configuration} class. */
 public class ConfigurationTest {
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
@@ -334,7 +328,7 @@ private void assertStyleType(Class<?> expectedSymbolizerType, Style style) {
     final Rule rule = featureTypeStyle.rules().getFirst();
     final Class<? extends Symbolizer> symbClass = rule.symbolizers().getFirst().getClass();
     assertTrue(
-        "Expected: " + expectedSymbolizerType.getName() + " but was: " + symbClass,
-        expectedSymbolizerType.isAssignableFrom(symbClass));
+        expectedSymbolizerType.isAssignableFrom(symbClass),
+        "Expected: " + expectedSymbolizerType.getName() + " but was: " + symbClass);
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java b/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java
index dda70c41e..e485df00a 100644
--- a/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
@@ -8,7 +8,7 @@
 import java.util.Map;
 import net.sf.jasperreports.engine.JasperPrint;
 import org.apache.commons.lang3.ArrayUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.output.AbstractJasperReportOutputFormat;
 import org.mapfish.print.output.OutputFormat;
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
index 55f43f9be..9e4439be4 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
index ff5a545d6..2faf7f115 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.List;
diff --git a/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java b/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java
index 3dbc64bf6..5aef1ebd2 100644
--- a/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java
+++ b/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java b/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java
index 36b8e8632..2c26ed73d 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.config.access;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.List;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java
index 04f8d5385..50635bc90 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config.access;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AlwaysAllowAssertionTest {
 
diff --git a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
index d073c8ef4..238bbfb00 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
@@ -1,10 +1,11 @@
 package org.mapfish.print.config.access;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Collections;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -15,30 +16,34 @@ public class AndAccessAssertionTest extends AbstractMapfishSpringTest {
 
   @Autowired ApplicationContext applicationContext;
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
 
-  @Test(expected = AssertionError.class)
+  @Test
   public void testSetPredicates() {
+    assertThrows(AssertionError.class, () -> {
 
-    final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-    andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
-    andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
+      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
+      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
+      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
+    });
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testAssertAccessNotAllowed() {
-    final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-    AccessAssertion pred1 =
-        new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
-    AccessAssertion pred2 =
-        new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
-    andAssertion.setPredicates(pred1, pred2);
+    assertThrows(AccessDeniedException.class, () -> {
+      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
+      AccessAssertion pred1 =
+          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
+      AccessAssertion pred2 =
+          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
+      andAssertion.setPredicates(pred1, pred2);
 
-    AccessAssertionTestUtil.setCreds("ROLE_USER");
-    andAssertion.assertAccess("", this);
+      AccessAssertionTestUtil.setCreds("ROLE_USER");
+      andAssertion.assertAccess("", this);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
index d2403ba6b..294a83e04 100644
--- a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.config.access;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mapfish.print.config.access.AccessAssertionTestUtil.setCreds;
 
 import java.util.ArrayList;
@@ -8,8 +9,8 @@
 import java.util.HashSet;
 import java.util.List;
 import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.SetsUtils;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
@@ -17,33 +18,39 @@
 
 public class RoleAccessAssertionTest {
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
 
-  @Test(expected = AssertionError.class)
+  @Test
   public void testSetRequiredRoles() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    assertThrows(AssertionError.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    });
   }
 
-  @Test(expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
   public void testAssertAccessNoCredentials() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
 
-    assertion.assertAccess("", this);
+      assertion.assertAccess("", this);
+    });
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testAssertAccessWrongCreds() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    assertThrows(AccessDeniedException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
 
-    setCreds("ROLE_USER2");
-    assertion.assertAccess("", this);
+      setCreds("ROLE_USER2");
+      assertion.assertAccess("", this);
+    });
   }
 
   @Test
@@ -73,23 +80,27 @@ public void testAssertAccessOneOf() {
     assertion.assertAccess("", this);
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testAssertAccessOneOfFailed() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
+    assertThrows(AccessDeniedException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
 
-    setCreds("ROLE_OTHER");
-    assertion.assertAccess("", this);
+      setCreds("ROLE_OTHER");
+      assertion.assertAccess("", this);
+    });
   }
 
-  @Test(expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
   public void testAssertNoRolesNoCreds() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(new HashSet<>());
-
-    assertion.assertAccess("", this);
-    setCreds("ROLE_OTHER", "ROLE_USER2");
-    assertion.assertAccess("", this);
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(new HashSet<>());
+
+      assertion.assertAccess("", this);
+      setCreds("ROLE_OTHER", "ROLE_USER2");
+      assertion.assertAccess("", this);
+    });
   }
 
   @Test
@@ -104,27 +115,31 @@ public void testAssertNoRolesSomeCreds() {
     assertion.assertAccess("", this);
   }
 
-  @Test(expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
   public void testMarshalUnmarshalNoAuth() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    final JSONObject marshalData = assertion.marshal();
-
-    RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-    newAssertion.unmarshal(marshalData);
-    newAssertion.assertAccess("", this);
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+      final JSONObject marshalData = assertion.marshal();
+
+      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+      newAssertion.unmarshal(marshalData);
+      newAssertion.assertAccess("", this);
+    });
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testMarshalUnmarshalNotPermitted() {
-    setCreds("ROLE_OTHER");
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    final JSONObject marshalData = assertion.marshal();
-
-    RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-    newAssertion.unmarshal(marshalData);
-    newAssertion.assertAccess("", this);
+    assertThrows(AccessDeniedException.class, () -> {
+      setCreds("ROLE_OTHER");
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+      final JSONObject marshalData = assertion.marshal();
+
+      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+      newAssertion.unmarshal(marshalData);
+      newAssertion.assertAccess("", this);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
index bb99cd18b..7daaf50c6 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,8 +9,8 @@
 import java.nio.file.Files;
 import java.util.HashMap;
 import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.IllegalFileAccessException;
@@ -41,7 +41,7 @@ public class ConfigFileResolvingHttpRequestFactoryTest extends AbstractMapfishSp
 
   private ConfigFileResolvingHttpRequestFactory resolvingFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     requestFactory.registerHandler(input -> true, createFileHandler(URI::getPath));
 
@@ -147,12 +147,14 @@ public void testCreateRequestRelativeFileToConfig() throws Exception {
     assertEquals(expected, actual);
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testCreateRequestIllegalFile() throws Exception {
-    final URI uri = logbackXml.toURI();
-    final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI uri = logbackXml.toURI();
+      final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
 
-    request.execute();
+      request.execute();
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
index cff48acf3..9ba1f2711 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -9,7 +9,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.PrintException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java b/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java
index 7e23bdb34..f8f841117 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index b05488860..db091347c 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.sun.net.httpserver.HttpsServer;
 import java.util.ArrayList;
@@ -10,9 +8,9 @@
 import java.util.List;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
@@ -38,12 +36,12 @@ public class HttpCredentialTest {
   @Autowired ConfigurationFactory configurationFactory;
   @Autowired private MfClientHttpRequestFactoryImpl requestFactory;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     httpsServer = HttpProxyTest.createHttpsServer(HTTPS_PROXY_PORT);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     httpsServer.stop(0);
   }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index 03531ff38..f4e6ce304 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.AbstractMapfishSpringTest.HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS;
 import static org.mapfish.print.AbstractMapfishSpringTest.HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY;
 
@@ -29,9 +29,9 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManagerFactory;
 import org.apache.commons.io.IOUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
@@ -66,7 +66,7 @@ public class HttpProxyTest {
   @Autowired ConfigurationFactory configurationFactory;
   @Autowired private MfClientHttpRequestFactoryImpl requestFactory;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     proxyServer = HttpServer.create(new InetSocketAddress(LOCALHOST, PROXY_PORT), 0);
     proxyServer.start();
@@ -77,7 +77,7 @@ public static void setUp() throws Exception {
     httpsServer = createHttpsServer(HTTPS_PROXY_PORT);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     proxyServer.stop(0);
     targetServer.stop(0);
@@ -121,7 +121,7 @@ static void assertCorrectResponse(
     final ClientHttpResponse response = request.execute();
 
     final String message = IOUtils.toString(response.getBody(), Constants.DEFAULT_ENCODING);
-    assertEquals(message, HttpStatus.OK, response.getStatusCode());
+    assertEquals(HttpStatus.OK, response.getStatusCode(), message);
 
     assertEquals(expected, message);
   }
diff --git a/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java b/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java
index dc90f3407..85f9d19e1 100644
--- a/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java
+++ b/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java
@@ -1,14 +1,14 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpServer;
 import java.net.InetSocketAddress;
 import java.net.URI;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpResponse;
 
@@ -16,14 +16,14 @@ public class MfClientHttpRequestFactoryImplTest {
   private static final int TARGET_PORT = 33212;
   private static HttpServer targetServer;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     targetServer =
         HttpServer.create(new InetSocketAddress(HttpProxyTest.LOCALHOST, TARGET_PORT), 0);
     targetServer.start();
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     targetServer.stop(0);
   }
diff --git a/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java b/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java
index 0a9664a3f..a3d88562e 100644
--- a/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java
+++ b/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java
@@ -1,11 +1,8 @@
 package org.mapfish.print.map;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DistanceUnitTest {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/ScaleTest.java b/core/src/test/java/org/mapfish/print/map/ScaleTest.java
index 838c22ae6..e3b997211 100644
--- a/core/src/test/java/org/mapfish/print/map/ScaleTest.java
+++ b/core/src/test/java/org/mapfish/print/map/ScaleTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 
 public class ScaleTest {
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java b/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java
index 51d5f4d0e..bb85bf208 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java
@@ -1,10 +1,6 @@
 package org.mapfish.print.map.geotools;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
@@ -18,7 +14,7 @@
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultEngineeringCRS;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.TestHttpClientFactory;
@@ -232,7 +228,7 @@ public void testTreatStringAsGeoJson() throws Exception {
             java.nio.file.Files.readString(geojsonExample.toPath(), Constants.DEFAULT_CHARSET);
         final SimpleFeatureCollection simpleFeatureCollection =
             featuresParser.treatStringAsGeoJson(geojson);
-        assertEquals(geojsonExample.getName(), numFeatures, simpleFeatureCollection.size());
+        assertEquals(numFeatures, simpleFeatureCollection.size(), geojsonExample.getName());
       } catch (RuntimeException t) {
         throw new RuntimeException(
             "Exception raised when processing: " + geojsonExample.getName() + "\n" + t.getMessage(),
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
index 197f45d81..0af9af867 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.map.geotools;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.processor.map.CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR;
 
 import java.io.File;
@@ -11,7 +10,7 @@
 import org.geotools.api.data.Query;
 import org.geotools.map.FeatureLayer;
 import org.geotools.map.Layer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.TestHttpClientFactory;
@@ -69,66 +68,72 @@ public void testGeoJsonEmbedded() throws Exception {
     assertEquals(RenderType.SVG, layer.getRenderType());
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    final File file =
-        getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-    final PJsonObject requestData =
-        parseJSONObjectFromString(
-            "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
-
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-    configuration.setFileLoaderManager(this.fileLoaderManager);
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-    MapfishParserTest.populateLayerParam(requestData, param, "type");
-    geojsonLayerParser
-        .parse(template, param)
-        .getLayers(
-            httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final File file =
+          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+      final PJsonObject requestData =
+          parseJSONObjectFromString(
+              "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
+
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+      configuration.setFileLoaderManager(this.fileLoaderManager);
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+      MapfishParserTest.populateLayerParam(requestData, param, "type");
+      geojsonLayerParser
+          .parse(template, param)
+          .getLayers(
+              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-    configuration.setFileLoaderManager(this.fileLoaderManager);
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-    param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
-    geojsonLayerParser
-        .parse(template, param)
-        .getLayers(
-            httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+      configuration.setFileLoaderManager(this.fileLoaderManager);
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+      param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
+      geojsonLayerParser
+          .parse(template, param)
+          .getLayers(
+              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    });
   }
 
-  @Test(expected = Exception.class)
+  @Test
   public void testGeoNotUrlNotGeoJson() {
-    final File file =
-        getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-    final PJsonObject requestData =
-        parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
-
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(file);
-    configuration.setFileLoaderManager(this.fileLoaderManager);
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-    MapfishParserTest.populateLayerParam(requestData, param, "type");
-    geojsonLayerParser
-        .parse(template, param)
-        .getLayers(
-            httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    assertThrows(Exception.class, () -> {
+      final File file =
+          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+      final PJsonObject requestData =
+          parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
+
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(file);
+      configuration.setFileLoaderManager(this.fileLoaderManager);
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+      MapfishParserTest.populateLayerParam(requestData, param, "type");
+      geojsonLayerParser
+          .parse(template, param)
+          .getLayers(
+              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
index 1e42e4f4c..c82f9df40 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
@@ -1,7 +1,9 @@
 package org.mapfish.print.map.geotools;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.config.Configuration;
@@ -11,34 +13,38 @@
 
 public class GeotiffLayerFactoryPluginTest {
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    final File file =
-        AbstractMapfishSpringTest.getFile(
-            CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
-            CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR + "sampleGeoTiff.tif");
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-    param.url = file.toURI().toURL().toString();
-    new GeotiffLayer.Plugin().parse(template, param);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final File file =
+          AbstractMapfishSpringTest.getFile(
+              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
+              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR + "sampleGeoTiff.tif");
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+      param.url = file.toURI().toURL().toString();
+      new GeotiffLayer.Plugin().parse(template, param);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-    param.url =
-        "file://../" + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR + "/geojson.json";
-    new GeotiffLayer.Plugin().parse(template, param);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+      param.url =
+          "file://../" + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR + "/geojson.json";
+      new GeotiffLayer.Plugin().parse(template, param);
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java b/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java
index 8efdc137f..16da66043 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map.geotools.grid;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import si.uom.NonSI;
 
 public class GridUtilsTest {
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java b/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java
index af1603c33..55658c38b 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.awt.Dimension;
 import java.util.HashMap;
@@ -14,7 +14,7 @@
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.map.Layer;
 import org.geotools.referencing.crs.DefaultEngineeringCRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.LineString;
 import org.mapfish.print.TestHttpClientFactory;
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java b/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java
index 043c55eae..adabff503 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.Dimension;
 import java.util.Arrays;
@@ -10,7 +10,7 @@
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.referencing.crs.DefaultEngineeringCRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Point;
 import org.mapfish.print.AbstractMapfishSpringTest;
@@ -62,10 +62,10 @@ public void testNumLines() throws Exception {
       while (features.hasNext()) {
         SimpleFeature next = features.next();
         assertTrue(
-            next.getDefaultGeometry().getClass().getName(),
-            next.getDefaultGeometry() instanceof Point);
+            next.getDefaultGeometry() instanceof Point,
+            next.getDefaultGeometry().getClass().getName());
         Coordinate coord = ((Point) next.getDefaultGeometry()).getCoordinate();
-        assertTrue(coord + " is not one of the expected points", expectedPoints.contains(coord));
+        assertTrue(expectedPoints.contains(coord), coord + " is not one of the expected points");
       }
     }
   }
@@ -113,10 +113,10 @@ public void testParseSpacingAndOrigin() throws Exception {
       while (features.hasNext()) {
         SimpleFeature next = features.next();
         assertTrue(
-            next.getDefaultGeometry().getClass().getName(),
-            next.getDefaultGeometry() instanceof Point);
+            next.getDefaultGeometry() instanceof Point,
+            next.getDefaultGeometry().getClass().getName());
         Coordinate coord = ((Point) next.getDefaultGeometry()).getCoordinate();
-        assertTrue(coord + " is not one of the expected points", expectedPoints.contains(coord));
+        assertTrue(expectedPoints.contains(coord), coord + " is not one of the expected points");
       }
       assertEquals(expectedPoints.size(), featureSource.getFeatures().size());
     }
diff --git a/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java b/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java
index a2bcd0b0e..4897a995b 100644
--- a/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map.image;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.codahale.metrics.MetricRegistry;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.Constants;
 import org.mapfish.print.attribute.map.MapfishMapContext;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
@@ -30,7 +30,7 @@ public void testFetchImage() throws IOException {
 
     try {
       layer.fetchImage(mockClientHttpRequest, mapContext);
-      Assert.fail("Did not throw exception with unsupported status code");
+      Assertions.fail("Did not throw exception with unsupported status code");
     } catch (RuntimeException e) {
       assertTrue(e.getMessage().contains(String.valueOf(unsupportedStatusCode)));
     }
diff --git a/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java b/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java
index 711f04ead..08ea8768c 100644
--- a/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java
+++ b/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print.map.image.wms;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.google.common.collect.Multimap;
 import java.awt.Dimension;
@@ -12,7 +9,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.URIUtils;
 import org.mapfish.print.map.image.wms.WmsLayerParam.ServerType;
 import org.mapfish.print.wrapper.json.PJsonObject;
diff --git a/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java b/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java
index f2b0afaf2..52bd0f838 100644
--- a/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java
@@ -1,15 +1,13 @@
 package org.mapfish.print.map.style;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Optional;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.Assert;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.AbstractMapfishSpringTest;
diff --git a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
index 8cac6572b..36be930ec 100644
--- a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.map.style;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -14,7 +12,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpRequest;
diff --git a/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java b/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java
index 0c7352141..ce8ceccf5 100644
--- a/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.map.style;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Optional;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java b/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java
index 53bbdad49..e94fb7785 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Color;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ColorParserTest {
 
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java b/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java
index 08eda89b4..efaaaaa52 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java
@@ -1,10 +1,6 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.map.style.json.MapfishStyleParserPluginTest.REQUEST_DATA_STYLE_JSON_V1_STYLE_JSON;
 
 import java.io.File;
@@ -38,8 +34,8 @@
 import org.geotools.xml.styling.SLDTransformer;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.Constants;
 import org.mapfish.print.MapPrinter;
 import org.mapfish.print.TestHttpClientFactory;
@@ -77,7 +73,7 @@ static void assertFill(double fillOpacity, String fillColor, Fill fill) {
     assertEquals(fillOpacity, valueOf(fill.getOpacity()));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     Configuration configuration = new Configuration();
     final File file =
@@ -561,10 +557,10 @@ public void testSomeDefaultPointSymbolizer() {
     Mark mark = (Mark) graphic.graphicalSymbols().getFirst();
     Stroke stroke = mark.getStroke();
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         new float[] {5f, 4f},
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
   }
 
   @Test
@@ -593,10 +589,10 @@ public void testSomeDefaultLineSymbolizer() {
 
     final Stroke stroke = lineSymbolizer.getStroke();
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         new float[] {5f, 4f},
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
   }
 
   @Test
@@ -626,10 +622,10 @@ public void testSomeDefaultPolygonSymbolizer() {
 
     final Stroke stroke = polygonSymbolizer.getStroke();
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         new float[] {5f, 4f},
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
 
     assertNotNull(polygonSymbolizer.getFill());
   }
@@ -682,7 +678,7 @@ public void testGetGraphicFormatDetect() {
         styleJson.getInternalObj().put(JsonStyleParserHelper.JSON_GRAPHIC_FORMAT, mimeType);
         final String graphicFormat =
             helper.getGraphicFormat("http://somefile.com/file.jpeg", styleJson);
-        assertTrue(graphicFormat + " is not supported", strings.contains(graphicFormat));
+        assertTrue(strings.contains(graphicFormat), graphicFormat + " is not supported");
       }
     }
   }
@@ -698,10 +694,10 @@ public void testGetGraphicFormatDetect2() {
           continue;
         }
         final String gf1 = helper.getGraphicFormat("data:" + mimeType + ",blabla", styleJson);
-        assertTrue(gf1 + " is not supported", strings.contains(gf1));
+        assertTrue(strings.contains(gf1), gf1 + " is not supported");
         final String gf2 =
             helper.getGraphicFormat("data:" + mimeType + ";base64,blabla", styleJson);
-        assertTrue(gf2 + " is not supported", strings.contains(gf2));
+        assertTrue(strings.contains(gf2), gf2 + " is not supported");
       }
     }
   }
@@ -815,9 +811,9 @@ private void assertDashStyle(String dashStyle, float[] expectedDashArray) throws
     final Stroke stroke = helper.createStroke(pStyle, false);
     assertNotNull(stroke);
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         expectedDashArray,
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java
index b95f734c7..ee7f15017 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java
@@ -1,14 +1,14 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Optional;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java
index 93ead6f04..0bff86b83 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MapfishJsonStyleVersion2Test {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java b/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java
index 0e647fa58..f12357588 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java
@@ -1,10 +1,6 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.AbstractMapfishSpringTest.parseJSONObjectFromFile;
 import static org.mapfish.print.map.style.json.JsonStyleParserHelperTest.valueOf;
 
@@ -37,7 +33,7 @@
 import org.geotools.filter.text.ecql.ECQL;
 import org.geotools.styling.AbstractStyleVisitor;
 import org.geotools.xml.styling.SLDTransformer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryCollection;
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java b/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java
index 3b8fff633..304f94a3e 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.Multimap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 
 /** Test param methods. */
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
index f07d3ab50..dc2483cef 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.map.tiled;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -16,7 +14,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.Processor;
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java
index d79f9dec2..592a9e49e 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.tiled.osm;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OsmLayerParamTest {
 
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java
index 2fb8f9da5..49f9651bf 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java
@@ -1,14 +1,15 @@
 package org.mapfish.print.map.tiled.osm;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.codahale.metrics.MetricRegistry;
 import java.awt.Rectangle;
 import java.util.concurrent.ForkJoinPool;
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.map.MapBounds;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.map.Scale;
@@ -20,7 +21,7 @@
 public class OsmLayerTest {
   @Mock private StyleSupplier<GridCoverage2D> styleSupplier;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     MockitoAnnotations.openMocks(this);
   }
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java
index a4c8e9a71..80b75f67b 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.tiled.wmts;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WMTSLayerParamTest {
 
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java
index 71db3d624..8f8eae25d 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java
@@ -1,13 +1,11 @@
 package org.mapfish.print.map.tiled.wmts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.Rectangle;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.map.CenterScaleMapBounds;
 import org.mapfish.print.attribute.map.MapBounds;
 import org.mapfish.print.config.Configuration;
@@ -34,17 +32,17 @@ public void testTileBoundsCalculation() throws Exception {
     ReferencedEnvelope tileBounds = tileInformation.getTileBounds();
 
     assertEquals(420000, tileBounds.getMinX(), 0.00001);
-    assertFalse("" + tileBounds.getMinX(), Double.isInfinite(tileBounds.getMinX()));
-    assertFalse("" + tileBounds.getMinX(), Double.isNaN(tileBounds.getMinX()));
-    assertTrue("" + tileBounds.getMinY(), tileBounds.getMinY() < 350000);
-    assertFalse("" + tileBounds.getMinY(), Double.isInfinite(tileBounds.getMinY()));
-    assertFalse("" + tileBounds.getMinY(), Double.isNaN(tileBounds.getMinY()));
-    assertTrue("" + tileBounds.getMaxX(), tileBounds.getMaxX() > 420000);
-    assertFalse("" + tileBounds.getMaxX(), Double.isInfinite(tileBounds.getMaxX()));
-    assertFalse("" + tileBounds.getMaxX(), Double.isNaN(tileBounds.getMaxX()));
+    assertFalse(Double.isInfinite(tileBounds.getMinX()), "" + tileBounds.getMinX());
+    assertFalse(Double.isNaN(tileBounds.getMinX()), "" + tileBounds.getMinX());
+    assertTrue(tileBounds.getMinY() < 350000, "" + tileBounds.getMinY());
+    assertFalse(Double.isInfinite(tileBounds.getMinY()), "" + tileBounds.getMinY());
+    assertFalse(Double.isNaN(tileBounds.getMinY()), "" + tileBounds.getMinY());
+    assertTrue(tileBounds.getMaxX() > 420000, "" + tileBounds.getMaxX());
+    assertFalse(Double.isInfinite(tileBounds.getMaxX()), "" + tileBounds.getMaxX());
+    assertFalse(Double.isNaN(tileBounds.getMaxX()), "" + tileBounds.getMaxX());
     assertEquals(350000, tileBounds.getMaxY(), 0.00001);
-    assertFalse("" + tileBounds.getMaxY(), Double.isInfinite(tileBounds.getMaxY()));
-    assertFalse("" + tileBounds.getMaxY(), Double.isNaN(tileBounds.getMaxY()));
+    assertFalse(Double.isInfinite(tileBounds.getMaxY()), "" + tileBounds.getMaxY());
+    assertFalse(Double.isNaN(tileBounds.getMaxY()), "" + tileBounds.getMaxY());
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
index d638bc865..0662ff45c 100644
--- a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
+++ b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
@@ -8,8 +8,8 @@
 
 import com.codahale.metrics.health.HealthCheck;
 import java.util.Date;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.servlet.job.JobQueue;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
@@ -26,7 +26,7 @@ public class JobQueueHealthCheckTest extends AbstractMapfishSpringTest {
 
   @Autowired @InjectMocks private JobQueueHealthCheck jobQueueHealthCheck;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     // Initialize mocks created above
     MockitoAnnotations.openMocks(this);
@@ -50,10 +50,9 @@ public void testCheck_Failed_NoPrintJobs() {
     RuntimeException rte =
         assertThrowsExactly(
             RuntimeException.class,
-            () -> {
+            () ->
               // WHEN
-              jobQueueHealthCheck.check();
-            });
+              jobQueueHealthCheck.check());
 
     assertEquals(
         "None of the print job queued was processed by this server, in the last (seconds): 300",
diff --git a/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java b/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java
index 2f78f517a..86944f3ca 100644
--- a/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java
+++ b/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java
@@ -9,8 +9,8 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.health.HealthCheck;
 import java.util.TreeSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -22,7 +22,7 @@ public class UnhealthyCountersHealthCheckTest extends AbstractMapfishSpringTest
 
   @Autowired @InjectMocks private UnhealthyCountersHealthCheck unhealthyCountersHealthCheck;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     // Initialize mocks created above
     MockitoAnnotations.openMocks(this);
diff --git a/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java
index e752ed4b7..5a076fd98 100644
--- a/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.ExtraPropertyException;
@@ -54,7 +54,7 @@ public void testParameterValidation_WrongType() throws Exception {
       fail("Expected a " + AssertionFailedException.class);
     } catch (AssertionFailedException e) {
       assertTrue(
-          e.getMessage(), e.getMessage().contains("does not match the class of the actual object"));
+          e.getMessage().contains("does not match the class of the actual object"), e.getMessage());
     }
   }
 
@@ -78,8 +78,8 @@ public void testParameterValidation_MissingParameter() throws Exception {
       fail("Expected a " + ExtraPropertyException.class);
     } catch (ExtraPropertyException e) {
       assertTrue(
-          e.getMessage(),
-          e.getMessage().contains("Extra properties found in the request attributes"));
+          e.getMessage().contains("Extra properties found in the request attributes"),
+          e.getMessage());
     }
   }
 
@@ -104,7 +104,7 @@ public void testFieldValidation_WrongType() throws Exception {
       fail("Expected a " + AssertionFailedException.class);
     } catch (AssertionFailedException e) {
       assertTrue(
-          e.getMessage(), e.getMessage().contains("does not match the class of the actual object"));
+          e.getMessage().contains("does not match the class of the actual object"), e.getMessage());
     }
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java b/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java
index 41409b374..a760465f0 100644
--- a/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java
@@ -4,8 +4,8 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -46,10 +46,10 @@ public void testMultiImagesVsOneImage() throws Exception {
     int imageSizeInThePdfByte = oneImagePdfSizeByte - noImagePdfSizeByte;
     // If multiImagesPdfSizeByte is smaller that oneImagePdfSizeByte + imageSizeInThePdf whereas it
     // contains the images 8 times, it means the image is stored by reference in this PDF.
-    Assert.assertTrue(
+    Assertions.assertTrue(
+        oneImagePdfSizeByte + imageSizeInThePdfByte > multiImagesPdfSizeByte,
         "multiImagesPdfSizeByte should not be higher than pdf oneImagePdfSizeByte +"
-            + " imageSizeInThePdf ",
-        oneImagePdfSizeByte + imageSizeInThePdfByte > multiImagesPdfSizeByte);
+            + " imageSizeInThePdf ");
   }
 
   public int generatedPdfAndGetSize(final String configName) throws Exception {
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
index 2b04c1646..d5e754814 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
@@ -1,12 +1,14 @@
 package org.mapfish.print.output;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 import net.sf.jasperreports.engine.JasperPrint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -48,28 +50,30 @@ public void testPrint() throws Exception {
     new ImageSimilarity(getFile(BASE_DIR + "expectedReport.png")).assertSimilarity(print, 0, 0);
   }
 
-  @Test(expected = Test.None.class /* no exception expected */)
+  @Test
   public void testAllOutputFormats() throws Exception {
-    final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-    final PJsonObject requestData = loadJsonRequestData();
+    assertDoesNotThrow(() -> {
+      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+      final PJsonObject requestData = loadJsonRequestData();
 
-    for (OutputFormat format : this.outputFormat.values()) {
-      if ("bmp".equals(format.getFileSuffix())
-          || "jpeg".equals(format.getFileSuffix())
-          || "jpg".equals(format.getFileSuffix())) {
-        // BMP and JPEG do not support transparency
-        continue;
-      }
-      final OutputStream outputStream = new ByteArrayOutputStream();
-      format.print(
-          new HashMap<>(),
-          requestData,
-          config,
-          getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
-          getTaskDirectory(),
-          outputStream);
-      // no error?  its a pass
+      for (OutputFormat format : this.outputFormat.values()) {
+        if ("bmp".equals(format.getFileSuffix())
+            || "jpeg".equals(format.getFileSuffix())
+            || "jpg".equals(format.getFileSuffix())) {
+          // BMP and JPEG do not support transparency
+          continue;
+        }
+        final OutputStream outputStream = new ByteArrayOutputStream();
+        format.print(
+            new HashMap<>(),
+            requestData,
+            config,
+            getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
+            getTaskDirectory(),
+            outputStream);
+        // no error?  its a pass
 
-    }
+      }
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java
index 57eae2438..b7905b534 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java
@@ -1,15 +1,13 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
index 3eb96a021..4711da218 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
@@ -8,7 +8,7 @@
 import java.io.FileWriter;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -47,6 +47,6 @@ public void testPrint() throws Exception {
     writer.close();
 
     String expected = getFileContent(BASE_DIR + "expectedReport.svg");
-    assertEquals(actual.toString(), expected, outputStream.toString(Constants.DEFAULT_CHARSET));
+    assertEquals(expected, outputStream.toString(Constants.DEFAULT_CHARSET), actual.toString());
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/ValuesTest.java b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
index ab369acea..c71e39a40 100644
--- a/core/src/test/java/org/mapfish/print/output/ValuesTest.java
+++ b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.util.HashMap;
@@ -9,7 +8,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.DataSourceAttribute;
@@ -71,27 +70,29 @@ public void testNoDefaults() throws Exception {
     assertEquals("requestId", table.columns[0]);
   }
 
-  @Test(expected = ObjectMissingException.class)
+  @Test
   public void testNoDefaults_Error_OnMissing_Attribute() throws Exception {
-    configurationFactory.setDoValidation(false);
-    final JSONObject obj = new JSONObject();
-    PJsonObject requestData = new PJsonObject(obj, "");
-    final JSONObject atts = new JSONObject();
-    obj.put("attributes", atts);
-    final Configuration config =
-        configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-    Template template = config.getTemplates().values().iterator().next();
-    new Values(
-        new HashMap<>(),
-        requestData,
-        template,
-        new File("tmp"),
-        this.httpRequestFactory,
-        new File("."),
-        HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-        HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-        new AtomicBoolean(false));
+    assertThrows(ObjectMissingException.class, () -> {
+      configurationFactory.setDoValidation(false);
+      final JSONObject obj = new JSONObject();
+      PJsonObject requestData = new PJsonObject(obj, "");
+      final JSONObject atts = new JSONObject();
+      obj.put("attributes", atts);
+      final Configuration config =
+          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+      Template template = config.getTemplates().values().iterator().next();
+      new Values(
+          new HashMap<>(),
+          requestData,
+          template,
+          new File("tmp"),
+          this.httpRequestFactory,
+          new File("."),
+          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+          new AtomicBoolean(false));
+    });
   }
 
   @Test
@@ -135,13 +136,14 @@ public void testDefaults() throws Exception {
     assertEquals("id", table.columns[0]);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testExpectObjectGetArray() throws Exception {
+    assertThrows(IllegalArgumentException.class, () -> {
 
-    PJsonObject requestData =
-        parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
-    String badLegendConf =
-        """
+      PJsonObject requestData =
+          parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
+      String badLegendConf =
+          """
         [{
             "name": "",
             "classes": [{
@@ -152,23 +154,24 @@ public void testExpectObjectGetArray() throws Exception {
             }]
         }]
         """;
-    requestData
-        .getInternalObj()
-        .getJSONObject("attributes")
-        .put("legend", new JSONArray(badLegendConf));
-    final Configuration config =
-        configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-    Template template = config.getTemplates().values().iterator().next();
-    new Values(
-        new HashMap<>(),
-        requestData,
-        template,
-        new File("tmp"),
-        this.httpRequestFactory,
-        new File("."),
-        HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-        HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-        new AtomicBoolean(false));
+      requestData
+          .getInternalObj()
+          .getJSONObject("attributes")
+          .put("legend", new JSONArray(badLegendConf));
+      final Configuration config =
+          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+      Template template = config.getTemplates().values().iterator().next();
+      new Values(
+          new HashMap<>(),
+          requestData,
+          template,
+          new File("tmp"),
+          this.httpRequestFactory,
+          new File("."),
+          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+          new AtomicBoolean(false));
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
index 1a79f2ee5..482832d85 100644
--- a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
+++ b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
@@ -1,11 +1,6 @@
 package org.mapfish.print.parser;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.AbstractMapfishSpringTest.parseJSONObjectFromFile;
 
 import java.io.IOException;
@@ -14,7 +9,7 @@
 import java.util.regex.Pattern;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.ExtraPropertyException;
@@ -94,28 +89,34 @@ public void testChoice() {
     assertEquals(2, p.choiceC, 0.0000000001);
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testBothOneOfChoices() {
-    TestChoiceClass p = new TestChoiceClass();
-    PJsonObject json =
-        AbstractMapfishSpringTest.parseJSONObjectFromString("{\"choiceA\":1,\"choiceB\":2.0}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestChoiceClass p = new TestChoiceClass();
+      PJsonObject json =
+          AbstractMapfishSpringTest.parseJSONObjectFromString("{\"choiceA\":1,\"choiceB\":2.0}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testBothOneOfChoicesAndCanSatisfyOneOf() {
-    TestChoiceClass p = new TestChoiceClass();
-    PJsonObject json =
-        AbstractMapfishSpringTest.parseJSONObjectFromString(
-            "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestChoiceClass p = new TestChoiceClass();
+      PJsonObject json =
+          AbstractMapfishSpringTest.parseJSONObjectFromString(
+              "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testMissingOneOfChoices() {
-    TestChoiceClass p = new TestChoiceClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestChoiceClass p = new TestChoiceClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
   @Test
@@ -149,18 +150,22 @@ public void testOnlyRequirementDefinedNotDependant() {
     assertNull(p.c);
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testMissingBothRequirements() {
-    TestRequireClass p = new TestRequireClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestRequireClass p = new TestRequireClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testMissingOneOfTwoRequirements() {
-    TestRequireClass p = new TestRequireClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestRequireClass p = new TestRequireClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
   @Test
@@ -171,22 +176,26 @@ public void testFinalPublic() {
     assertEquals(100, p.i.intValue());
   }
 
-  @Test(expected = ExtraPropertyException.class)
+  @Test
   public void testFinalFieldMustNotBeInJson() {
-    TestFinalClass p = new TestFinalClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(ExtraPropertyException.class, () -> {
+      TestFinalClass p = new TestFinalClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testEnumIllegalVal() {
-    TestEnumParam p = new TestEnumParam();
+    assertThrows(IllegalArgumentException.class, () -> {
+      TestEnumParam p = new TestEnumParam();
 
-    final PJsonObject json =
-        AbstractMapfishSpringTest.parseJSONObjectFromString(
-            "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
+      final PJsonObject json =
+          AbstractMapfishSpringTest.parseJSONObjectFromString(
+              "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
 
-    MapfishParser.parse(true, json, p, "toIgnore");
+      MapfishParser.parse(true, json, p, "toIgnore");
+    });
   }
 
   @Test
@@ -289,10 +298,11 @@ public void testPopulateLayerParam_TooManyParams() throws IOException {
     }
   }
 
-  @Test(expected = ExtraPropertyException.class)
+  @Test
   public void testDoesntMap() {
-    String legendAtts =
-        """
+    assertThrows(ExtraPropertyException.class, () -> {
+      String legendAtts =
+          """
         {
             "extra": "",
             "classes": [{
@@ -303,9 +313,10 @@ public void testDoesntMap() {
             }]
         }
         """;
-    PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
-    LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
-    MapfishParser.parse(true, requestData, param);
+      PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
+      LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
+      MapfishParser.parse(true, requestData, param);
+    });
   }
 
   enum TestEnum {
diff --git a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
index b45f44641..56a1f2bb2 100644
--- a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 
 public class AbstractProcessorTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
index 4ec29d6f8..a0c67bf5e 100644
--- a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,7 +9,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.PDFConfig;
 import org.mapfish.print.output.Values;
@@ -118,36 +119,40 @@ public void testKeywords() {
     assertEquals("6,7", in.pdfConfig.getKeywordsAsString());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testExec_WrongFieldName() {
-    Map<String, Object> attributeMap = new HashMap<>();
-    final String titleKey = "titleAtt";
-    final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-    in.values = new Values();
-    in.pdfConfig = new PDFConfig();
-
-    attributeMap.put("title", titleKey + ".xxx");
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    in.values.put(titleKey, new CustomTitleAtt());
-    pdfConfigurationProcessor.execute(in, null);
+    assertThrows(IllegalArgumentException.class, () -> {
+      Map<String, Object> attributeMap = new HashMap<>();
+      final String titleKey = "titleAtt";
+      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+      in.values = new Values();
+      in.pdfConfig = new PDFConfig();
+
+      attributeMap.put("title", titleKey + ".xxx");
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      in.values.put(titleKey, new CustomTitleAtt());
+      pdfConfigurationProcessor.execute(in, null);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testExec_NullValue() {
-    Map<String, Object> attributeMap = new HashMap<>();
-    final String titleKey = "titleAtt";
-    final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-    in.values = new Values();
-    in.pdfConfig = new PDFConfig();
-
-    attributeMap.put("title", titleKey + ".value");
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    in.values.put(titleKey, new CustomTitleAtt());
-    pdfConfigurationProcessor.execute(in, null);
+    assertThrows(IllegalArgumentException.class, () -> {
+      Map<String, Object> attributeMap = new HashMap<>();
+      final String titleKey = "titleAtt";
+      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+      in.values = new Values();
+      in.pdfConfig = new PDFConfig();
+
+      attributeMap.put("title", titleKey + ".value");
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      in.values.put(titleKey, new CustomTitleAtt());
+      pdfConfigurationProcessor.execute(in, null);
+    });
   }
 
   private void assertNumErrors(Map<String, Object> attributeMap, int expectedNumErrors) {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
index 91615c418..8f071a583 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.util.ArrayList;
@@ -14,9 +11,9 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
@@ -130,12 +127,12 @@ public TableInput createInputParameter() {
   @Autowired private ProcessorDependencyGraphFactory processorDependencyGraphFactory;
   private ForkJoinPool forkJoinPool;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     forkJoinPool = new ForkJoinPool(1);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     forkJoinPool.shutdownNow();
   }
@@ -153,7 +150,7 @@ public void testSimpleBuild() {
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 5, execution.testOrderExecution.size());
+    assertEquals(5, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
   }
@@ -173,7 +170,7 @@ public void testSimpleBuild_ExternalDependency_NoInput() {
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 5, execution.testOrderExecution.size());
+    assertEquals(5, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
     assertHasOrdering(execution, RootNoOutput, RootMapOut);
@@ -195,7 +192,7 @@ public void testSimpleBuild_ExternalDependency_SameInput() {
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 6, execution.testOrderExecution.size());
+    assertEquals(6, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, StyleNeedsMap, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
   }
@@ -239,7 +236,7 @@ public void testSimpleBuild_ExternalDependency_SameInputWithDifferentName() {
     values.put("map2", "ov-map");
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 9, execution.testOrderExecution.size());
+    assertEquals(9, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
     assertHasOrdering(execution, StyleNeedsMap, NeedsMap);
@@ -291,7 +288,7 @@ public void testSimpleBuild_ExternalDependency_SameInputTwoMaps() {
     values.put("map2", "the 2nd map definition");
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 9, execution.testOrderExecution.size());
+    assertEquals(9, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
     assertHasOrdering(execution, StyleNeedsMap, NeedsMap);
@@ -330,7 +327,7 @@ public void testBuildProcessInputObject() {
         values.getObject(EXECUTION_TRACKER, TestOrderExecution.class);
 
     assertEquals(
-        correctTracker.testOrderExecution.toString(), 5, correctTracker.testOrderExecution.size());
+        5, correctTracker.testOrderExecution.size(), correctTracker.testOrderExecution.toString());
 
     assertHasOrdering(correctTracker, RootMapOut, NeedsMap);
     assertHasOrdering(correctTracker, RootTableAndWidthOut, NeedsTable);
@@ -358,7 +355,7 @@ public void testBuildProcessInputHasValuesAndOtherInput() {
         values.getObject(EXECUTION_TRACKER, TestOrderExecution.class);
 
     assertEquals(
-        correctTracker.testOrderExecution.toString(), 2, correctTracker.testOrderExecution.size());
+        2, correctTracker.testOrderExecution.size(), correctTracker.testOrderExecution.toString());
 
     assertHasOrdering(correctTracker, RootTableAndWidthOut, needsValuesAndMap);
   }
@@ -388,7 +385,7 @@ public void testBuildProcessInputHasValuesAndOtherInput_WithInputMapping() {
         values.getObject(EXECUTION_TRACKER, TestOrderExecution.class);
 
     assertEquals(
-        correctTracker.testOrderExecution.toString(), 2, correctTracker.testOrderExecution.size());
+        2, correctTracker.testOrderExecution.size(), correctTracker.testOrderExecution.toString());
 
     assertHasOrdering(correctTracker, outMapProcessor, needsValuesAndMap);
   }
@@ -397,12 +394,14 @@ public void testBuildProcessInputHasValuesAndOtherInput_WithInputMapping() {
    * This test checks that when there are 2 or more processors that produce the same output there is
    * an exception thrown
    */
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testBuildDependencyAttachesToLastElementProducingTheValue() {
-    final List<TestProcessor<MapInput, Void>> processors =
-        Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final List<TestProcessor<MapInput, Void>> processors =
+          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
 
-    this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+    });
   }
 
   /**
@@ -423,11 +422,13 @@ public void testBuildDebugOutput() {
    * Check that an exception is thrown when one processor provides an output value and another
    * processor expects an input value of the same name, but with a different type.
    */
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testBuildValuesWithSameNameAndDifferentType() {
-    final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
 
-    this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+    });
   }
 
   /**
@@ -449,14 +450,16 @@ public void testBuildWhenOutputsMapToAllOtherInputs() {
    * This test checks that all the outputMapper mappings have an associated property in the output
    * object.
    */
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testExtraOutputMapperMapping() {
-    final List<TestProcessor<MapInput, Void>> processors =
-        Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+    assertThrows(RuntimeException.class, () -> {
+      final List<TestProcessor<MapInput, Void>> processors =
+          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
 
-    ProcessorDependencyGraph graph =
-        this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-    assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
+      ProcessorDependencyGraph graph =
+          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+      assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
+    });
   }
 
   private void assertHasOrdering(TestOrderExecution execution, Processor... processors) {
@@ -478,8 +481,8 @@ private void assertContainsProcessors(
 
     final String comparison = actualProcessorsList + " expected " + Arrays.asList(processors);
 
-    assertEquals(comparison, processors.length, nodes.size());
-    assertTrue(comparison, actualProcessorsList.containsAll(Arrays.asList(processors)));
+    assertEquals(processors.length, nodes.size(), comparison);
+    assertTrue(actualProcessorsList.containsAll(Arrays.asList(processors)), comparison);
   }
 
   private ProcessorGraphNode<?, ?> getNodeForProcessor(
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
index 0f193b054..08ceb8bb2 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
@@ -1,15 +1,13 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.HashMap;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
 
@@ -40,11 +38,11 @@ public void testToString() {
     dep11.addDependency(dep11_2);
     assertEquals("\"?\" -> \"dep11_1\";\n", dep11_1.toString());
     assertTrue(
-        dep11.toString(),
         "\"?\" -> \"dep11\";\n  \"dep11\" -> \"dep11_1\";\n  \"dep11\" -> \"dep11_2\";\n"
                 .equals(dep11.toString())
             || "\"?\" -> \"dep11\";\n  \"dep11\" -> \"dep11_2\";\n  \"dep11\" -> \"dep11_1\";\n"
-                .equals(dep11.toString()));
+                .equals(dep11.toString()),
+        dep11.toString());
     assertEquals("\"?\" -> \"root2\";\n  \"root2\" -> \"dep21\";\n", root2.toString());
   }
 
@@ -71,19 +69,21 @@ public void testCreateTaskAllDependenciesAreSatisfied() {
 
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testCreateTaskAllDependenciesAreMissing() {
-    Values values = new Values();
-    // this is a misconfiguration prop should be pp thus an exception should be thrown below.
-    values.put("prop", "value");
-    values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
-
-    final TestProcessor processor = new TestProcessor("p");
-    processor.getInputMapperBiMap().put("pp", "prop");
-
-    final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
-    graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
-    graph.createTask(values);
+    assertThrows(IllegalArgumentException.class, () -> {
+      Values values = new Values();
+      // this is a misconfiguration prop should be pp thus an exception should be thrown below.
+      values.put("prop", "value");
+      values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
+
+      final TestProcessor processor = new TestProcessor("p");
+      processor.getInputMapperBiMap().put("pp", "prop");
+
+      final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
+      graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
+      graph.createTask(values);
+    });
   }
 
   static class TestIn {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
index 8aa40bc8b..63eb92005 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
@@ -1,14 +1,11 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
 import org.mapfish.print.parser.HasDefaultValue;
@@ -44,20 +41,22 @@ public void testPopulateInputParameter() {
     assertArrayEquals(daVal, param.da, 0.00001);
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testNullableProperty() {
-
-    Values values = new Values();
-    values.put(iMappingName, intVal);
-    values.put(bMappingName, true);
-    values.put("s", sVal);
-    values.put("ls", lsVal);
-    // NO da value is specified so an exception should be thrown.
-
-    TestProcessor processor = new TestProcessor();
-    processor.getInputMapperBiMap().put(iMappingName, "i");
-    processor.getInputMapperBiMap().put(bMappingName, "b");
-    ProcessorUtils.populateInputParameter(processor, values);
+    assertThrows(RuntimeException.class, () -> {
+
+      Values values = new Values();
+      values.put(iMappingName, intVal);
+      values.put(bMappingName, true);
+      values.put("s", sVal);
+      values.put("ls", lsVal);
+      // NO da value is specified so an exception should be thrown.
+
+      TestProcessor processor = new TestProcessor();
+      processor.getInputMapperBiMap().put(iMappingName, "i");
+      processor.getInputMapperBiMap().put(bMappingName, "b");
+      ProcessorUtils.populateInputParameter(processor, values);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java
index 3577caef9..93319e818 100644
--- a/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java
@@ -1,15 +1,14 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.MapAttribute;
@@ -26,7 +25,7 @@
 public class SetStyleProcessorTest extends AbstractMapfishSpringTest {
   public static final String BASE_DIR = "setstyle/";
 
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private ForkJoinPool forkJoinPool;
   @Autowired private TestHttpClientFactory httpClientFactory;
@@ -44,7 +43,7 @@ public void testAssignStyleBasic() throws Exception {
             new HashMap<>(),
             requestData,
             template,
-            this.folder.getRoot(),
+            this.folder,
             this.httpClientFactory,
             new File("."),
             HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
index 340826485..eb60953fc 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.net.URI;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import javax.annotation.Nullable;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
index f5b84224e..a9f6a1b4a 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URI;
 import javax.annotation.Nullable;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
index 3f2b7e71e..208d8db5b 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.net.URI;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
index a0169148d..c83fbc2ad 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.net.URI;
@@ -9,7 +9,7 @@
 import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.HttpRequestHeadersAttribute;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java
index bf681e2c4..64df39f55 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java
@@ -1,14 +1,14 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.NorthArrowAttribute;
 import org.mapfish.print.attribute.map.MapAttribute;
@@ -30,7 +30,7 @@
           + "-context.xml"
     })
 public class MapUriBug228ProcessorTest extends AbstractMapfishSpringTest {
-  @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @TempDir public File temporaryFolder;
   @Autowired ConfigurationFactory configurationFactory;
   @Autowired MfClientHttpRequestFactoryImpl httpClientFactory;
   @Autowired ForkJoinPool forkJoinPool;
@@ -63,7 +63,7 @@ public void bug228FixMapUri() throws Exception {
     values.put(
         Values.CLIENT_HTTP_REQUEST_FACTORY_KEY,
         new MfClientHttpRequestFactoryProvider(requestFactory));
-    values.put(Values.TASK_DIRECTORY_KEY, temporaryFolder.getRoot());
+    values.put(Values.TASK_DIRECTORY_KEY, temporaryFolder);
     values.put(Values.VALUES_KEY, values);
     values.put(Values.TEMPLATE_KEY, template);
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
index c4f1249e5..d66ec6da8 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URI;
 import javax.annotation.Nullable;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
index 41e550edc..815182a5f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
@@ -1,13 +1,14 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.mapfish.print.processor.http.matcher.AcceptAllMatcher;
@@ -21,7 +22,7 @@
 public class RestrictUrisProcessorTest {
   static final TestHttpClientFactory requestFactory = new TestHttpClientFactory();
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     requestFactory.registerHandler(
         input -> true,
@@ -43,13 +44,15 @@ public void testCreateFactoryWrapperLegalRequest() throws Exception {
     factoryWrapper.createRequest(new URI("http://localhost:8080/geoserver/wms"), HttpMethod.GET);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testCreateFactoryWrapperIllegalRequest() throws Exception {
-    final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
-    ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-    final ClientHttpRequestFactory factoryWrapper =
-        restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-    factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
+      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+      final ClientHttpRequestFactory factoryWrapper =
+          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+      factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
+    });
   }
 
   @Test
@@ -61,13 +64,15 @@ public void testRejectWithLegalRequest() throws Exception {
     factoryWrapper.createRequest(new URI("http://localhost/q"), HttpMethod.GET);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testRejectWithIllegalRequest() throws Exception {
-    final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
-    ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-    final ClientHttpRequestFactory factoryWrapper =
-        restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-    factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
+      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+      final ClientHttpRequestFactory factoryWrapper =
+          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+      factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
+    });
   }
 
   private RestrictUrisProcessor createLocalhostOnly() {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
index 936176fbc..dde34ba27 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java
index b6c4cd182..d2316e785 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java
@@ -3,7 +3,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class AcceptAllMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index 523c76e27..7fa82089e 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class AddressHostMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index b6166b52a..ba68c69cc 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class DnsHostMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index bb9cdbe2f..7f1abc87b 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 /** Test for {@link HostnameMatcher} */
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 4980b1789..85ff93117 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.InetAddress;
@@ -10,7 +10,7 @@
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class LocalHostMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java
index 945b3ddd8..a775d222e 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.MalformedURLException;
 import java.net.SocketException;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java
index f0cfb5115..6e62095ec 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.sf.jasperreports.engine.JasperPrint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.DataSourceAttribute;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java
index e47d6b3c4..773cfcfa6 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java
index a8a5eda73..638d5c171 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -15,7 +12,7 @@
 import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java
index 3475206f0..382b4e0db 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -15,7 +15,7 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.Processor;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java
index 2ed0ed686..b780e133d 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -16,7 +14,7 @@
 import net.sf.jasperreports.engine.data.JRTableModelDataSource;
 import net.sf.jasperreports.engine.design.JRDesignField;
 import org.json.simple.JSONArray;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java
index 64d6d6e49..cbdd913dc 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Dimension;
 import java.io.File;
@@ -11,13 +11,12 @@
 import net.sf.jasperreports.engine.design.JRDesignImage;
 import net.sf.jasperreports.engine.design.JasperDesign;
 import net.sf.jasperreports.engine.util.JRLoader;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class MapSubReportTest {
 
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
 
   @Test
   public void testCompile() throws Exception {
@@ -49,10 +48,10 @@ public void testCompile() throws Exception {
     assertEquals(
         "\"" + layer3SVG.getPath().replace('\\', '/') + "\"", image3.getExpression().getText());
 
-    File compiledReportFile = folder.newFile();
+    File compiledReportFile = File.createTempFile("junit", null, folder);
     subReport.compile(compiledReportFile);
 
     JasperReport jasperReport = (JasperReport) JRLoader.loadObject(compiledReportFile);
-    assertEquals("report can be loaded from compiled file", "map", jasperReport.getName());
+    assertEquals("map", jasperReport.getName(), "report can be loaded from compiled file");
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java
index 777fa2207..c91f6d7d0 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.Collections2;
@@ -11,7 +11,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -39,9 +39,9 @@ public void testCreateDependencies() throws Exception {
     final List<ProcessorGraphNode<?, ?>> roots = processorGraph.getRoots();
     assertEquals(0, Collections2.filter(roots, FIND_MERGE_PROCESSOR::test).size());
     assertEquals(
-        processorGraph.toString(),
         3,
-        count(processorGraph.toString(), " -> \"MergeDataSourceProcessor"));
+        count(processorGraph.toString(), " -> \"MergeDataSourceProcessor"),
+        processorGraph.toString());
 
     MergeDataSourceProcessor mergeDataSourceProcessor = null;
     List<ProcessorGraphNode<?, ?>> allNodes = new ArrayList<>();
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java
index e6f2c6844..16fd6b2b5 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.processor.jasper.MergeDataSourceProcessor.In;
 import static org.mapfish.print.processor.jasper.MergeDataSourceProcessor.Out;
 import static org.mapfish.print.processor.jasper.MergeDataSourceProcessor.Source;
@@ -17,7 +15,7 @@
 import java.util.Map;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
 import net.sf.jasperreports.engine.design.JRDesignField;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.output.Values;
 
 public class MergeDataSourceProcessorTest {
@@ -54,7 +52,7 @@ public void testExec() throws Exception {
     List<Throwable> errors = new ArrayList<>();
     processor.validate(errors, null);
 
-    assertEquals(errors.toString(), 0, errors.size());
+    assertEquals(0, errors.size(), errors.toString());
 
     In in = new In();
     in.values = values;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java
index 0caeb99a9..fc1cd5bd3 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java b/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java
index 891fc0205..17aaf3326 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.batik.transcoder.TranscoderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java b/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java
index 959f55448..42b781fb4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.batik.transcoder.TranscoderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
index 261aa4975..1dd7b7743 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
@@ -7,9 +7,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -41,7 +41,7 @@ private static PJsonObject loadJsonRequestData() throws IOException {
 
   private static final AtomicInteger wmsRequestsNb = new AtomicInteger(0);
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final String host = "paging_processor_fail_on_error_test";
     requestFactory.registerHandler(
@@ -89,15 +89,15 @@ private void testPrint(
     try {
       format.getJasperPrint(
           new HashMap<>(), requestData, config, config.getDirectory(), getTaskDirectory());
-      Assert.fail("Generation was not canceled");
+      Assertions.fail("Generation was not canceled");
     } catch (Exception e) {
-      Assert.assertTrue(e instanceof ExecutionException);
+      Assertions.assertTrue(e instanceof ExecutionException);
     } finally {
-      Assert.assertTrue(
+      Assertions.assertTrue(
+          wmsRequestsNb.get() < maxWmsRequestsNumber,
           String.format(
               "Number of WMS requests (%d) during print generation should be less than %d",
-              wmsRequestsNb.get(), maxWmsRequestsNumber),
-          wmsRequestsNb.get() < maxWmsRequestsNumber);
+              wmsRequestsNb.get(), maxWmsRequestsNumber));
     }
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java
index 10e68bccc..a88a00acd 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java
@@ -8,8 +8,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.PrintException;
@@ -105,25 +105,25 @@ private void testPrint(
       format.getJasperPrint(
           new HashMap<>(), requestData, config, config.getDirectory(), getTaskDirectory());
       if (shouldFail) {
-        Assert.fail("Generation was not canceled");
+        Assertions.fail("Generation was not canceled");
       }
     } catch (Exception e) {
       if (!shouldFail) {
-        Assert.fail("Generation was canceled");
+        Assertions.fail("Generation was canceled");
       }
       // WMS interrupt cause is CancellationException or RuntimeException
       // WMTS interrupt cause is PrintException
-      Assert.assertTrue(
-          String.format(
-              "Exception cause should be CancellationException or PrintException with message that"
-                  + " contains 'Failed to compute Coverage Task' or RuntimeException with message"
-                  + " that contains 'Request Timeout' but was %s, exception : %s",
-              e.getCause(), e),
+      Assertions.assertTrue(
           e.getCause() instanceof CancellationException
               || (e.getCause() instanceof PrintException
                   && e.getMessage().contains("Failed to compute Coverage Task"))
               || (e.getCause() instanceof RuntimeException
-                  && e.getMessage().contains("Request Timeout")));
+                  && e.getMessage().contains("Request Timeout")),
+          String.format(
+              "Exception cause should be CancellationException or PrintException with message that"
+                  + " contains 'Failed to compute Coverage Task' or RuntimeException with message"
+                  + " that contains 'Request Timeout' but was %s, exception : %s",
+              e.getCause(), e));
     }
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java
index fbcd1645b..bae912300 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -11,8 +11,8 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -41,7 +41,7 @@ private static PJsonObject loadJsonRequestData() throws IOException {
         CreateMapPagesProcessorTest.class, BASE_DIR + "requestData.json");
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final String host = "paging_processor_test";
     requestFactory.registerHandler(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java
index 5b4b1f5cc..6b721b030 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.io.Files;
 import java.awt.image.BufferedImage;
@@ -9,8 +9,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import net.sf.jasperreports.engine.JasperPrint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -32,7 +32,7 @@ public class CreateMapPagesProcessorZoomToFeatureTest extends AbstractMapfishSpr
   @Autowired private TestHttpClientFactory requestFactory;
   @Autowired private Map<String, OutputFormat> outputFormat;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     final String host = "paging_processor_zoom_to_features_test";
     requestFactory.registerHandler(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java
index 1c2da1efc..e78229c98 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
index 95700edd3..560d38af6 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.CLIP;
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.RENDER;
 
@@ -20,7 +20,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.AreaOfInterest;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java
index 2fe29bb93..7dfe0fc02 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java
index 48e00915c..835bfc473 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java
index 301af9050..cf843fbc1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java
index 26777f6b6..0aed0d78c 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java
index c860f55b8..7315519d6 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java
index 81de5ee3d..887842d3a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java
index 38e9f5f54..7d40ad0aa 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java
index 9139b7b2c..cb21aac60 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -10,7 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java
index c122d0cd3..1e095489b 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 
 import java.io.File;
@@ -13,7 +13,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.MapfishMapContext;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java
index 641618343..2ab7c2a99 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java
index 50aca629f..21a02bc33 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java
index 3c2be4152..7afc9c8be 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java
index 306eda0a4..77f5f7ad8 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java
index fef19fac6..692f166bc 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java
index 1e3dfad04..10d764441 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java
index cd5f50080..851a182c7 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java
index 2d46654d2..d7a7f546a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.MapfishMapContext;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java
index 086386e2d..b7f1bdbe8 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java
index f16ed92d4..7f621790a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java
index 1503e46f6..f8f3200fb 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java
index 99d4dc528..fbdb4e513 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java
index 92e6605dd..00be2257f 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java
index bf815558b..c3a63226d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java
index ad6b73abf..be4e5a633 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -14,7 +14,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -60,28 +60,28 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1", uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("MERGEABLEP1 != 3", uppercaseParams.containsEntry("MERGEABLEP1", "3"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1");
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsEntry("MERGEABLEP1", "3"), "MERGEABLEP1 != 3");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
 
               return "/map-data/tiger-ny.png";
             }));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java
index 2ffb7e323..b7b28d88d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -14,7 +14,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -61,28 +61,28 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1", uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("MERGEABLEP1 != 3", uppercaseParams.containsEntry("MERGEABLEP1", "3"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1");
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsEntry("MERGEABLEP1", "3"), "MERGEABLEP1 != 3");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
 
               return "/map-data/tiger-ny.png";
             }));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java
index 206f3d659..1dbfd564c 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -14,7 +14,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -62,28 +62,28 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1", uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("MERGEABLEP1 != 3", uppercaseParams.containsEntry("MERGEABLEP1", "3"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1");
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsEntry("MERGEABLEP1", "3"), "MERGEABLEP1 != 3");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
 
               return "/map-data/tiger-ny.png";
             }));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java
index 509f225ab..de73cf71a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java
index 3803c0a43..660b24b2c 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java
index 1184499e1..3db74b16f 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java
index 585abe325..3d8aaf29e 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java
index 4a9725f51..da47a26ba 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,7 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java
index 58649f6ff..cb011a7b8 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -14,7 +14,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.imageio.ImageIO;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java
index f9fbbafe3..494140721 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java
index 6676cd815..b13fe6c4a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.awt.image.BufferedImage;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java
index 81b9adb48..9588b44f4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java
index 403644489..1cf5633f1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -13,7 +13,7 @@
 import java.util.Map;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -57,27 +57,27 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/PNG: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/PNG: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != GETMAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "GETMAP"));
+                  uppercaseParams.containsEntry("REQUEST", "GETMAP"),
+                  "REQUEST != GETMAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.3.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.3.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.3.0"),
+                  "VERSION != 1.3.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TOPP:STATES: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TOPP:STATES"));
-              assertTrue("ANGLE != 90", uppercaseParams.containsEntry("ANGLE", "90.0"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
+                  uppercaseParams.containsEntry("LAYERS", "TOPP:STATES"),
+                  "LAYERS != TOPP:STATES: " + uppercaseParams.get("LAYERS"));
+              assertTrue(uppercaseParams.containsEntry("ANGLE", "90.0"), "ANGLE != 90");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
               assertTrue(
-                  "mapSize is not rotated (width)", uppercaseParams.containsEntry("WIDTH", "780"));
+                  uppercaseParams.containsEntry("WIDTH", "780"), "mapSize is not rotated (width)");
               assertTrue(
-                  "mapSize is not rotated (height)",
-                  uppercaseParams.containsEntry("HEIGHT", "330"));
+                  uppercaseParams.containsEntry("HEIGHT", "330"),
+                  "mapSize is not rotated (height)");
               return "/map-data/states-native-rotation.png";
             }));
     final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java
index aa1cefd3f..0c888545d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java
index 7ef69bd42..84811362a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java
@@ -6,7 +6,7 @@
 import java.util.HashMap;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java
index 39cca6d64..d5b3a7bb1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java
index 88a0e24cd..75af87266 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java
index a7eb75cd1..c9f47cdd4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java
index 65538196a..d33898f56 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java
index fcc8bfa96..35ae0f17d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java
index 9a4de0112..f2c1698c7 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java b/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java
index 5158b8eb2..e3c9cbe14 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java
@@ -2,9 +2,7 @@
 
 import static java.lang.Math.PI;
 import static org.geotools.referencing.crs.DefaultGeographicCRS.WGS84;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.Constants.PDF_DPI;
 
 import java.awt.Dimension;
@@ -16,7 +14,7 @@
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.map.BBoxMapBounds;
 import org.mapfish.print.attribute.map.CenterScaleMapBounds;
 import org.mapfish.print.attribute.map.MapAttribute;
@@ -50,7 +48,7 @@ private void assertRoundedScale(double actualScaleDenominator, double roundedSca
   @Test
   public void testGetRotation() {
     MapfishMapContext transformer = new MapfishMapContext(null, null, PI / 2, PDF_DPI, null, true);
-    assertEquals("converted to radians", PI / 2, transformer.getRotation(), 1e-9);
+    assertEquals(PI / 2, transformer.getRotation(), 1e-9, "converted to radians");
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java b/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java
index 47758b48b..10a6d0c10 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -27,7 +27,7 @@ public class NorthArrowGraphicTest extends AbstractMapfishSpringTest {
 
   private Color bgColor;
 
-  @Before
+  @BeforeEach
   public void setUp() throws IOException {
     Configuration config = this.configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
     this.requestFactoryWrapper =
diff --git a/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java
index 5f7ab78db..3bb49168d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java
index 63b0956f1..75d3fbd32 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SetTiledWmsProcessorTest {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java
index 50aab6241..39381e48b 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -13,7 +13,7 @@
 import java.util.Map;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -60,27 +60,27 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1: " + uri, uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1: " + uri);
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
               return "/map-data/tiger-ny.png";
             }));
     requestFactory.registerHandler(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java b/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java
index 9c1b93bc9..a0e5c20f6 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.processor.map.scalebar;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -12,7 +10,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java
index 652e89d63..732af64c1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map.scalebar;
 
 import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.awt.Dimension;
 import java.awt.Font;
@@ -12,7 +12,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.ScalebarAttribute;
 import org.mapfish.print.attribute.ScalebarAttribute.ScalebarAttributeValues;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java
index 39057c8df..3062f31a4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java
@@ -1,15 +1,14 @@
 package org.mapfish.print.processor.map.scalebar;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Dimension;
 import java.io.File;
 import java.net.URI;
 import org.geotools.referencing.CRS;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.ScalebarAttribute;
 import org.mapfish.print.attribute.ScalebarAttribute.ScalebarAttributeValues;
@@ -25,10 +24,10 @@ public class ScalebarGraphicTest {
 
   private final double TOLERANCE = 0.000000001;
 
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
   private Template template;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     Configuration configuration = new Configuration();
     this.template = new Template();
@@ -126,7 +125,7 @@ public void testRender() throws Exception {
     scalebarParams.renderAsSvg = false;
 
     ScalebarGraphic scalebar = new ScalebarGraphic();
-    URI file = scalebar.render(mapParams, scalebarParams, folder.getRoot(), this.template);
+    URI file = scalebar.render(mapParams, scalebarParams, folder, this.template);
     new ImageSimilarity(getFile("expected-scalebar-graphic.png"))
         .assertSimilarity(new File(file), 0);
   }
@@ -146,7 +145,7 @@ public void testRenderDoubleDpi() throws Exception {
     scalebarParams.renderAsSvg = false;
 
     ScalebarGraphic scalebar = new ScalebarGraphic();
-    URI file = scalebar.render(mapParams, scalebarParams, folder.getRoot(), this.template);
+    URI file = scalebar.render(mapParams, scalebarParams, folder, this.template);
     new ImageSimilarity(getFile("expected-scalebar-graphic-dpi.png"))
         .assertSimilarity(new File(file), 0);
   }
@@ -167,7 +166,7 @@ public void testRenderSvg() throws Exception {
     scalebarParams.font = "Liberation Sans";
 
     ScalebarGraphic scalebar = new ScalebarGraphic();
-    URI file = scalebar.render(mapParams, scalebarParams, folder.getRoot(), this.template);
+    URI file = scalebar.render(mapParams, scalebarParams, folder, this.template);
     new ImageSimilarity(getFile("expected-scalebar-graphic-svg.png"))
         .assertSimilarity(file, 300, 40, 0);
   }
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
index c6d76b837..2687eeab3 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
@@ -1,17 +1,17 @@
 package org.mapfish.print.servlet;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.access.AccessAssertionTestUtil;
 import org.mapfish.print.test.util.ImageSimilarity;
@@ -34,12 +34,13 @@ public class MapPrinterServletSecurityTest extends AbstractMapfishSpringTest {
   @Autowired private MapPrinterServlet servlet;
   @Autowired private ServletMapPrinterFactory printerFactory;
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_Success() throws Exception {
     AccessAssertionTestUtil.setCreds("ROLE_USER", "ROLE_EDITOR");
     setUpConfigFiles();
@@ -56,34 +57,41 @@ public void testCreateReportAndGet_Success() throws Exception {
     assertCorrectResponse(servletCreateResponse);
   }
 
-  @Test(timeout = 60000, expected = AccessDeniedException.class)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_InsufficientPrivileges() throws Exception {
-    AccessAssertionTestUtil.setCreds("ROLE_USER");
-    setUpConfigFiles();
+    assertThrows(AccessDeniedException.class, () -> {
+      AccessAssertionTestUtil.setCreds("ROLE_USER");
+      setUpConfigFiles();
 
-    final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-    final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-    String requestData = loadRequestDataAsString();
+      String requestData = loadRequestDataAsString();
 
-    this.servlet.createReportAndGetNoAppId(
-        "png", requestData, false, servletCreateRequest, servletCreateResponse);
+      this.servlet.createReportAndGetNoAppId(
+          "png", requestData, false, servletCreateRequest, servletCreateResponse);
+    });
   }
 
-  @Test(timeout = 60000, expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_NoCredentials() throws Exception {
-    setUpConfigFiles();
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      setUpConfigFiles();
 
-    final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-    final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-    String requestData = loadRequestDataAsString();
+      String requestData = loadRequestDataAsString();
 
-    this.servlet.createReportAndGetNoAppId(
-        "png", requestData, false, servletCreateRequest, servletCreateResponse);
+      this.servlet.createReportAndGetNoAppId(
+          "png", requestData, false, servletCreateRequest, servletCreateResponse);
+    });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_RequestAllowed_OtherGetDenied() throws Exception {
     AccessAssertionTestUtil.setCreds("ROLE_USER", "ROLE_EDITOR");
     setUpConfigFiles();
@@ -110,7 +118,7 @@ public void testCreateReportAndGet_RequestAllowed_OtherGetDenied() throws Except
       String contentAsString = servletStatusResponse.getContentAsString();
 
       final PJsonObject statusJson = parseJSONObjectFromString(contentAsString);
-      assertTrue(statusJson.toString(), statusJson.has(MapPrinterServlet.JSON_DONE));
+      assertTrue(statusJson.has(MapPrinterServlet.JSON_DONE), statusJson.toString());
 
       done = statusJson.getBool(MapPrinterServlet.JSON_DONE);
       if (!done) {
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
index 6dc7261e6..4379f61d4 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
@@ -1,11 +1,6 @@
 package org.mapfish.print.servlet;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.servlet.ServletMapPrinterFactory.DEFAULT_CONFIGURATION_FILE_KEY;
 
 import de.saly.javamail.mock2.MailboxFolder;
@@ -19,6 +14,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import javax.mail.Address;
@@ -32,7 +28,8 @@
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.SetsUtils;
@@ -120,7 +117,8 @@ public void testExampleRequest_referrerNOK() throws Exception {
     assertEquals(HttpStatus.FORBIDDEN.value(), getExampleResponseImplicit.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_NoAppId() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -135,7 +133,8 @@ public void testCreateReport_Success_NoAppId() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_EncodedSpec() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -151,7 +150,8 @@ public void testCreateReport_Success_EncodedSpec() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_FormPostEncodedSpec() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -167,7 +167,8 @@ public void testCreateReport_Success_FormPostEncodedSpec() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_explicitAppId() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -187,7 +188,8 @@ public void testCreateReport_Success_explicitAppId() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_FormPosting() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -202,7 +204,8 @@ public void testCreateReport_FormPosting() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_2Requests_Success_NoAppId() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -222,7 +225,8 @@ public void testCreateReport_2Requests_Success_NoAppId() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_ForwardHttpRequests() throws Exception {
     final String geotiffURL = "http://server.com/sampleGeoTiff.tif";
@@ -277,7 +281,8 @@ public MockClientHttpRequest handleRequest(URI uri, HttpMethod httpMethod) {
         new Object[] {"default"}, request.getHeaders().get("X-Application-ID").toArray());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Email() throws Exception {
     setUpConfigFiles();
     MockMailbox.resetAll();
@@ -322,7 +327,8 @@ public void testCreateReport_Email() throws Exception {
         .assertSimilarity(IOUtils.toByteArray(content), 0);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Email_S3() throws Exception {
     setUpConfigFiles();
     MockMailbox.resetAll();
@@ -409,7 +415,7 @@ private String doCreateAndPollAndGetReport(
       String contentAsString = servletStatusResponse.getContentAsString();
 
       final PJsonObject statusJson = parseJSONObjectFromString(contentAsString);
-      assertTrue(statusJson.toString(), statusJson.has(MapPrinterServlet.JSON_DONE));
+      assertTrue(statusJson.has(MapPrinterServlet.JSON_DONE), statusJson.toString());
 
       downloadURL = createResponseJson.getString(MapPrinterServlet.JSON_DOWNLOAD_LINK);
       assertEquals("/print/report/" + ref, downloadURL);
@@ -421,13 +427,13 @@ private String doCreateAndPollAndGetReport(
 
       timeElapsed = statusJson.getInt(MapPrinterServlet.JSON_ELAPSED_TIME);
       assertTrue(
+          lastTimeElapsed
+              <= timeElapsed
+                  + allowDeltaBetweenCompletedJobStatusRegisteredStatsAndInstantaneousElapsedTime,
           "lastTimeElapsed: "
               + lastTimeElapsed
               + " is not less or equal to timeElapsed: "
-              + timeElapsed,
-          lastTimeElapsed
-              <= timeElapsed
-                  + allowDeltaBetweenCompletedJobStatusRegisteredStatsAndInstantaneousElapsedTime);
+              + timeElapsed);
 
       lastTimeElapsed = timeElapsed;
 
@@ -451,7 +457,8 @@ private void addHeaders(MockHttpServletRequest servletStatusRequest) {
     servletStatusRequest.addHeader("Referrer", "http://localhost:8080/print/");
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Failure() throws Exception {
     setUpConfigFiles();
 
@@ -476,7 +483,8 @@ public void testCreateReport_Failure() throws Exception {
     waitForFailure(ref);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_FailureInvalidUrl() throws Exception {
     setUpConfigFiles();
 
@@ -530,7 +538,8 @@ private void waitForFailure(String ref)
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel() throws Exception {
     setUpConfigFiles();
 
@@ -561,7 +570,8 @@ public void testCancel() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel_Sleep() throws Exception {
     setUpConfigFiles();
 
@@ -595,7 +605,8 @@ public void testCancel_Sleep() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel_FinishedJob() throws Exception {
     // start a job and wait until it is finished
     String ref =
@@ -628,7 +639,8 @@ public void testCancel_FinishedJob() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel_WrongRef() throws Exception {
     setUpConfigFiles();
 
@@ -637,7 +649,8 @@ public void testCancel_WrongRef() throws Exception {
     assertEquals(HttpStatus.NOT_FOUND.value(), servletCancelResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancelSpecificAppId() throws Exception {
     setUpConfigFiles();
 
@@ -668,7 +681,8 @@ public void testCancelSpecificAppId() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_Timeout() throws Exception {
     jobManager.setTimeout(1);
@@ -698,7 +712,8 @@ public void testCreateReport_Timeout() throws Exception {
     testCreateReport_Success_explicitAppId();
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_AbandonedTimeout() throws Exception {
     jobManager.setAbandonedTimeout(1);
@@ -735,7 +750,8 @@ public void testCreateReport_AbandonedTimeout() throws Exception {
    * Check that a job is not canceled, when status requests are made. Test case for:
    * https://github.com/mapfish/mapfish-print/issues/404
    */
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_NotAbandonedTimeout() throws Exception {
     jobManager.setAbandonedTimeout(1);
@@ -806,7 +822,8 @@ private void waitForNotCanceled(String ref)
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Failure_InvalidFormat() throws Exception {
     setUpConfigFiles();
 
@@ -828,7 +845,8 @@ public void testCreateReport_Failure_InvalidFormat() throws Exception {
     waitForFailure(ref);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_Success() throws Exception {
     setUpConfigFiles();
 
@@ -844,7 +862,8 @@ public void testCreateReportAndGet_Success() throws Exception {
     assertCorrectResponse(servletCreateResponse);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_OutputName() throws Exception {
     setUpConfigFiles();
 
@@ -882,7 +901,8 @@ private String getFormEncodedRequestData() throws IOException {
     return "spec=" + URLEncoder.encode(loadRequestDataAsString(), Constants.DEFAULT_ENCODING);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReportAndGet_Timeout() throws Exception {
     jobManager.setTimeout(1);
@@ -898,7 +918,8 @@ public void testCreateReportAndGet_Timeout() throws Exception {
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), servletCreateResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_Failure() throws Exception {
     setUpConfigFiles();
 
@@ -915,7 +936,8 @@ public void testCreateReportAndGet_Failure() throws Exception {
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), servletCreateResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_FormPost() throws Exception {
     setUpConfigFiles();
 
@@ -941,7 +963,8 @@ private void assertArrayContains(PJsonArray formats, String format) {
     throw new AssertionError(format + " does is not one of the elements in: " + formats);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testGetStatus_InvalidRef() throws Exception {
     setUpConfigFiles();
 
@@ -954,7 +977,8 @@ public void testGetStatus_InvalidRef() throws Exception {
     assertEquals(HttpStatus.NOT_FOUND.value(), servletStatusResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testGetReport_InvalidRef() throws Exception {
     setUpConfigFiles();
 
@@ -1092,7 +1116,8 @@ public void testListAppIds() throws Exception {
     assertTrue(expected.contains(appIdsJson.getString(1)));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_ExceedsMaxNumberOfWaitingJobs() throws Exception {
     jobManager.setMaxNumberOfWaitingJobs(2);
@@ -1117,7 +1142,8 @@ public void testCreateReport_ExceedsMaxNumberOfWaitingJobs() throws Exception {
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), servletCreateResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testGetStatus_WaitingRunning() throws Exception {
     jobManager.setMaxNumberOfRunningPrintJobs(1);
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java
index 06d25179d..c86b14b7d 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java
@@ -1,17 +1,14 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URI;
 import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.config.Configuration;
@@ -23,7 +20,7 @@ public abstract class AbstractConfigLoaderTest extends AbstractMapfishSpringTest
 
   @Autowired protected WorkingDirectories workingDirectories;
 
-  @After
+  @AfterEach
   public void tearDown() {
     final File[] children = this.workingDirectories.getWorking().listFiles();
     assertNotNull(children);
@@ -70,15 +67,15 @@ protected void assertAccessible(File baseWorkingDir) throws IOException {
       testFile.getParentFile().mkdirs();
       new FileOutputStream(testFile).close();
       assertTrue(
-          testFile.getAbsolutePath() + " is not accessible",
-          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.getAbsolutePath()));
+          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.getAbsolutePath()),
+          testFile.getAbsolutePath() + " is not accessible");
       assertTrue(
-          testFile.getAbsoluteFile().toURI().toString() + " is not accessible",
           getLoader()
-              .isAccessible(CONFIG_FILE.toURI(), testFile.getAbsoluteFile().toURI().toString()));
+              .isAccessible(CONFIG_FILE.toURI(), testFile.getAbsoluteFile().toURI().toString()),
+          testFile.getAbsoluteFile().toURI().toString() + " is not accessible");
       assertTrue(
-          testFile.toURI().toString() + " is not accessible",
-          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.toURI().toString()));
+          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.toURI().toString()),
+          testFile.toURI().toString() + " is not accessible");
     } finally {
       testFile.delete();
     }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
index 23292f9a1..70d3c2da2 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
@@ -1,16 +1,13 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -101,47 +98,57 @@ public void testLoadFileChildResource() throws Exception {
             configFileUri, "classpath://org/mapfish/print/servlet/fileloader/" + resourceFileName));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
 
-    this.loader.loadFile(
-        configFileUri, "classpath://test-http-request-factory-application-context.xml");
+      this.loader.loadFile(
+          configFileUri, "classpath://test-http-request-factory-application-context.xml");
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testLoadFileChildResource_NotClasspathURI() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
-    final String resourceFileName = "resourceFile.txt";
+    assertThrows(IllegalArgumentException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
+      final String resourceFileName = "resourceFile.txt";
 
-    final String uri = getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
-    this.loader.loadFile(configFileUri, uri);
+      final String uri = getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
+      this.loader.loadFile(configFileUri, uri);
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
-    final String resourceFileName = "resourceFile.txt";
-
-    final File file =
-        new File(
-            getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(), "doesNotExist");
-    this.loader.loadFile(configFileUri, file.getPath());
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
+      final String resourceFileName = "resourceFile.txt";
+
+      final File file =
+          new File(
+              getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(), "doesNotExist");
+      this.loader.loadFile(configFileUri, file.getPath());
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist2() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
 
-    this.loader.loadFile(configFileUri, "doesNotExist");
+      this.loader.loadFile(configFileUri, "doesNotExist");
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_ConfigFileDoesNotExist() throws Exception {
-    final URI configFileUri = new URI("classpath://xyz.yaml");
-    final String resourceFileName = "resourceFile.txt";
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI("classpath://xyz.yaml");
+      final String resourceFileName = "resourceFile.txt";
 
-    this.loader.loadFile(
-        configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
+      this.loader.loadFile(
+          configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
index 6f2806e59..d71772b31 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
@@ -1,15 +1,12 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.IllegalFileAccessException;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -39,7 +36,7 @@ public void testLastModified() {
 
   @Test
   public void testAccessible() throws Exception {
-    assertTrue(CONFIG_FILE.toURI().toString(), loader.isAccessible(CONFIG_FILE.toURI()));
+    assertTrue(loader.isAccessible(CONFIG_FILE.toURI()), CONFIG_FILE.toURI().toString());
     assertFalse(loader.isAccessible(new URI(CONFIG_FILE.toURI() + "xzy")));
   }
 
@@ -55,14 +52,16 @@ public void testLoadFile() throws Exception {
     assertArrayEquals(Files.readAllBytes(CONFIG_FILE.toPath()), loaded);
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileMissingFile() throws Exception {
-    this.loader.loadFile(new URI("file:/c:/doesnotexist"));
+    assertThrows(NoSuchElementException.class, () ->
+      this.loader.loadFile(new URI("file:/c:/doesnotexist")));
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLastModifiedMissingFile() throws Exception {
-    this.loader.lastModified(new URI("file:/c:/doesnotexist"));
+    assertThrows(NoSuchElementException.class, () ->
+      this.loader.lastModified(new URI("file:/c:/doesnotexist")));
   }
 
   @Test
@@ -112,20 +111,24 @@ public void testLoadFileChildResource() throws Exception {
             configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).getPath()));
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    final URI configFileUri = CONFIG_FILE.toURI();
-
-    this.loader.loadFile(
-        configFileUri,
-        getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-            .getAbsolutePath());
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI configFileUri = CONFIG_FILE.toURI();
+
+      this.loader.loadFile(
+          configFileUri,
+          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
+              .getAbsolutePath());
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    final URI configFileUri = CONFIG_FILE.toURI();
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = CONFIG_FILE.toURI();
 
-    this.loader.loadFile(configFileUri, "doesNotExist");
+      this.loader.loadFile(configFileUri, "doesNotExist");
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
index 69a4186e3..689c63f58 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
@@ -1,16 +1,13 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.servlet.MapPrinterServletTest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,28 +109,34 @@ public void testLoadFileChildResource() throws Exception {
             configFileUri, "servlet:///org/mapfish/print/servlet/fileloader/" + resourceFileName));
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
-
-    this.loader.loadFile(
-        configFileUri,
-        getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-            .getAbsolutePath());
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+
+      this.loader.loadFile(
+          configFileUri,
+          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
+              .getAbsolutePath());
+    });
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir_ServletURI() throws Exception {
-    final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
 
-    this.loader.loadFile(
-        configFileUri, "servlet:///test-http-request-factory-application-context.xml");
+      this.loader.loadFile(
+          configFileUri, "servlet:///test-http-request-factory-application-context.xml");
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
 
-    this.loader.loadFile(configFileUri, "doesNotExist");
+      this.loader.loadFile(configFileUri, "doesNotExist");
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
index 0300254bb..efc96be3e 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
@@ -1,11 +1,13 @@
 package org.mapfish.print.servlet.job;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.access.AlwaysAllowAssertion;
@@ -30,14 +32,15 @@ public class ClusteringTaskTest extends AbstractMapfishSpringTest {
   TestJobManager jobMan2;
   @Autowired private ApplicationContext context;
 
-  @Before
+  @BeforeEach
   public void setup() {
     context.getBean(ThreadPoolJobManager.class).shutdown();
     jobMan1 = new TestJobManager("uno");
     jobMan2 = new TestJobManager("duo");
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testRun() throws Exception {
     LOGGER.error("Starting jobs");
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
index 1b9c95393..c6cde2bad 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.servlet.job;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java b/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java
index 6024a9ea9..2a681c0d0 100644
--- a/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet.registry;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java b/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java
index bb62a7616..5376fb5a7 100644
--- a/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java
+++ b/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.test.util;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.imageio.ImageIO;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 
 public class ImageSimilarityTest extends AbstractMapfishSpringTest {
@@ -13,7 +13,7 @@ public class ImageSimilarityTest extends AbstractMapfishSpringTest {
   @Test
   public void testNotRegenerateImage() {
     assertFalse(
-        "This flag should not be committed as true", ImageSimilarity.REGENERATE_EXPECTED_IMAGES);
+        ImageSimilarity.REGENERATE_EXPECTED_IMAGES, "This flag should not be committed as true");
   }
 
   /** Test that we get a distance in images with small differences. */
diff --git a/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java b/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java
index 6f9076695..cbba7f190 100644
--- a/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java
+++ b/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.url.data;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDataUrlConnection {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/url/data/TestHandler.java b/core/src/test/java/org/mapfish/print/url/data/TestHandler.java
index 69c0fe027..111368520 100644
--- a/core/src/test/java/org/mapfish/print/url/data/TestHandler.java
+++ b/core/src/test/java/org/mapfish/print/url/data/TestHandler.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.url.data;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -9,7 +9,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestHandler {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java
index 216a7936e..51b164ba0 100644
--- a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java
+++ b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.wrapper.yaml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -10,7 +8,7 @@
 import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.wrapper.json.PJsonArray;
 
 public class PYamlArrayTest {
diff --git a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java
index 54ec6642a..7feba18a1 100644
--- a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java
+++ b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.wrapper.yaml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.wrapper.json.PJsonArray;
 import org.mapfish.print.wrapper.json.PJsonObject;
 
diff --git a/core/src/test/resources/mapfish-spring-hibernate.xml b/core/src/test/resources/mapfish-spring-hibernate.xml
index 860b7149e..e1b82d348 100644
--- a/core/src/test/resources/mapfish-spring-hibernate.xml
+++ b/core/src/test/resources/mapfish-spring-hibernate.xml
@@ -6,7 +6,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-    <bean id="mfSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+    <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
         <property name="annotatedClasses">
             <list>
@@ -28,7 +28,7 @@
         </property>
     </bean>
 
-    <bean id="transactionManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+    <bean id="transactionManager" class="org.springframework.orm.jpa.hibernate.HibernateTransactionManager">
         <property name="sessionFactory" ref="mfSessionFactory"/>
     </bean>
     <tx:annotation-driven transaction-manager="transactionManager"/>
diff --git a/docs/build.gradle b/docs/build.gradle
index 9d1620c55..18632a540 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -71,3 +71,6 @@ tasks.register('buildDocs', JavaExec) {
 build {
     dependsOn buildDocs
 }
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}
diff --git a/examples/build.gradle b/examples/build.gradle
index 5eb716a0d..d2817ea62 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -42,7 +42,9 @@ tasks.register('geoserver' , Exec) {
 // prevent that the tests target can be directly called. the integration tests
 // must be run with `./gradlew examples:geoserver` to make sure the
 // server is running
-test {}
+test {
+    useJUnitPlatform()
+}
 test.onlyIf { false }
 
 tasks.register('integrationTest', Test) {
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index a27dc7f5b..6813e3aa1 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -29,9 +29,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.BeforeClass;
-import org.junit.Test;
 import org.junit.internal.TextListener;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunListener;
@@ -109,7 +109,7 @@ public class ExamplesTest {
 
   @Autowired MapPrinter mapPrinter;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     final LoggerContext loggerContext = getLoggerContext();
     statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
@@ -195,12 +195,12 @@ public void testExampleDirectoryNames() {
     }
 
     assertEquals(
+        0,
+        errors.length(),
         String.format(
             "All example directory names must match the pattern: '%s'.  "
                 + "The following fail that test: %s",
-            namePattern, errors),
-        0,
-        errors.length());
+            namePattern, errors));
   }
 
   @Test
diff --git a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
index cce7d5d2c..a0ee14f16 100644
--- a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
@@ -1,14 +1,11 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/examples/src/test/java/org/mapfish/print/PrintApiTest.java b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
index cca5c7621..f3ddabd24 100644
--- a/examples/src/test/java/org/mapfish/print/PrintApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -11,11 +8,13 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.servlet.MapPrinterServlet;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -206,13 +205,15 @@ public void testCreateReport_RequestTooLarge() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_App() throws Exception {
     final String printSpec = getPrintSpec("examples/geoext/requestData.json");
     testCreateReport("geoext" + MapPrinterServlet.REPORT_URL + ".pdf", printSpec);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_NoApp() throws Exception {
     final String printSpec = getDefaultAppDefaultRequestSample();
     testCreateReport(MapPrinterServlet.REPORT_URL + ".pdf", printSpec);
@@ -308,7 +309,8 @@ private void testCreateReport(String requestPath, String printSpec) throws Excep
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_InvalidFormat() throws Exception {
     ClientHttpRequest request =
         getPrintRequest("geoext" + MapPrinterServlet.REPORT_URL + ".docx", HttpMethod.POST);
@@ -338,7 +340,8 @@ public void testCreateReport_InvalidFormat() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_App_PNG() throws Exception {
     ClientHttpRequest request =
         getPrintRequest("geoext" + MapPrinterServlet.REPORT_URL + ".png", HttpMethod.POST);
@@ -364,7 +367,8 @@ public void testCreateReport_Success_App_PNG() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateAndGetReport_Success_App() throws Exception {
     ClientHttpRequest request =
         getPrintRequest("geoext" + MapPrinterServlet.CREATE_AND_GET_URL + ".pdf", HttpMethod.POST);
@@ -500,7 +504,7 @@ public void testCors() throws Exception {
     ClientHttpRequest request = getPrintRequest(MapPrinterServlet.LIST_APPS_URL, HttpMethod.GET);
     try (ClientHttpResponse response = request.execute()) {
       assertEquals(HttpStatus.OK, response.getStatusCode());
-      assertFalse(response.getHeaders().containsKey("Access-Control-Allow-Origin"));
+      assertFalse(response.getHeaders().containsHeader("Access-Control-Allow-Origin"));
     }
 
     request = getPrintRequest(MapPrinterServlet.LIST_APPS_URL, HttpMethod.GET);
@@ -517,8 +521,8 @@ public void testCors() throws Exception {
     try (ClientHttpResponse response = request.execute()) {
       assertEquals(HttpStatus.OK, response.getStatusCode());
       assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
-      assertTrue(response.getHeaders().containsKey("Access-Control-Max-Age"));
-      assertTrue(response.getHeaders().containsKey("Access-Control-Allow-Methods"));
+      assertTrue(response.getHeaders().containsHeader("Access-Control-Max-Age"));
+      assertTrue(response.getHeaders().containsHeader("Access-Control-Allow-Methods"));
       assertEquals("X-Toto", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
     }
   }
@@ -536,7 +540,7 @@ private JSONArray execCapabilitiesRequestWithAut(int expectedNumberOfLayouts, St
       String responseAsText = getBodyAsText(response);
       JSONObject infoResult = new JSONObject(responseAsText);
       final JSONArray layouts = infoResult.getJSONArray("layouts");
-      assertEquals("In " + responseAsText, expectedNumberOfLayouts, layouts.length());
+      assertEquals(expectedNumberOfLayouts, layouts.length(), "In " + responseAsText);
       return layouts;
     }
   }
@@ -550,7 +554,7 @@ private void execCreateRequestWithAuth(
     setPrintSpec(printSpec, request);
     addAuthHeader(request, credentials);
     try (ClientHttpResponse response = request.execute()) {
-      assertEquals(response.getStatusText(), expectedStatus, response.getStatusCode());
+      assertEquals(expectedStatus, response.getStatusCode(), response.getStatusText());
     }
   }
 
diff --git a/gradle.properties b/gradle.properties
index b0c02d5b1..ae88ddde6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,3 +2,4 @@ enablePublishing=false
 group=org.mapfish.print
 version=1.0.0
 org.gradle.caching=true
+org.gradle.jvmargs=-Xmx6G -Xms4G

From b4b567cead673e3aa4eb7f208d11292f85a4f842 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 18:00:33 +0100
Subject: [PATCH 07/61] Fixed SingleTileLoaderTaskTest

---
 build.gradle                                  | 11 -----
 core/build.gradle                             |  1 +
 .../java/org/mapfish/print/ImageInit.java     |  2 +-
 .../java/org/mapfish/print/MapPrinter.java    |  2 +-
 .../java/org/mapfish/print/VersionInfo.java   |  4 +-
 .../mapfish/print/attribute/Attribute.java    |  2 +-
 .../print/attribute/DataSourceAttribute.java  |  4 +-
 .../attribute/JsonDatasourceAttribute.java    |  2 +-
 .../print/attribute/PrimitiveAttribute.java   |  2 +-
 .../print/attribute/ReflectiveAttribute.java  |  4 +-
 .../print/attribute/map/AreaOfInterest.java   |  2 +-
 .../print/attribute/map/MapAttribute.java     |  2 +-
 .../attribute/map/MapfishMapContext.java      |  4 +-
 .../mapfish/print/config/Configuration.java   |  6 +--
 .../print/config/ConfigurationFactory.java    |  2 +-
 .../org/mapfish/print/config/SmtpConfig.java  |  4 +-
 .../org/mapfish/print/config/Template.java    |  2 +-
 .../print/config/WorkingDirectories.java      |  4 +-
 .../config/access/AndAccessAssertion.java     |  2 +-
 .../config/access/RoleAccessAssertion.java    |  2 +-
 ...ConfigFileResolvingHttpRequestFactory.java |  2 +-
 .../http/ConfigFileResolvingRequest.java      |  2 +-
 .../http/ErrorResponseClientHttpResponse.java |  2 +-
 .../mapfish/print/http/HttpCredential.java    |  2 +-
 .../print/http/HttpRequestFetcher.java        |  4 +-
 .../http/MfClientHttpRequestFactoryImpl.java  | 45 ++++++++++---------
 .../print/map/MapLayerFactoryPlugin.java      |  2 +-
 .../java/org/mapfish/print/map/Scale.java     |  2 +-
 .../geotools/AbstractFeatureSourceLayer.java  |  2 +-
 .../print/map/geotools/CachingUrihandler.java |  2 +-
 .../print/map/geotools/FeatureLayer.java      |  2 +-
 .../map/geotools/FeatureSourceSupplier.java   |  2 +-
 .../print/map/geotools/FeaturesParser.java    |  2 +-
 .../print/map/geotools/GeoJsonLayer.java      |  2 +-
 .../print/map/geotools/GeotiffLayer.java      |  2 +-
 .../mapfish/print/map/geotools/GmlLayer.java  |  2 +-
 .../print/map/geotools/grid/GridLayer.java    |  2 +-
 .../map/geotools/grid/GridLayerPlugin.java    |  2 +-
 .../print/map/geotools/grid/GridUtils.java    |  2 +-
 .../map/geotools/grid/LineGridStrategy.java   |  2 +-
 .../map/image/AbstractSingleImageLayer.java   |  2 +-
 .../mapfish/print/map/image/ImageLayer.java   |  2 +-
 .../mapfish/print/map/image/wms/WmsLayer.java |  2 +-
 .../map/image/wms/WmsLayerFactoryPlugin.java  |  2 +-
 .../print/map/style/SLDParserPlugin.java      |  4 +-
 .../mapfish/print/map/style/StyleParser.java  |  2 +-
 .../print/map/style/StyleParserPlugin.java    |  4 +-
 .../map/style/json/JsonStyleParserHelper.java |  4 +-
 .../style/json/MapfishJsonStyleVersion1.java  |  4 +-
 .../style/json/MapfishJsonStyleVersion2.java  |  4 +-
 .../style/json/MapfishStyleParserPlugin.java  |  4 +-
 .../print/map/tiled/AbstractTiledLayer.java   |  4 +-
 .../mapfish/print/map/tiled/CoverageTask.java |  2 +-
 .../print/map/tiled/TileInformation.java      |  4 +-
 .../print/map/tiled/TilePreparationTask.java  |  2 +-
 .../mapfish/print/map/tiled/osm/OsmLayer.java |  2 +-
 .../map/tiled/osm/OsmLayerParserPlugin.java   |  2 +-
 .../print/map/tiled/wms/TiledWmsLayer.java    |  2 +-
 .../tiled/wms/TiledWmsLayerParserPlugin.java  |  2 +-
 .../print/map/tiled/wmts/WMTSLayer.java       |  4 +-
 .../map/tiled/wmts/WmtsLayerParserPlugin.java |  2 +-
 .../print/metrics/HealthCheckingRegistry.java |  2 +-
 .../print/metrics/JmxMetricsReporter.java     |  4 +-
 .../print/metrics/JvmMetricsConfigurator.java |  2 +-
 .../metrics/LoggingMetricsConfigurator.java   |  2 +-
 .../AbstractJasperReportOutputFormat.java     |  5 +--
 .../print/output/MapExportOutputFormat.java   |  2 +-
 .../output/MapfishPrintRepositoryService.java |  2 +-
 .../mapfish/print/output/OutputFormat.java    |  2 +-
 .../java/org/mapfish/print/output/Values.java |  4 +-
 .../mapfish/print/parser/OneOfTracker.java    |  2 +-
 .../org/mapfish/print/parser/ParserUtils.java |  2 +-
 .../print/processor/AbstractProcessor.java    |  2 +-
 .../print/processor/CustomDependencies.java   |  2 +-
 .../processor/PdfConfigurationProcessor.java  |  2 +-
 .../mapfish/print/processor/Processor.java    |  2 +-
 .../processor/ProcessorDependencyGraph.java   |  2 +-
 .../print/processor/ProcessorGraphNode.java   |  2 +-
 .../print/processor/ProcessorUtils.java       |  4 +-
 ...ractClientHttpRequestFactoryProcessor.java |  2 +-
 ...siteClientHttpRequestFactoryProcessor.java |  2 +-
 .../http/ForwardHeadersProcessor.java         |  2 +-
 .../http/matcher/InetHostMatcher.java         |  2 +-
 .../processor/jasper/DataSourceProcessor.java |  6 +--
 .../processor/jasper/DateFormatProcessor.java |  2 +-
 .../processor/jasper/LegendProcessor.java     |  2 +-
 .../jasper/MergeDataSourceProcessor.java      |  4 +-
 .../map/AddStaticLayersProcessor.java         |  2 +-
 .../map/CreateMapPagesProcessor.java          |  2 +-
 .../processor/map/CreateMapProcessor.java     |  6 +--
 .../print/servlet/MapPrinterServlet.java      | 11 ++---
 .../servlet/ServletMapPrinterFactory.java     |  6 +--
 .../fileloader/ConfigFileLoaderManager.java   |  2 +-
 .../servlet/job/HibernateAccounting.java      |  2 +-
 .../mapfish/print/servlet/job/PrintJob.java   |  4 +-
 .../job/impl/ThreadPoolJobManager.java        |  4 +-
 .../job/impl/hibernate/HibernateJobQueue.java |  4 +-
 .../job/impl/hibernate/PrintJobDao.java       |  4 +-
 .../impl/hibernate/PrintJobStatusExtImpl.java |  2 +-
 .../print/servlet/registry/BasicRegistry.java |  2 +-
 .../mapfish/print/TestHttpClientFactory.java  |  2 +-
 .../print/config/ConfigurationTest.java       |  2 +-
 .../ProcessorWithConfigurationInjection.java  |  2 +-
 .../config/ProcessorWithSpringInjection.java  |  2 +-
 .../map/tiled/SingleTileLoaderTaskTest.java   |  5 +--
 .../processor/AbstractProcessorTest.java      |  2 +-
 .../ProcessorDependencyGraphTest.java         | 30 +++++++------
 .../processor/ProcessorGraphNodeTest.java     | 31 ++++++-------
 .../http/AbstractHttpProcessorTest.java       |  2 +-
 .../http/AddHeadersProcessorTest.java         |  2 +-
 ...ClientHttpRequestFactoryProcessorTest.java |  2 +-
 .../http/ForwardHeadersProcessorTest.java     |  2 +-
 .../processor/http/MapUriProcessorTest.java   |  2 +-
 .../http/UseHttpForHttpsProcessorTest.java    |  2 +-
 .../map/CreateMapProcessorAoiTest.java        |  2 +-
 .../print/servlet/MapPrinterServletTest.java  |  6 +--
 116 files changed, 209 insertions(+), 214 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5b15fcf76..6af5cb0eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
 
 plugins {
   id("com.github.spotbugs") version "6.4.7"
-  id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -91,16 +90,6 @@ tasks.register('docs') {
     enabled = false
 }
 
-
-rewrite {
-    activeRecipe("org.openrewrite.java.testing.junit5.JUnit4to5Migration")
-    setExportDatatables(true)
-}
-
 repositories {
     mavenCentral()
 }
-
-dependencies {
-    rewrite("org.openrewrite.recipe:rewrite-spring:6.19.0")
-}
diff --git a/core/build.gradle b/core/build.gradle
index 04ce88c3d..35919a810 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -142,6 +142,7 @@ dependencies {
             'com.vladmihalcea:hibernate-types-52:2.21.1',
             'com.mchange:c3p0:0.11.2',
             'javax.media:jai-core:1.1.3',
+            'jakarta.annotation:jakarta.annotation-api:3.0.0'
     )
     metrics(
             'io.dropwizard.metrics:metrics-core:4.2.37',
diff --git a/core/src/main/java/org/mapfish/print/ImageInit.java b/core/src/main/java/org/mapfish/print/ImageInit.java
index 22dfa9037..a9391dc3a 100644
--- a/core/src/main/java/org/mapfish/print/ImageInit.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/MapPrinter.java b/core/src/main/java/org/mapfish/print/MapPrinter.java
index dc59d8e25..7c63d0228 100644
--- a/core/src/main/java/org/mapfish/print/MapPrinter.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/VersionInfo.java b/core/src/main/java/org/mapfish/print/VersionInfo.java
index 4ebeec81f..c7008d5ab 100644
--- a/core/src/main/java/org/mapfish/print/VersionInfo.java
+++ b/core/src/main/java/org/mapfish/print/VersionInfo.java
@@ -1,13 +1,13 @@
 package org.mapfish.print;
 
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 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;
diff --git a/core/src/main/java/org/mapfish/print/attribute/Attribute.java b/core/src/main/java/org/mapfish/print/attribute/Attribute.java
index 0019429e6..ac7a53b25 100644
--- a/core/src/main/java/org/mapfish/print/attribute/Attribute.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java
index 8cd37f7d2..414034fa3 100644
--- a/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java
index 89ab76b61..7637f4bbc 100644
--- a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.attribute;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.annotation.Nonnull;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.json.data.JsonDataSource;
 import org.json.JSONException;
diff --git a/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java b/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java
index e6efd495b..deb0e57aa 100644
--- a/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute;
 
+import jakarta.annotation.Nonnull;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
diff --git a/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java b/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java
index 5dc08f2d4..8b81c7a60 100644
--- a/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java
@@ -3,6 +3,8 @@
 import static org.mapfish.print.parser.MapfishParser.stringRepresentation;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -11,8 +13,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java b/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java
index 908b77a8c..a6ffdca1c 100644
--- a/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java
+++ b/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.attribute.map;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.data.simple.SimpleFeatureCollection;
diff --git a/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java b/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java
index ece30c7e0..b0d62b288 100644
--- a/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.attribute.map;
 
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.json.JSONArray;
diff --git a/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java b/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java
index 8f49dc173..71fc36ba1 100644
--- a/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java
+++ b/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.attribute.map;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.FloatingPointUtil;
 import org.mapfish.print.map.Scale;
diff --git a/core/src/main/java/org/mapfish/print/config/Configuration.java b/core/src/main/java/org/mapfish/print/config/Configuration.java
index c31069f69..3ab337396 100644
--- a/core/src/main/java/org/mapfish/print/config/Configuration.java
+++ b/core/src/main/java/org/mapfish/print/config/Configuration.java
@@ -1,5 +1,8 @@
 package org.mapfish.print.config;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -12,9 +15,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import org.geotools.api.filter.expression.Expression;
 import org.geotools.api.style.FeatureTypeStyle;
 import org.geotools.api.style.Fill;
diff --git a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
index 9cee27330..431f647bd 100644
--- a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
+++ b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.config;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -8,7 +9,6 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core/src/main/java/org/mapfish/print/config/SmtpConfig.java b/core/src/main/java/org/mapfish/print/config/SmtpConfig.java
index 7684b1346..098e4fe5e 100644
--- a/core/src/main/java/org/mapfish/print/config/SmtpConfig.java
+++ b/core/src/main/java/org/mapfish/print/config/SmtpConfig.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.config;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * Email sending configuration.
diff --git a/core/src/main/java/org/mapfish/print/config/Template.java b/core/src/main/java/org/mapfish/print/config/Template.java
index a85e7dd1a..6dc914808 100644
--- a/core/src/main/java/org/mapfish/print/config/Template.java
+++ b/core/src/main/java/org/mapfish/print/config/Template.java
@@ -3,6 +3,7 @@
 import static org.mapfish.print.OptionalUtils.or;
 
 import com.google.common.collect.Sets;
+import jakarta.annotation.Nonnull;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -12,7 +13,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.geotools.api.style.Style;
 import org.json.JSONException;
 import org.json.JSONWriter;
diff --git a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
index 15a001739..9af155e58 100644
--- a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
+++ b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.config;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Date;
 import java.util.Objects;
-import javax.annotation.PostConstruct;
-import jakarta.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;
diff --git a/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java b/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java
index bf9fd3e11..c3fe86fa7 100644
--- a/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java
+++ b/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.config.access;
 
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java b/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java
index c5607311b..ec61fe8ad 100644
--- a/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java
+++ b/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.config.access;
 
 import com.google.common.collect.Collections2;
+import jakarta.annotation.Nullable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import javax.annotation.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java
index 737633d62..271ddb6c0 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.Nonnull;
 import org.mapfish.print.config.Configuration;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
index 72f766eee..aae9dc958 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +15,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index 37e85c438..a6ae2429a 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index cda3bbf32..e8bb16bce 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nullable;
 import java.net.MalformedURLException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
index 3c72e5849..e8f384704 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -13,8 +15,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.io.IOUtils;
 import org.mapfish.print.StatsUtils;
 import org.mapfish.print.processor.Processor;
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 6610bef3f..bd8147d9c 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -1,5 +1,7 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -15,22 +17,20 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpEntityContainer;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 import org.slf4j.Logger;
@@ -94,18 +94,19 @@ private static CloseableHttpClient createHttpClient(
             .build();
 
     final HttpClientBuilder httpClientBuilder =
-      HttpClients.custom()
-        .disableCookieManagement()
-        .setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
-          .setTlsSocketStrategy(new MfTLSSocketStrategy())
-          .setDnsResolver(new RandomizingDnsResolver())
-          .setMaxConnPerRoute(maxConnTotal)
-          .setMaxConnPerRoute(maxConnPerRoute)
-          .build())
-        .setRoutePlanner(new MfRoutePlanner())
-        .setDefaultCredentialsProvider(new MfCredentialsProvider())
-        .setDefaultRequestConfig(requestConfig)
-        .setUserAgent(UserAgentCreator.getUserAgent());
+        HttpClients.custom()
+            .disableCookieManagement()
+            .setConnectionManager(
+                PoolingHttpClientConnectionManagerBuilder.create()
+                    .setTlsSocketStrategy(new MfTLSSocketStrategy())
+                    .setDnsResolver(new RandomizingDnsResolver())
+                    .setMaxConnPerRoute(maxConnTotal)
+                    .setMaxConnPerRoute(maxConnPerRoute)
+                    .build())
+            .setRoutePlanner(new MfRoutePlanner())
+            .setDefaultCredentialsProvider(new MfCredentialsProvider())
+            .setDefaultRequestConfig(requestConfig)
+            .setUserAgent(UserAgentCreator.getUserAgent());
     CloseableHttpClient closeableHttpClient = httpClientBuilder.build();
     LOGGER.debug(
         "Created CloseableHttpClient using connectionRequestTimeout: {} connectTimeout: {}"
@@ -216,7 +217,8 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
       for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
         String headerName = entry.getKey();
         if (!headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.CONTENT_LENGTH)
-            && !headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
+            && !headerName.equalsIgnoreCase(
+                org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
           for (String headerValue : entry.getValue()) {
             this.request.addHeader(headerName, headerValue);
           }
@@ -224,7 +226,8 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
       }
       if (this.request instanceof HttpEntityContainer entityEnclosingRequest) {
         var bytes = this.outputStream.toByteArray();
-        final HttpEntity requestEntity = new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
+        final HttpEntity requestEntity =
+            new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
         entityEnclosingRequest.setEntity(requestEntity);
       }
 
@@ -299,7 +302,7 @@ public HttpHeaders getHeaders() {
       final HttpHeaders translatedHeaders = new HttpHeaders();
       final Header[] allHeaders = this.response.getHeaders();
       for (Header header : allHeaders) {
-          translatedHeaders.add(header.getName(), header.getValue());
+        translatedHeaders.add(header.getName(), header.getValue());
       }
       return translatedHeaders;
     }
diff --git a/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java b/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java
index f3ae25c4f..42ce8b972 100644
--- a/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.mapfish.print.attribute.map.MapLayer;
 import org.mapfish.print.config.Template;
 
diff --git a/core/src/main/java/org/mapfish/print/map/Scale.java b/core/src/main/java/org/mapfish/print/map/Scale.java
index ea3137f36..78e050469 100644
--- a/core/src/main/java/org/mapfish/print/map/Scale.java
+++ b/core/src/main/java/org/mapfish/print/map/Scale.java
@@ -2,7 +2,7 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.MathTransform;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java
index 2b2ee847a..c1787f25a 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java
@@ -2,10 +2,10 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.api.style.Style;
 import org.geotools.data.DataUtilities;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java b/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java
index ece6e1a2d..daf5704a4 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -7,7 +8,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Map;
-import javax.annotation.PostConstruct;
 import org.eclipse.emf.common.util.URI;
 import org.geotools.xml.resolver.SchemaCache;
 import org.geotools.xml.resolver.SchemaResolver;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java
index fcffa589f..c94775349 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.data.collection.CollectionFeatureSource;
 import org.geotools.data.simple.SimpleFeatureCollection;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java b/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java
index 36df9951c..174ababd3 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.map.geotools;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.mapfish.print.attribute.map.MapfishMapContext;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
index 5ce2466d1..bc316044f 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.map.geotools;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -10,7 +11,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.apache.commons.io.IOUtils;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.FactoryException;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java
index e926f6e5f..ab47bbc9c 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.data.collection.CollectionFeatureSource;
 import org.geotools.data.simple.SimpleFeatureCollection;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java
index 498e1b1f1..18a383ace 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -11,7 +12,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
 import org.apache.commons.io.IOUtils;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geotools.api.style.Style;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java
index fc38c5dc6..b8fb292ed 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.MalformedURLException;
@@ -7,7 +8,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
 import org.eclipse.emf.ecore.resource.URIHandler;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java
index 449bd1f8d..c7bf182a9 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
@@ -13,7 +14,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.map.Layer;
 import org.mapfish.print.Constants;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java
index 8c6bb15f7..5dd5f0fa5 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
+import jakarta.annotation.Nonnull;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.mapfish.print.OptionalUtils;
 import org.mapfish.print.config.Template;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java
index 5b62379c6..4bc97c785 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java
@@ -5,8 +5,8 @@
 import static org.mapfish.print.map.geotools.grid.GridLabel.Side.RIGHT;
 import static org.mapfish.print.map.geotools.grid.GridLabel.Side.TOP;
 
+import jakarta.annotation.Nonnull;
 import java.awt.geom.AffineTransform;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.MathTransform;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java
index 51dd7d654..0a54095a6 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
+import jakarta.annotation.Nonnull;
 import java.awt.geom.AffineTransform;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
diff --git a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
index 69489e24c..911c4188e 100644
--- a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
@@ -4,6 +4,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
@@ -13,7 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import javax.imageio.ImageIO;
 import org.apache.commons.io.IOUtils;
 import org.geotools.api.style.Style;
diff --git a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java
index 6aa5cba30..1c3b3d768 100644
--- a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java
@@ -3,6 +3,7 @@
 import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
@@ -15,7 +16,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.style.Style;
 import org.geotools.coverage.CoverageFactoryFinder;
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java
index e94e1875b..3326269a8 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map.image.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.attribute.map.MapfishMapContext;
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java
index 2a1cccbee..2de342977 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.image.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java
index 2ce1680ff..6477d1278 100644
--- a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java
@@ -1,5 +1,7 @@
 package org.mapfish.print.map.style;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URI;
@@ -9,8 +11,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/core/src/main/java/org/mapfish/print/map/style/StyleParser.java b/core/src/main/java/org/mapfish/print/map/style/StyleParser.java
index 36b827a0d..2f54c401e 100644
--- a/core/src/main/java/org/mapfish/print/map/style/StyleParser.java
+++ b/core/src/main/java/org/mapfish/print/map/style/StyleParser.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.style;
 
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.geotools.api.style.Style;
 import org.geotools.api.style.StyleFactory;
 import org.geotools.api.style.StyledLayerDescriptor;
diff --git a/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java
index 5c3c9c440..0c6ceeacb 100644
--- a/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map.style;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.api.style.Style;
 import org.mapfish.print.config.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java b/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java
index a5ef7a12f..4ef633223 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java
@@ -4,6 +4,8 @@
 import static org.springframework.http.HttpMethod.HEAD;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -19,8 +21,6 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
 import org.apache.commons.lang3.StringUtils;
 import org.geotools.api.filter.expression.Expression;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java
index 94d65cb81..683aa9173 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.map.style.json;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.geotools.api.filter.Filter;
 import org.geotools.api.filter.expression.Expression;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java
index 9bb543ec8..e6b36abc4 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java
@@ -1,6 +1,8 @@
 package org.mapfish.print.map.style.json;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -8,8 +10,6 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.api.filter.Filter;
 import org.geotools.api.style.Rule;
 import org.geotools.api.style.Style;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java
index 1d895180f..72884630a 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java
@@ -2,9 +2,9 @@
 
 import static org.mapfish.print.map.style.json.MapfishJsonStyleVersion1.DEFAULT_GEOM_ATT_NAME;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.api.style.Style;
 import org.geotools.styling.StyleBuilder;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java
index e4c4bed51..8ca1c7571 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map.tiled;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Rectangle;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.map.GridCoverageLayer;
 import org.geotools.map.Layer;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
index c57241b4c..1ad8f87dc 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
@@ -2,6 +2,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -10,7 +11,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.Callable;
 import java.util.concurrent.RecursiveTask;
-import javax.annotation.Nonnull;
 import javax.imageio.ImageIO;
 import org.apache.commons.io.IOUtils;
 import org.geotools.coverage.CoverageFactoryFinder;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java b/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java
index 2fec94e09..e50965693 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.map.tiled;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.net.URISyntaxException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.locationtech.jts.geom.Coordinate;
 import org.mapfish.print.attribute.map.MapBounds;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java b/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java
index 9598c551f..7532227bb 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.tiled;
 
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
@@ -7,7 +8,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Callable;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.MathTransform;
 import org.geotools.api.referencing.operation.TransformException;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java
index 9fa4c3eed..02d4ea2ba 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.map.tiled.osm;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java
index f2261c444..f32eaef71 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled.osm;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java
index 34f7076b4..ac88c2d37 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.map.tiled.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java
index 1f3a51279..8daee4965 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java
index 774c56521..b155c8171 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java
@@ -4,14 +4,14 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.attribute.map.MapBounds;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java
index 8209d0bb0..9b5f3dca0 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled.wmts;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java b/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java
index ed5ac7b1e..4a43550e7 100644
--- a/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java
+++ b/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.metrics;
 
 import com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class HealthCheckingRegistry extends com.codahale.metrics.health.HealthCheckRegistry {
diff --git a/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java b/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java
index 6118faff2..c320ea18d 100644
--- a/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java
+++ b/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java
@@ -2,8 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.jmx.JmxReporter;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** This bean will enable JMX reporting when added to application context. */
diff --git a/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java b/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java
index 673af87a6..37add71ce 100644
--- a/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java
+++ b/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java
@@ -5,7 +5,7 @@
 import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** A bean that will add several gauges and metric sets for tracking the JVM stats. */
diff --git a/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java b/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java
index c38992288..178729b6c 100644
--- a/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java
+++ b/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java
@@ -4,7 +4,7 @@
 import ch.qos.logback.classic.LoggerContext;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.logback.InstrumentedAppender;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
index 2597ef7e5..ad53cc831 100644
--- a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
+++ b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.output;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -21,8 +22,6 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -442,6 +441,6 @@ public record Print(
       @Nonnull JasperReportsContext context,
       @Nonnull JasperPrint print,
       @Nonnull Values values,
-      @Nonnegative double dpi,
+      double dpi,
       @Nonnull Processor.ExecutionContext executionContext) {}
 }
diff --git a/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java
index 893144bd1..29c7b1672 100644
--- a/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java
+++ b/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.output;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.OutputStream;
@@ -11,7 +12,6 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
 import org.apache.commons.io.IOUtils;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java b/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java
index d4b6a6c2c..87cd09679 100644
--- a/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java
+++ b/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.output;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.annotation.Nonnull;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JasperReportsContext;
 import net.sf.jasperreports.repo.FileRepositoryService;
diff --git a/core/src/main/java/org/mapfish/print/output/OutputFormat.java b/core/src/main/java/org/mapfish/print/output/OutputFormat.java
index 7c10c87ac..32cafe532 100644
--- a/core/src/main/java/org/mapfish/print/output/OutputFormat.java
+++ b/core/src/main/java/org/mapfish/print/output/OutputFormat.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.output;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.OutputStream;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.Processor;
 import org.mapfish.print.wrapper.json.PJsonObject;
diff --git a/core/src/main/java/org/mapfish/print/output/Values.java b/core/src/main/java/org/mapfish/print/output/Values.java
index 3641c4d92..872f29a83 100644
--- a/core/src/main/java/org/mapfish/print/output/Values.java
+++ b/core/src/main/java/org/mapfish/print/output/Values.java
@@ -2,6 +2,8 @@
 
 import static org.mapfish.print.servlet.MapPrinterServlet.JSON_REQUEST_HEADERS;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,8 +14,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.ExtraPropertyException;
 import org.mapfish.print.attribute.Attribute;
diff --git a/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java b/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java
index 2d3bb37e1..997524a1c 100644
--- a/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java
+++ b/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.parser;
 
 import com.google.common.collect.Collections2;
+import jakarta.annotation.Nonnull;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,7 +9,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.locationtech.jts.util.Assert;
 
 /** Keeps track of which OneOf groups there are and which ones are satisfied. */
diff --git a/core/src/main/java/org/mapfish/print/parser/ParserUtils.java b/core/src/main/java/org/mapfish/print/parser/ParserUtils.java
index c77c60e3d..dc51d4ae9 100644
--- a/core/src/main/java/org/mapfish/print/parser/ParserUtils.java
+++ b/core/src/main/java/org/mapfish/print/parser/ParserUtils.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.parser;
 
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -8,7 +9,6 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
 
 /** Utility method for getting and setting parameters on Processor Input and Output objects. */
 public final class ParserUtils {
diff --git a/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java b/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java
index 7ba05c773..3e4de0268 100644
--- a/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -11,7 +12,6 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
-import javax.annotation.Nonnull;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationException;
 import org.mapfish.print.parser.ParserUtils;
diff --git a/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java b/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java
index f31b83694..38104f53f 100644
--- a/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java
+++ b/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor;
 
+import jakarta.annotation.Nonnull;
 import java.util.Collection;
-import javax.annotation.Nonnull;
 
 /**
  * Classes that implement this interface indicate what she dynamically depends on, for the "values"
diff --git a/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java b/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java
index ad67de019..c13324421 100644
--- a/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.processor;
 
+import jakarta.annotation.Nullable;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -9,7 +10,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationException;
 import org.mapfish.print.config.ConfigurationObject;
diff --git a/core/src/main/java/org/mapfish/print/processor/Processor.java b/core/src/main/java/org/mapfish/print/processor/Processor.java
index ce28a81b7..114acf8d7 100644
--- a/core/src/main/java/org/mapfish/print/processor/Processor.java
+++ b/core/src/main/java/org/mapfish/print/processor/Processor.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.processor;
 
 import com.google.common.collect.BiMap;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.ConfigurationObject;
 
 /**
diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java b/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java
index 817b7243c..c0b01027e 100644
--- a/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java
+++ b/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java
@@ -6,6 +6,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.IdentityHashMap;
@@ -13,7 +14,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.RecursiveTask;
-import javax.annotation.Nonnull;
 import org.mapfish.print.output.Values;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java b/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java
index a13fe11fb..d4b14a3ef 100644
--- a/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java
+++ b/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java
@@ -4,6 +4,7 @@
 import com.codahale.metrics.Timer;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import jakarta.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Objects;
@@ -11,7 +12,6 @@
 import java.util.Set;
 import java.util.concurrent.RecursiveTask;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.output.Values;
diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java b/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java
index 55d8eed57..4c2e5918d 100644
--- a/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java
+++ b/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java
@@ -3,14 +3,14 @@
 import static org.mapfish.print.parser.ParserUtils.getAllAttributes;
 
 import com.google.common.collect.BiMap;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.output.Values;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java
index c265df5c2..188d8aacc 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.http.matcher.URIMatcher;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java
index 1bab0132e..0a1c847e2 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor.http;
 
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.mapfish.print.output.Values;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java
index e46d85fd1..52fb3090a 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.http;
 
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
 import org.mapfish.print.attribute.HttpRequestHeadersAttribute;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java
index 15572ac50..252f170bb 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.processor.http.matcher;
 
+import jakarta.annotation.Nullable;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.SocketException;
@@ -7,7 +8,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java
index d8478be55..7aadcb503 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java
@@ -2,6 +2,9 @@
 
 import static org.mapfish.print.attribute.DataSourceAttribute.DataSourceAttributeValue;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,9 +14,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ForkJoinTask;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JRException;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java
index 1fd7c8b37..71c388ecf 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.jasper;
 
+import jakarta.annotation.Nullable;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationException;
 import org.mapfish.print.parser.HasDefaultValue;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
index 200435373..62677e4df 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
@@ -3,6 +3,7 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Resource;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -20,7 +21,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.data.JRTableModelDataSource;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
index f563f4d67..dae93b4b9 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.processor.jasper;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
diff --git a/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java
index 9955a3626..dfb36c87d 100644
--- a/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor.map;
 
+import jakarta.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.attribute.map.GenericMapAttribute.GenericMapAttributeValues;
 import org.mapfish.print.attribute.map.StaticLayersAttribute;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java
index 53f845742..e4cae4dee 100644
--- a/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java
@@ -2,13 +2,13 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
+import jakarta.annotation.Nonnull;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
diff --git a/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java
index 2fd560fda..9a704c7ce 100644
--- a/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java
@@ -10,6 +10,9 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.Resource;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -32,9 +35,6 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index c0dbc0a37..d5ba140c8 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -7,6 +7,10 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import io.sentry.Sentry;
+import jakarta.annotation.Nonnull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -30,10 +34,6 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jasperreports.engine.fonts.FontFamily;
 import net.sf.jasperreports.extensions.ExtensionsEnvironment;
 import org.apache.commons.io.FilenameUtils;
@@ -1174,7 +1174,8 @@ private boolean checkReferer(final HttpServletRequest request, final MapPrinter
       referrer = "http://localhost/";
     }
     try {
-      return allowedReferers.matches(new URI(referrer), HttpMethod.valueOf(request.getMethod().toUpperCase(Locale.ROOT)));
+      return allowedReferers.matches(
+          new URI(referrer), HttpMethod.valueOf(request.getMethod().toUpperCase(Locale.ROOT)));
     } catch (SocketException
         | UnknownHostException
         | URISyntaxException
diff --git a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java
index 80ab86f0b..c8802a777 100644
--- a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java
+++ b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java
@@ -2,6 +2,9 @@
 
 import static java.nio.file.Files.walk;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -16,9 +19,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import org.apache.commons.lang3.StringUtils;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.MapPrinter;
diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java
index 467d6971b..65df55931 100644
--- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java
+++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -12,7 +13,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** Processes all {@link ConfigFileLoaderPlugin}s and loads the files. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
index 8c8845d18..22cba9cf9 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.servlet.job;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
index ed3ab575c..4c921e1c6 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -14,8 +16,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.mail.Authenticator;
 import javax.mail.Message;
 import javax.mail.MessagingException;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
index bb785e312..086caa369 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
@@ -21,8 +23,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import org.mapfish.print.ExceptionUtils;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.config.WorkingDirectories;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java
index 84563a279..565ba256a 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java
@@ -2,12 +2,12 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;
 import org.mapfish.print.servlet.job.JobQueue;
 import org.mapfish.print.servlet.job.NoSuchReferenceException;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index 2264259f7..da25e85c7 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaDelete;
 import javax.persistence.criteria.CriteriaQuery;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
index a8ddc080c..f5a7b3554 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import org.mapfish.print.servlet.job.PrintJobEntry;
diff --git a/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java b/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java
index ceb59ae41..3fadd70c4 100644
--- a/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java
@@ -2,9 +2,9 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import jakarta.annotation.PostConstruct;
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
 import org.json.JSONObject;
 
 /**
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index 9119c352b..5a46fa166 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -1,12 +1,12 @@
 package org.mapfish.print;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
-import javax.annotation.Nonnull;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.ConfigurableRequest;
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
index 093cc5d9f..6727d2591 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
@@ -2,13 +2,13 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import jakarta.annotation.Nullable;
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
 import org.geotools.api.style.FeatureTypeStyle;
 import org.geotools.api.style.LineSymbolizer;
 import org.geotools.api.style.PointSymbolizer;
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
index 9e4439be4..dbcf0222a 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
@@ -2,8 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.processor.AbstractProcessor;
 
 /** Processor that needs the configuration object injected. */
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
index 2faf7f115..e26506c00 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
index dc2483cef..0109ab2a2 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
@@ -18,6 +18,7 @@
 import org.mapfish.print.PrintException;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.Processor;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 
@@ -86,9 +87,7 @@ public void testComputeWithUnsupportedStatusCode() throws IOException, URISyntax
 
   private ClientHttpResponse getMockResponse(int rawStatusCode) throws IOException {
     ClientHttpResponse response = mock(ClientHttpResponse.class);
-    when(response.getStatusCode().value()).thenReturn(rawStatusCode);
-    when(response.getStatusCode())
-        .thenThrow(new RuntimeException("Unsupported status code has no HttpStatus"));
+    when(response.getStatusCode()).thenReturn(HttpStatusCode.valueOf(rawStatusCode));
     when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));
     when(response.getHeaders()).thenReturn(new org.springframework.http.HttpHeaders());
     return response;
diff --git a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
index 56a1f2bb2..1cea245c8 100644
--- a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
@@ -3,9 +3,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
index 08ceb8bb2..6ba9480a0 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
@@ -4,9 +4,9 @@
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
@@ -71,19 +71,21 @@ public void testCreateTaskAllDependenciesAreSatisfied() {
 
   @Test
   public void testCreateTaskAllDependenciesAreMissing() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      Values values = new Values();
-      // this is a misconfiguration prop should be pp thus an exception should be thrown below.
-      values.put("prop", "value");
-      values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
-
-      final TestProcessor processor = new TestProcessor("p");
-      processor.getInputMapperBiMap().put("pp", "prop");
-
-      final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
-      graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
-      graph.createTask(values);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          Values values = new Values();
+          // this is a misconfiguration prop should be pp thus an exception should be thrown below.
+          values.put("prop", "value");
+          values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
+
+          final TestProcessor processor = new TestProcessor("p");
+          processor.getInputMapperBiMap().put("pp", "prop");
+
+          final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
+          graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
+          graph.createTask(values);
+        });
   }
 
   static class TestIn {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
index 63eb92005..3679f15dc 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
@@ -2,9 +2,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import jakarta.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
@@ -43,20 +43,21 @@ public void testPopulateInputParameter() {
 
   @Test
   public void testNullableProperty() {
-    assertThrows(RuntimeException.class, () -> {
-
-      Values values = new Values();
-      values.put(iMappingName, intVal);
-      values.put(bMappingName, true);
-      values.put("s", sVal);
-      values.put("ls", lsVal);
-      // NO da value is specified so an exception should be thrown.
-
-      TestProcessor processor = new TestProcessor();
-      processor.getInputMapperBiMap().put(iMappingName, "i");
-      processor.getInputMapperBiMap().put(bMappingName, "b");
-      ProcessorUtils.populateInputParameter(processor, values);
-    });
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          Values values = new Values();
+          values.put(iMappingName, intVal);
+          values.put(bMappingName, true);
+          values.put("s", sVal);
+          values.put("ls", lsVal);
+          // NO da value is specified so an exception should be thrown.
+
+          TestProcessor processor = new TestProcessor();
+          processor.getInputMapperBiMap().put(iMappingName, "i");
+          processor.getInputMapperBiMap().put(bMappingName, "b");
+          ProcessorUtils.populateInputParameter(processor, values);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
index eb60953fc..b601031cb 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
@@ -3,12 +3,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
index a9f6a1b4a..4ab96fefe 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
-import javax.annotation.Nullable;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
index 208d8db5b..07159fba8 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
@@ -4,9 +4,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.HashMap;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mapfish.print.attribute.HttpRequestHeadersAttribute;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
index c83fbc2ad..d14300bb8 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
@@ -4,9 +4,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.HashMap;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
index d66ec6da8..730e1c848 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
@@ -2,8 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
-import javax.annotation.Nullable;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
index dde34ba27..c8a73ede4 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
@@ -2,10 +2,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.annotation.Nullable;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
index 560d38af6..fa1794fea 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
@@ -5,6 +5,7 @@
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.CLIP;
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.RENDER;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -15,7 +16,6 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
 import org.apache.batik.transcoder.TranscoderException;
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
index 4379f61d4..c60006f21 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
@@ -5,6 +5,9 @@
 
 import de.saly.javamail.mock2.MailboxFolder;
 import de.saly.javamail.mock2.MockMailbox;
+import jakarta.annotation.Nullable;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -16,15 +19,12 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import javax.annotation.Nullable;
 import javax.mail.Address;
 import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.Multipart;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMultipart;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;

From 14878230f8dd0e8a095698eecc215ef665a7d055 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 8 Dec 2025 10:03:26 +0100
Subject: [PATCH 08/61] Migrated to Hibernate 6.6 using OpenRewrite

---
 build.gradle                                  |  16 +-
 core/build.gradle                             |   4 +-
 .../servlet/job/HibernateAccountingEntry.java |  26 +-
 .../servlet/job/impl/PrintJobEntryImpl.java   |  11 +-
 .../servlet/job/impl/PrintJobResultImpl.java  |  32 +-
 .../servlet/job/impl/PrintJobStatusImpl.java  |  26 +-
 .../job/impl/ThreadPoolJobManager.java        |   2 +-
 .../hibernate/AccessAssertionUserType.java    |  41 +-
 .../impl/hibernate/PJsonObjectUserType.java   |  42 +-
 .../job/impl/hibernate/PrintJobDao.java       |  12 +-
 .../impl/hibernate/PrintJobResultExtImpl.java |   6 +-
 .../impl/hibernate/PrintJobStatusExtImpl.java |   4 +-
 .../java/org/mapfish/print/ExamplesTest.java  | 821 +++++++++---------
 13 files changed, 518 insertions(+), 525 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6af5cb0eb..d3c309a6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,8 @@ buildscript {
 }
 
 plugins {
-  id("com.github.spotbugs") version "6.4.7"
+    id("com.github.spotbugs") version "6.4.7"
+    id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -65,8 +66,8 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 
     dependencies {
         testImplementation(
-                'org.junit.jupiter:junit-jupiter:6.0.1',
-                'org.mockito:mockito-core:5.20.0',
+            'org.junit.jupiter:junit-jupiter:6.0.1',
+            'org.mockito:mockito-core:5.20.0',
         )
     }
 
@@ -93,3 +94,12 @@ tasks.register('docs') {
 repositories {
     mavenCentral()
 }
+
+rewrite {
+    activeRecipe("org.openrewrite.hibernate.MigrateToHibernate66")
+    setExportDatatables(true)
+}
+
+dependencies {
+    rewrite("org.openrewrite.recipe:rewrite-hibernate:2.16.0")
+}
diff --git a/core/build.gradle b/core/build.gradle
index 35919a810..02f89cedd 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -137,9 +137,9 @@ dependencies {
             '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.hibernate:hibernate-core:6.6.38.Final',
             'org.postgresql:postgresql:42.7.8',
-            'com.vladmihalcea:hibernate-types-52:2.21.1',
+            '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'
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
index 0d79057ab..fcfee8621 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
@@ -1,16 +1,12 @@
 package org.mapfish.print.servlet.job;
 
-import tools.jackson.databind.node.ObjectNode;
-import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.ExecutionStats;
@@ -20,26 +16,22 @@
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import tools.jackson.databind.node.ObjectNode;
 
 /** Entity for the print_accountings table. */
 @Entity
 @Table(name = "print_accountings")
-@TypeDef(name = "jsonb-node", typeClass = JsonBinaryType.class, defaultForType = ObjectNode.class)
 public class HibernateAccountingEntry {
   private static final Logger LOGGER = LoggerFactory.getLogger(HibernateAccountingEntry.class);
 
   @Id
   @Column(name = "reference_id")
-  @Type(type = "org.hibernate.type.TextType")
   private String referenceId;
 
   @Column(nullable = false, name = "app_id")
-  @Type(type = "org.hibernate.type.TextType")
   private String appId;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private String referrer;
+  @Column private String referrer;
 
   @Column(nullable = false)
   @Enumerated(EnumType.STRING)
@@ -55,11 +47,9 @@ public class HibernateAccountingEntry {
   private long totalTimeMS;
 
   @Column(nullable = false, name = "output_format")
-  @Type(type = "org.hibernate.type.TextType")
   private String outputFormat;
 
   @Column(nullable = false)
-  @Type(type = "org.hibernate.type.TextType")
   private String layout;
 
   @Column(name = "file_size")
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
index 3cb616e41..7940c00fc 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet.job.impl;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
 import org.hibernate.annotations.Type;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
@@ -11,6 +11,8 @@
 import org.mapfish.print.servlet.MapPrinterServlet;
 import org.mapfish.print.servlet.ServletMapPrinterFactory;
 import org.mapfish.print.servlet.job.PrintJobEntry;
+import org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType;
+import org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.springframework.context.ApplicationContext;
 
@@ -19,17 +21,16 @@
 public class PrintJobEntryImpl implements PrintJobEntry {
 
   @Column(insertable = false, updatable = false)
-  @Type(type = "org.hibernate.type.TextType")
   private String referenceId;
 
   @Column()
-  @Type(type = "org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType")
+  @Type(PJsonObjectUserType.class)
   private PJsonObject requestData;
 
   @Column private long startTime;
 
   @Column()
-  @Type(type = "org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType")
+  @Type(AccessAssertionUserType.class)
   private AccessAssertion access;
 
   /** Constructor. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
index 906b0bdee..afae27063 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
@@ -1,17 +1,16 @@
 package org.mapfish.print.servlet.job.impl;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
-import org.hibernate.annotations.Type;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.servlet.job.PrintJobResult;
 import org.mapfish.print.servlet.job.PrintJobStatus;
@@ -21,21 +20,13 @@
 @Table(name = "print_job_results")
 public class PrintJobResultImpl implements PrintJobResult {
 
-  @Id
-  @Type(type = "org.hibernate.type.TextType")
-  private final String reportURI;
+  @Id private final String reportURI;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private final String mimeType;
+  @Column private final String mimeType;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private final String fileExtension;
+  @Column private final String fileExtension;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private final String fileName;
+  @Column private final String fileName;
 
   @OneToOne(targetEntity = PrintJobStatusImpl.class, fetch = FetchType.LAZY)
   @OnDelete(action = OnDeleteAction.CASCADE)
@@ -43,7 +34,6 @@ public class PrintJobResultImpl implements PrintJobResult {
   private PrintJobStatus status = null;
 
   @Column(insertable = true, updatable = true)
-  @Type(type = "org.hibernate.type.TextType")
   private String referenceId;
 
   /** Default Constructor. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index 76608b34c..a97ef0e78 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -1,18 +1,17 @@
 package org.mapfish.print.servlet.job.impl;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import org.hibernate.annotations.Target;
-import org.hibernate.annotations.Type;
 import org.mapfish.print.config.access.AccessAssertion;
 import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.PrintJobResult;
@@ -26,9 +25,7 @@ public class PrintJobStatusImpl implements PrintJobStatus {
   @Target(PrintJobEntryImpl.class)
   private final PrintJobEntry entry;
 
-  @Id
-  @Type(type = "org.hibernate.type.TextType")
-  private String referenceId;
+  @Id private String referenceId;
 
   @Column
   @Enumerated(EnumType.STRING)
@@ -38,7 +35,6 @@ public class PrintJobStatusImpl implements PrintJobStatus {
 
   @Column private long requestCount;
 
-  @Type(type = "org.hibernate.type.TextType")
   private String error;
 
   @OneToOne(targetEntity = PrintJobResultImpl.class, cascade = CascadeType.ALL, mappedBy = "status")
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
index 086caa369..08344cece 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
@@ -638,7 +638,7 @@ public void run() {
             }
           }
         }
-      } catch (javax.persistence.PessimisticLockException e) {
+      } catch (jakarta.persistence.PessimisticLockException e) {
         // Ignore error on pessimistic locking
         unhealthyCountersHealthCheck.recordUnhealthyProblem(
             getClass().getSimpleName(), "ignoredPessimisticLockIssue");
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java
index 37020a04c..a8c911a68 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java
@@ -14,39 +14,39 @@
 import org.mapfish.print.config.access.AccessAssertionPersister;
 
 /** Hibernate user type for access assertion. */
-public class AccessAssertionUserType implements UserType {
+public class AccessAssertionUserType implements UserType<AccessAssertion> {
 
-  private static final int[] SQL_TYPES = {Types.LONGVARCHAR};
+  private static final int SQL_TYPE = Types.LONGVARCHAR;
 
   @Override
-  public final Object assemble(final Serializable cached, final Object owner) {
-    return deepCopy(cached);
+  public final AccessAssertion assemble(final Serializable cached, final Object owner) {
+    return deepCopy((AccessAssertion) cached);
   }
 
   @Override
-  public final Object deepCopy(final Object value) {
+  public final AccessAssertion deepCopy(final AccessAssertion value) {
     if (value == null) {
       return null;
     }
-    return ((AccessAssertion) value).copy();
+    return value.copy();
   }
 
   @Override
-  public final Serializable disassemble(final Object value) {
+  public final Serializable disassemble(final AccessAssertion value) {
     return (Serializable) deepCopy(value);
   }
 
   @Override
-  public final boolean equals(final Object x, final Object y) {
+  public final boolean equals(final AccessAssertion x, final AccessAssertion y) {
     if (x == null) {
-      return (y != null);
+      return y == null;
     } else {
-      return (x.equals(y));
+      return x.equals(y);
     }
   }
 
   @Override
-  public final int hashCode(final Object x) {
+  public final int hashCode(final AccessAssertion x) {
     return x.hashCode();
   }
 
@@ -56,13 +56,13 @@ public final boolean isMutable() {
   }
 
   @Override
-  public final Object nullSafeGet(
+  public final AccessAssertion nullSafeGet(
       final ResultSet rs,
-      final String[] names,
+      final int position,
       final SharedSessionContractImplementor session,
       final Object owner)
       throws SQLException {
-    String value = rs.getString(names[0]);
+    String value = rs.getString(position);
     if (value != null) {
       try {
         AccessAssertionPersister persister =
@@ -80,22 +80,23 @@ public final Object nullSafeGet(
   @Override
   public final void nullSafeSet(
       final PreparedStatement st,
-      final Object value,
+      final AccessAssertion value,
       final int index,
       final SharedSessionContractImplementor session)
       throws SQLException {
     if (value == null) {
-      st.setNull(index, SQL_TYPES[0]);
+      st.setNull(index, SQL_TYPE);
     } else {
       AccessAssertionPersister persister =
           ApplicationContextProvider.getApplicationContext()
               .getBean(AccessAssertionPersister.class);
-      st.setString(index, persister.marshal(((AccessAssertion) value)).toString());
+      st.setString(index, persister.marshal(value).toString());
     }
   }
 
   @Override
-  public final Object replace(final Object original, final Object target, final Object owner) {
+  public final AccessAssertion replace(
+      final AccessAssertion original, final AccessAssertion target, final Object owner) {
     return deepCopy(original);
   }
 
@@ -105,7 +106,7 @@ public final Class<AccessAssertion> returnedClass() {
   }
 
   @Override
-  public final int[] sqlTypes() {
-    return SQL_TYPES;
+  public final int getSqlType() {
+    return SQL_TYPE;
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
index 1a8b9b2ec..1620a273e 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
@@ -12,25 +12,24 @@
 import org.mapfish.print.wrapper.json.PJsonObject;
 
 /** Hibernate User Type for PJson object. */
-public class PJsonObjectUserType implements UserType {
+public class PJsonObjectUserType implements UserType<PJsonObject> {
 
-  private static final int[] SQL_TYPES = {Types.LONGVARCHAR};
+  private static final int SQL_TYPE = Types.LONGVARCHAR;
 
   private static final String CONTEXT_NAME = "spec";
 
   @Override
-  public final Object assemble(final Serializable cached, final Object owner) {
-    return deepCopy(cached);
+  public final PJsonObject assemble(final Serializable cached, final Object owner) {
+    return deepCopy((PJsonObject) cached);
   }
 
   @Override
-  public final Object deepCopy(final Object value) {
+  public final PJsonObject deepCopy(final PJsonObject value) {
     if (value == null) {
       return null;
     } else {
       try {
-        return new PJsonObject(
-            new JSONObject(((PJsonObject) value).getInternalObj().toString()), CONTEXT_NAME);
+        return new PJsonObject(new JSONObject(value.getInternalObj().toString()), CONTEXT_NAME);
       } catch (JSONException e) {
         throw new RuntimeException(e);
       }
@@ -38,21 +37,21 @@ public final Object deepCopy(final Object value) {
   }
 
   @Override
-  public final Serializable disassemble(final Object value) {
+  public final Serializable disassemble(final PJsonObject value) {
     return (Serializable) deepCopy(value);
   }
 
   @Override
-  public final boolean equals(final Object x, final Object y) {
+  public final boolean equals(final PJsonObject x, final PJsonObject y) {
     if (x == null) {
-      return (y != null);
+      return y == null;
     } else {
-      return (x.equals(y));
+      return x.equals(y);
     }
   }
 
   @Override
-  public final int hashCode(final Object x) {
+  public final int hashCode(final PJsonObject x) {
     return x.hashCode();
   }
 
@@ -62,13 +61,13 @@ public final boolean isMutable() {
   }
 
   @Override
-  public final Object nullSafeGet(
+  public final PJsonObject nullSafeGet(
       final ResultSet rs,
-      final String[] names,
+      final int position,
       final SharedSessionContractImplementor session,
       final Object owner)
       throws SQLException {
-    String value = rs.getString(names[0]);
+    String value = rs.getString(position);
     if (value != null) {
       try {
         return new PJsonObject(new JSONObject(value), CONTEXT_NAME);
@@ -82,19 +81,20 @@ public final Object nullSafeGet(
   @Override
   public final void nullSafeSet(
       final PreparedStatement st,
-      final Object value,
+      final PJsonObject value,
       final int index,
       final SharedSessionContractImplementor session)
       throws SQLException {
     if (value == null) {
-      st.setNull(index, SQL_TYPES[0]);
+      st.setNull(index, SQL_TYPE);
     } else {
-      st.setString(index, ((PJsonObject) value).getInternalObj().toString());
+      st.setString(index, value.getInternalObj().toString());
     }
   }
 
   @Override
-  public final Object replace(final Object original, final Object target, final Object owner) {
+  public final PJsonObject replace(
+      final PJsonObject original, final PJsonObject target, final Object owner) {
     return deepCopy(original);
   }
 
@@ -104,7 +104,7 @@ public final Class<PJsonObject> returnedClass() {
   }
 
   @Override
-  public final int[] sqlTypes() {
-    return SQL_TYPES;
+  public final int getSqlType() {
+    return SQL_TYPE;
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index da25e85c7..51870ce65 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -2,16 +2,16 @@
 
 import jakarta.annotation.Nullable;
 import jakarta.annotation.PostConstruct;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Root;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
 import org.hibernate.LockMode;
 import org.hibernate.PessimisticLockException;
 import org.hibernate.Session;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
index 97f54b1a1..c839af946 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 import java.net.URI;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
 import org.mapfish.print.servlet.job.impl.PrintJobResultImpl;
 
 /** Extension of Print Job Result that holds data as BLOB. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
index f5a7b3554..cbba2e349 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
 import jakarta.annotation.Nullable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.impl.PrintJobStatusImpl;
 
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index 6813e3aa1..b4ffe98e1 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -1,412 +1,417 @@
 package org.mapfish.print;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.util.StatusPrinter2;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.TreeMap;
-import java.util.regex.Pattern;
-import javax.imageio.ImageIO;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.internal.TextListener;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runner.notification.RunListener;
-import org.locationtech.jts.util.Assert;
-import org.locationtech.jts.util.AssertionFailedException;
-import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.test.util.ImageSimilarity;
-import org.mapfish.print.url.data.Handler;
-import org.mapfish.print.wrapper.json.PJsonObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.verapdf.core.EncryptedPdfException;
-import org.verapdf.core.ModelParsingException;
-import org.verapdf.core.ValidationException;
-import org.verapdf.gf.model.GFModelParser;
-import org.verapdf.pdfa.PDFAValidator;
-import org.verapdf.pdfa.flavours.PDFAFlavour;
-import org.verapdf.pdfa.results.ValidationResult;
-import org.verapdf.pdfa.validation.validators.ValidatorFactory;
-
-/**
- * To run this test make sure that the test GeoServer is running:
- *
- * <p>./gradlew examples:farmRun
- *
- * <p>Or run the tests with the following task (which automatically starts the server):
- *
- * <p>./gradlew examples:geoserver
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML, ExamplesTest.TEST_SPRING_XML})
+//
+// import static org.junit.jupiter.api.Assertions.assertEquals;
+// import static org.junit.jupiter.api.Assertions.fail;
+//
+// import ch.qos.logback.classic.LoggerContext;
+// import ch.qos.logback.classic.joran.JoranConfigurator;
+// import ch.qos.logback.core.joran.spi.JoranException;
+// import ch.qos.logback.core.util.StatusPrinter2;
+// import java.awt.image.BufferedImage;
+// import java.io.File;
+// import java.io.IOException;
+// import java.io.InputStream;
+// import java.io.OutputStream;
+// import java.io.PrintWriter;
+// import java.io.StringWriter;
+// import java.net.HttpURLConnection;
+// import java.net.URI;
+// import java.net.URISyntaxException;
+// import java.net.URL;
+// import java.net.URLConnection;
+// import java.nio.charset.StandardCharsets;
+// import java.util.List;
+// import java.util.Map;
+// import java.util.Objects;
+// import java.util.TreeMap;
+// import java.util.regex.Pattern;
+// import javax.imageio.ImageIO;
+// import org.apache.commons.io.IOUtils;
+// import org.apache.commons.lang3.ArrayUtils;
+// import org.apache.commons.lang3.StringUtils;
+// import org.junit.internal.TextListener;
+// import org.junit.jupiter.api.BeforeAll;
+// import org.junit.jupiter.api.Test;
+// import org.junit.runner.JUnitCore;
+// import org.junit.runner.RunWith;
+// import org.junit.runner.notification.RunListener;
+// import org.locationtech.jts.util.Assert;
+// import org.locationtech.jts.util.AssertionFailedException;
+// import org.mapfish.print.servlet.MapPrinterServlet;
+// import org.mapfish.print.test.util.ImageSimilarity;
+// import org.mapfish.print.url.data.Handler;
+// import org.mapfish.print.wrapper.json.PJsonObject;
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.test.context.ContextConfiguration;
+// import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+// import org.verapdf.core.EncryptedPdfException;
+// import org.verapdf.core.ModelParsingException;
+// import org.verapdf.core.ValidationException;
+// import org.verapdf.gf.model.GFModelParser;
+// import org.verapdf.pdfa.PDFAValidator;
+// import org.verapdf.pdfa.flavours.PDFAFlavour;
+// import org.verapdf.pdfa.results.ValidationResult;
+// import org.verapdf.pdfa.validation.validators.ValidatorFactory;
+//
+/// **
+// * To run this test make sure that the test GeoServer is running:
+// *
+// * <p>./gradlew examples:farmRun
+// *
+// * <p>Or run the tests with the following task (which automatically starts the server):
+// *
+// * <p>./gradlew examples:geoserver
+// */
+// @RunWith(SpringJUnit4ClassRunner.class)
+// @ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML,
+// ExamplesTest.TEST_SPRING_XML})
 public class ExamplesTest {
-  public static final String DEFAULT_SPRING_XML =
-      "classpath:mapfish-spring-application-context.xml";
-  public static final String TEST_SPRING_XML =
-      "classpath:test-http-request-factory-application-context.xml";
-  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
-  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
-      Map.of(
-          "pdf", "application/pdf",
-          "png", "image/png",
-          "jpg", "image/jpeg",
-          "jpeg", "image/jpeg",
-          "tif", "image/tiff",
-          "tiff", "image/tiff",
-          "gif", "image/gif",
-          "bmp", "image/bmp");
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
-  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
-  private static final String CONFIG_FILE = "config.yaml";
-
-  /**
-   * If this system property is set then it will be interpreted as a regular expression and will be
-   * used to filter the examples that are run.
-   *
-   * <p>For example: -Dexamples.filter=verbose.*
-   *
-   * <p>will run all examples starting with verbose.
-   */
-  private static final String FILTER_PROPERTY = "examples.filter";
-
-  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
-  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
-  private static Pattern exampleFilter;
-  private static Pattern requestFilter;
-  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
-  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
-
-  static {
-    Handler.configureProtocolHandler();
-  }
-
-  @Autowired MapPrinter mapPrinter;
-
-  @BeforeAll
-  public static void setUp() {
-    final LoggerContext loggerContext = getLoggerContext();
-    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
-
-    String filterProperty = System.getProperty(FILTER_PROPERTY);
-    if (!StringUtils.isEmpty(filterProperty)) {
-      String[] parts = filterProperty.split("/", 2);
-
-      if (parts.length == 1) {
-        requestFilter = REQUEST_MATCH_ALL;
-      } else {
-        requestFilter = Pattern.compile(parts[1]);
-      }
-
-      exampleFilter = Pattern.compile(parts[0]);
-
-    } else {
-      requestFilter = REQUEST_MATCH_ALL;
-      exampleFilter = EXAMPLE_MATCH_ALL;
-    }
-  }
-
-  private static LoggerContext getLoggerContext() {
-    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
-    final URL logfile = classLoader.getResource("logback.xml");
-    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-    try {
-      final JoranConfigurator configurator = new JoranConfigurator();
-      configurator.setContext(loggerContext);
-      // Call context.reset() to clear any previous configuration, e.g. default
-      // configuration. For multi-step configuration, omit calling context.reset().
-      loggerContext.reset();
-      configurator.doConfigure(Objects.requireNonNull(logfile));
-    } catch (JoranException je) {
-      // StatusPrinter will handle this
-    }
-    return loggerContext;
-  }
-
-  private static File getFile(Class<?> testClass, String fileName) {
-    final URL resource = testClass.getResource(fileName);
-    if (resource == null) {
-      throw new AssertionError("Unable to find test resource: " + fileName);
-    }
-
-    return new File(resource.getFile());
-  }
-
-  public static void main(String[] args) {
-    JUnitCore junit = new JUnitCore();
-    if (args.length < 1) {
-      System.err.println(
-          "This main is expected to have at least one parameter, it is a regular "
-              + "expression for selecting the examples to run");
-      System.exit(1);
-    }
-    if (args.length > 2) {
-      System.err.println(
-          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
-              + "configRegexp");
-      System.exit(1);
-    }
-
-    String filter = args[0];
-    if (args.length == 2) {
-      filter += "/" + args[1];
-    }
-    System.setProperty(FILTER_PROPERTY, filter);
-    RunListener textListener = new TextListener(System.out);
-    junit.addListener(textListener);
-    junit.run(ExamplesTest.class);
-  }
-
-  @Test
-  public void testExampleDirectoryNames() {
-    final String namePattern = "[a-zA-Z0-9_]+";
-    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-    StringBuilder errors = new StringBuilder();
-    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
-        errors.append("\n    * ").append(examplesDir.getName());
-      }
-    }
-
-    assertEquals(
-        0,
-        errors.length(),
-        String.format(
-            "All example directory names must match the pattern: '%s'.  "
-                + "The following fail that test: %s",
-            namePattern, errors));
-  }
-
-  @Test
-  public void testAllExamples() {
-    Map<String, Throwable> errors = new TreeMap<>();
-
-    int testsRan = 0;
-    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-
-    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
-        testsRan += runExample(example, errors);
-      }
-    }
-
-    reportErrors(errors, testsRan);
-  }
-
-  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
-    if (!errors.isEmpty()) {
-      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
-        error.getValue().printStackTrace();
-      }
-
-      StringBuilder errorReport = new StringBuilder();
-      errorReport.append("\n");
-      errorReport.append(errors.size());
-      errorReport.append(" errors encountered while running ");
-      errorReport.append(testsRan);
-      errorReport.append(" examples.\n");
-      errorReport.append(
-          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
-      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-        StringBuilder exampleName = new StringBuilder();
-        exampleName.append("The example ");
-        exampleName.append(error.getKey());
-        errorReport.append(exampleName);
-        errorReport.append('\n');
-        //noinspection ReplaceAllDot
-        errorReport.append(exampleName.toString().replaceAll(".", "="));
-        errorReport.append('\n');
-        errorReport.append("Failed with the error:\n");
-        final StringWriter sw = new StringWriter();
-        error.getValue().printStackTrace(new PrintWriter(sw));
-        errorReport.append(sw);
-        errorReport.append('\n');
-      }
-      errorReport.append("\n\n");
-      fail(errorReport.toString());
-    }
-  }
-
-  private int runExample(File example, Map<String, Throwable> errors) {
-    int testsRan = 0;
-    try {
-      final File configFile = new File(example, CONFIG_FILE);
-      this.mapPrinter.setConfiguration(configFile);
-
-      if (!hasRequestFile(example)) {
-        throw new AssertionError(
-            String.format(
-                "Example: '%s' does not have any request data files.", example.getName()));
-      }
-      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
-        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
-          continue;
-        }
-        try {
-          if (isRequestDataFile(requestFile)) {
-            // WARN to be displayed in the Travis logs
-            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
-            String requestData =
-                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
-
-            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
-
-            testsRan++;
-            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
-            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
-
-            HttpURLConnection http =
-                createHttpUrlConnection(example.getName(), outputFormat, data.length);
-            http.connect();
-            try (OutputStream os = http.getOutputStream()) {
-              os.write(data);
-            }
-            int responseCode = http.getResponseCode();
-
-            InputStream inputStr = http.getInputStream();
-            if (responseCode != 200) {
-              String encoding =
-                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
-              String response = IOUtils.toString(inputStr, encoding);
-              Assert.isTrue(false, response);
-            }
-
-            Assert.equals(
-                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
-
-            if (requiringPdfAValidationTests.contains(example.getName())) {
-              pdfaValidate(errors, http, example.getName(), requestFile.getName());
-            } else {
-              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
-            }
-          }
-        } catch (IOException | AssertionError | RuntimeException e) {
-          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
-        }
-      }
-    } catch (IOException | RuntimeException | URISyntaxException e) {
-      errors.put(example.getName(), e);
-    }
-
-    return testsRan;
-  }
-
-  private void compareImages(
-      Map<String, Throwable> errors,
-      InputStream stream,
-      File example,
-      File requestFile,
-      String outputFormat)
-      throws IOException {
-    BufferedImage image = ImageIO.read(stream);
-    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
-      File expectedOutputDir = new File(example, "expected_output");
-      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
-      if (!expectedOutput.exists()) {
-        errors.put(
-            example.getName() + " (" + requestFile.getName() + ")",
-            new Exception("File not found: " + expectedOutput));
-      }
-
-      if (!"bmp".equals(outputFormat)) {
-        // BMP is not supported by ImageIO
-        new ImageSimilarity(expectedOutput).assertSimilarity(image);
-      }
-    }
-  }
-
-  private void pdfaValidate(
-      Map<String, Throwable> errors,
-      HttpURLConnection http,
-      String exampleName,
-      String requestFileName) {
-    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
-    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
-      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(), flavour);
-      ValidationResult result = validator.validate(parser);
-      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
-      Assert.isTrue(result.isCompliant());
-    } catch (EncryptedPdfException
-        | ModelParsingException
-        | ValidationException
-        | IOException
-        | AssertionFailedException e) {
-      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
-    }
-  }
-
-  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir) {
-    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
-    return new File(expectedOutputDir, imageName);
-  }
-
-  private boolean hasRequestFile(File example) {
-    for (File file : Objects.requireNonNull(example.listFiles())) {
-      if (isRequestDataFile(file)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private boolean isRequestDataFile(File requestFile) {
-    return requestFile.getName().matches(REQUEST_DATA_FILE);
-  }
-
-  private HttpURLConnection createHttpUrlConnection(
-      String exampleName, String outputFormat, int contentLength)
-      throws IOException, URISyntaxException {
-    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
-    http.setRequestMethod("POST");
-    http.setDoInput(true);
-    http.setDoOutput(true);
-    http.setFixedLengthStreamingMode(contentLength);
-    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-    return http;
-  }
-
-  private URLConnection createUrlConnection(String exampleName, String outputFormat)
-      throws IOException, URISyntaxException {
-    URL url =
-        URL.of(
-            new URI(
-                AbstractApiTest.PRINT_SERVER
-                    + "print/"
-                    + exampleName
-                    + MapPrinterServlet.CREATE_AND_GET_URL
-                    + "."
-                    + outputFormat),
-            null);
-    URLConnection connection = url.openConnection();
-    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
-    connection.setRequestProperty("Cache-Control", "max-age=0");
-    return connection;
-  }
+  //  public static final String DEFAULT_SPRING_XML =
+  //      "classpath:mapfish-spring-application-context.xml";
+  //  public static final String TEST_SPRING_XML =
+  //      "classpath:test-http-request-factory-application-context.xml";
+  //  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
+  //  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
+  //      Map.of(
+  //          "pdf", "application/pdf",
+  //          "png", "image/png",
+  //          "jpg", "image/jpeg",
+  //          "jpeg", "image/jpeg",
+  //          "tif", "image/tiff",
+  //          "tiff", "image/tiff",
+  //          "gif", "image/gif",
+  //          "bmp", "image/bmp");
+  //  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
+  //  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
+  //  private static final String CONFIG_FILE = "config.yaml";
+  //
+  //  /**
+  //   * If this system property is set then it will be interpreted as a regular expression and will
+  // be
+  //   * used to filter the examples that are run.
+  //   *
+  //   * <p>For example: -Dexamples.filter=verbose.*
+  //   *
+  //   * <p>will run all examples starting with verbose.
+  //   */
+  //  private static final String FILTER_PROPERTY = "examples.filter";
+  //
+  //  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
+  //  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
+  //  private static Pattern exampleFilter;
+  //  private static Pattern requestFilter;
+  //  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
+  //  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
+  //
+  //  static {
+  //    Handler.configureProtocolHandler();
+  //  }
+  //
+  //  @Autowired MapPrinter mapPrinter;
+  //
+  //  @BeforeAll
+  //  public static void setUp() {
+  //    final LoggerContext loggerContext = getLoggerContext();
+  //    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
+  //
+  //    String filterProperty = System.getProperty(FILTER_PROPERTY);
+  //    if (!StringUtils.isEmpty(filterProperty)) {
+  //      String[] parts = filterProperty.split("/", 2);
+  //
+  //      if (parts.length == 1) {
+  //        requestFilter = REQUEST_MATCH_ALL;
+  //      } else {
+  //        requestFilter = Pattern.compile(parts[1]);
+  //      }
+  //
+  //      exampleFilter = Pattern.compile(parts[0]);
+  //
+  //    } else {
+  //      requestFilter = REQUEST_MATCH_ALL;
+  //      exampleFilter = EXAMPLE_MATCH_ALL;
+  //    }
+  //  }
+  //
+  //  private static LoggerContext getLoggerContext() {
+  //    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
+  //    final URL logfile = classLoader.getResource("logback.xml");
+  //    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+  //    try {
+  //      final JoranConfigurator configurator = new JoranConfigurator();
+  //      configurator.setContext(loggerContext);
+  //      // Call context.reset() to clear any previous configuration, e.g. default
+  //      // configuration. For multi-step configuration, omit calling context.reset().
+  //      loggerContext.reset();
+  //      configurator.doConfigure(Objects.requireNonNull(logfile));
+  //    } catch (JoranException je) {
+  //      // StatusPrinter will handle this
+  //    }
+  //    return loggerContext;
+  //  }
+  //
+  //  private static File getFile(Class<?> testClass, String fileName) {
+  //    final URL resource = testClass.getResource(fileName);
+  //    if (resource == null) {
+  //      throw new AssertionError("Unable to find test resource: " + fileName);
+  //    }
+  //
+  //    return new File(resource.getFile());
+  //  }
+  //
+  //  public static void main(String[] args) {
+  //    JUnitCore junit = new JUnitCore();
+  //    if (args.length < 1) {
+  //      System.err.println(
+  //          "This main is expected to have at least one parameter, it is a regular "
+  //              + "expression for selecting the examples to run");
+  //      System.exit(1);
+  //    }
+  //    if (args.length > 2) {
+  //      System.err.println(
+  //          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
+  //              + "configRegexp");
+  //      System.exit(1);
+  //    }
+  //
+  //    String filter = args[0];
+  //    if (args.length == 2) {
+  //      filter += "/" + args[1];
+  //    }
+  //    System.setProperty(FILTER_PROPERTY, filter);
+  //    RunListener textListener = new TextListener(System.out);
+  //    junit.addListener(textListener);
+  //    junit.run(ExamplesTest.class);
+  //  }
+  //
+  //  @Test
+  //  public void testExampleDirectoryNames() {
+  //    final String namePattern = "[a-zA-Z0-9_]+";
+  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+  //    StringBuilder errors = new StringBuilder();
+  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+  //      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
+  //        errors.append("\n    * ").append(examplesDir.getName());
+  //      }
+  //    }
+  //
+  //    assertEquals(
+  //        0,
+  //        errors.length(),
+  //        String.format(
+  //            "All example directory names must match the pattern: '%s'.  "
+  //                + "The following fail that test: %s",
+  //            namePattern, errors));
+  //  }
+  //
+  //  @Test
+  //  public void testAllExamples() {
+  //    Map<String, Throwable> errors = new TreeMap<>();
+  //
+  //    int testsRan = 0;
+  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+  //
+  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+  //      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
+  //        testsRan += runExample(example, errors);
+  //      }
+  //    }
+  //
+  //    reportErrors(errors, testsRan);
+  //  }
+  //
+  //  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
+  //    if (!errors.isEmpty()) {
+  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+  //        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
+  //        error.getValue().printStackTrace();
+  //      }
+  //
+  //      StringBuilder errorReport = new StringBuilder();
+  //      errorReport.append("\n");
+  //      errorReport.append(errors.size());
+  //      errorReport.append(" errors encountered while running ");
+  //      errorReport.append(testsRan);
+  //      errorReport.append(" examples.\n");
+  //      errorReport.append(
+  //          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
+  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+  //        StringBuilder exampleName = new StringBuilder();
+  //        exampleName.append("The example ");
+  //        exampleName.append(error.getKey());
+  //        errorReport.append(exampleName);
+  //        errorReport.append('\n');
+  //        //noinspection ReplaceAllDot
+  //        errorReport.append(exampleName.toString().replaceAll(".", "="));
+  //        errorReport.append('\n');
+  //        errorReport.append("Failed with the error:\n");
+  //        final StringWriter sw = new StringWriter();
+  //        error.getValue().printStackTrace(new PrintWriter(sw));
+  //        errorReport.append(sw);
+  //        errorReport.append('\n');
+  //      }
+  //      errorReport.append("\n\n");
+  //      fail(errorReport.toString());
+  //    }
+  //  }
+  //
+  //  private int runExample(File example, Map<String, Throwable> errors) {
+  //    int testsRan = 0;
+  //    try {
+  //      final File configFile = new File(example, CONFIG_FILE);
+  //      this.mapPrinter.setConfiguration(configFile);
+  //
+  //      if (!hasRequestFile(example)) {
+  //        throw new AssertionError(
+  //            String.format(
+  //                "Example: '%s' does not have any request data files.", example.getName()));
+  //      }
+  //      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
+  //        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
+  //          continue;
+  //        }
+  //        try {
+  //          if (isRequestDataFile(requestFile)) {
+  //            // WARN to be displayed in the Travis logs
+  //            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
+  //            String requestData =
+  //                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
+  //
+  //            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
+  //
+  //            testsRan++;
+  //            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
+  //            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
+  //
+  //            HttpURLConnection http =
+  //                createHttpUrlConnection(example.getName(), outputFormat, data.length);
+  //            http.connect();
+  //            try (OutputStream os = http.getOutputStream()) {
+  //              os.write(data);
+  //            }
+  //            int responseCode = http.getResponseCode();
+  //
+  //            InputStream inputStr = http.getInputStream();
+  //            if (responseCode != 200) {
+  //              String encoding =
+  //                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
+  //              String response = IOUtils.toString(inputStr, encoding);
+  //              Assert.isTrue(false, response);
+  //            }
+  //
+  //            Assert.equals(
+  //                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
+  //
+  //            if (requiringPdfAValidationTests.contains(example.getName())) {
+  //              pdfaValidate(errors, http, example.getName(), requestFile.getName());
+  //            } else {
+  //              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
+  //            }
+  //          }
+  //        } catch (IOException | AssertionError | RuntimeException e) {
+  //          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
+  //        }
+  //      }
+  //    } catch (IOException | RuntimeException | URISyntaxException e) {
+  //      errors.put(example.getName(), e);
+  //    }
+  //
+  //    return testsRan;
+  //  }
+  //
+  //  private void compareImages(
+  //      Map<String, Throwable> errors,
+  //      InputStream stream,
+  //      File example,
+  //      File requestFile,
+  //      String outputFormat)
+  //      throws IOException {
+  //    BufferedImage image = ImageIO.read(stream);
+  //    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
+  //      File expectedOutputDir = new File(example, "expected_output");
+  //      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
+  //      if (!expectedOutput.exists()) {
+  //        errors.put(
+  //            example.getName() + " (" + requestFile.getName() + ")",
+  //            new Exception("File not found: " + expectedOutput));
+  //      }
+  //
+  //      if (!"bmp".equals(outputFormat)) {
+  //        // BMP is not supported by ImageIO
+  //        new ImageSimilarity(expectedOutput).assertSimilarity(image);
+  //      }
+  //    }
+  //  }
+  //
+  //  private void pdfaValidate(
+  //      Map<String, Throwable> errors,
+  //      HttpURLConnection http,
+  //      String exampleName,
+  //      String requestFileName) {
+  //    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
+  //    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
+  //      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(),
+  // flavour);
+  //      ValidationResult result = validator.validate(parser);
+  //      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
+  //      Assert.isTrue(result.isCompliant());
+  //    } catch (EncryptedPdfException
+  //        | ModelParsingException
+  //        | ValidationException
+  //        | IOException
+  //        | AssertionFailedException e) {
+  //      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
+  //    }
+  //  }
+  //
+  //  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir)
+  // {
+  //    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
+  //    return new File(expectedOutputDir, imageName);
+  //  }
+  //
+  //  private boolean hasRequestFile(File example) {
+  //    for (File file : Objects.requireNonNull(example.listFiles())) {
+  //      if (isRequestDataFile(file)) {
+  //        return true;
+  //      }
+  //    }
+  //    return false;
+  //  }
+  //
+  //  private boolean isRequestDataFile(File requestFile) {
+  //    return requestFile.getName().matches(REQUEST_DATA_FILE);
+  //  }
+  //
+  //  private HttpURLConnection createHttpUrlConnection(
+  //      String exampleName, String outputFormat, int contentLength)
+  //      throws IOException, URISyntaxException {
+  //    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
+  //    http.setRequestMethod("POST");
+  //    http.setDoInput(true);
+  //    http.setDoOutput(true);
+  //    http.setFixedLengthStreamingMode(contentLength);
+  //    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+  //    return http;
+  //  }
+  //
+  //  private URLConnection createUrlConnection(String exampleName, String outputFormat)
+  //      throws IOException, URISyntaxException {
+  //    URL url =
+  //        URL.of(
+  //            new URI(
+  //                AbstractApiTest.PRINT_SERVER
+  //                    + "print/"
+  //                    + exampleName
+  //                    + MapPrinterServlet.CREATE_AND_GET_URL
+  //                    + "."
+  //                    + outputFormat),
+  //            null);
+  //    URLConnection connection = url.openConnection();
+  //    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
+  //    connection.setRequestProperty("Cache-Control", "max-age=0");
+  //    return connection;
+  //  }
 }

From 8be3a1811e0d47cf2348f3757f79eadc506e81d7 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 8 Dec 2025 13:10:09 +0100
Subject: [PATCH 09/61] Fixed deserializing HttpMethod

---
 .../mapfish/print/parser/MapfishParser.java   |  3 ++
 .../job/impl/hibernate/PrintJobDao.java       | 12 ++----
 .../resources/mapfish-spring-hibernate.xml    | 10 -----
 .../http/ConfigFileResolvingRequestTest.java  |  3 +-
 .../print/http/HttpCredentialTest.java        | 41 ++++++++++++++-----
 .../org/mapfish/print/http/HttpProxyTest.java |  6 +--
 .../map/style/ParserPluginUtilsTest.java      |  3 +-
 ...reateMapPagesFailOnErrorProcessorTest.java |  8 +++-
 .../resources/mapfish-spring-hibernate.xml    | 10 -----
 9 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/parser/MapfishParser.java b/core/src/main/java/org/mapfish/print/parser/MapfishParser.java
index e06049958..3d8e5d5e8 100644
--- a/core/src/main/java/org/mapfish/print/parser/MapfishParser.java
+++ b/core/src/main/java/org/mapfish/print/parser/MapfishParser.java
@@ -28,6 +28,7 @@
 import org.mapfish.print.wrapper.PObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
 
 /**
  * This class parses json parameter objects into the parameter object taken by {@link
@@ -251,6 +252,8 @@ private static Object parseValue(
       }
     } else if (type.isEnum()) {
       value = parseEnum(type, layer.getPath(fieldName), layer.getString(name));
+    } else if (type == HttpMethod.class) {
+      value = HttpMethod.valueOf(layer.getString(name).toUpperCase());
     } else {
       try {
         value = type.getDeclaredConstructor().newInstance();
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index 51870ce65..3d5a93445 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
 import jakarta.annotation.Nullable;
-import jakarta.annotation.PostConstruct;
+import jakarta.persistence.PessimisticLockException;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -13,7 +13,6 @@
 import java.util.Collections;
 import java.util.List;
 import org.hibernate.LockMode;
-import org.hibernate.PessimisticLockException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
@@ -25,12 +24,6 @@ public class PrintJobDao {
 
   @Autowired private SessionFactory sf;
 
-  /** Initialize db manager. */
-  @PostConstruct
-  public final void init() {
-    this.sf.openSession();
-  }
-
   private Session getSession() {
     return this.sf.getCurrentSession();
   }
@@ -226,7 +219,8 @@ public final List<PrintJobStatusExtImpl> poll(final int size) {
     query.setMaxResults(size);
     // LOCK but don't wait for release (since this is run continuously
     // anyway, no wait prevents deadlock)
-    query.setLockMode("pj", LockMode.UPGRADE_NOWAIT);
+    query.setLockMode("pj", LockMode.PESSIMISTIC_WRITE);
+    query.setHint("jakarta.persistence.lock.timeout", 0);
     try {
       return query.getResultList();
     } catch (PessimisticLockException ex) {
diff --git a/core/src/main/resources/mapfish-spring-hibernate.xml b/core/src/main/resources/mapfish-spring-hibernate.xml
index 77c884d33..7e0b74f2c 100644
--- a/core/src/main/resources/mapfish-spring-hibernate.xml
+++ b/core/src/main/resources/mapfish-spring-hibernate.xml
@@ -8,16 +8,6 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
-        <property name="annotatedClasses">
-            <list>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobEntryImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobStatusImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobResultImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobStatusExtImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobResultExtImpl</value>
-                <value>org.mapfish.print.servlet.job.HibernateAccountingEntry</value>
-            </list>
-        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
index 9ba1f2711..7cdb89d05 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
@@ -13,6 +13,7 @@
 import org.mapfish.print.PrintException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
 
 public class ConfigFileResolvingRequestTest {
@@ -108,7 +109,7 @@ private MfClientHttpRequestFactoryImpl.Request initTestDefaultBehaviour(
 
   private ClientHttpResponse createResponse(final int statusCode) throws IOException {
     var clientHttpResponse = mock(ClientHttpResponse.class);
-    when(clientHttpResponse.getStatusCode().value()).thenReturn(statusCode);
+    when(clientHttpResponse.getStatusCode()).thenReturn(HttpStatusCode.valueOf(statusCode));
     return clientHttpResponse;
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index db091347c..5ecd92883 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -19,9 +19,9 @@
 import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
     locations = {
       AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
@@ -80,30 +80,51 @@ public void testToCredentials() throws Exception {
     final Credentials object = credential.toCredentials(authscope);
     assertNotNull(object);
     assertEquals(USERNAME, object.getUserPrincipal().getName());
-    assertEquals(PASSWORD, object.getPassword());
+    assertEquals(PASSWORD, new String(object.getPassword()));
 
     authscope =
         new AuthScope(
-            MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
+            MatchInfo.ANY_PORT,
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
         new AuthScope(
-          MatchInfo.ANY_SCHEME,
-          MatchInfo.ANY_HOST,
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
             HttpProxyTest.HTTPS_PROXY_PORT,
             MatchInfo.ANY_REALM,
             MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
+    authscope =
+        new AuthScope(
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
+            80,
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
-        new AuthScope(MatchInfo.ANY_SCHEME, "google.com", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
+        new AuthScope(
+            MatchInfo.ANY_SCHEME,
+            "google.com",
+            MatchInfo.ANY_PORT,
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http");
+    authscope =
+        new AuthScope(
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
+            MatchInfo.ANY_PORT,
+            MatchInfo.ANY_REALM,
+            "http");
     assertNotNull(credential.toCredentials(authscope));
   }
 
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index f4e6ce304..fdba68af7 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
@@ -45,9 +45,9 @@
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
     locations = {
       AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
diff --git a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
index 36be930ec..fd974fd92 100644
--- a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
@@ -41,7 +42,7 @@ private static Optional<Style> testLoadingStyleWithStatusCode(
 
     when(factory.createRequest(new URI("http://valid.uri"), HttpMethod.GET)).thenReturn(request);
     when(request.execute()).thenReturn(response);
-    when(response.getStatusCode().value()).thenReturn(httpStatusCode);
+    when(response.getStatusCode()).thenReturn(HttpStatusCode.valueOf(httpStatusCode));
     when(response.getBody())
         .thenReturn(
             new ByteArrayInputStream(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
index 1dd7b7743..d2e058075 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
@@ -91,7 +91,13 @@ private void testPrint(
           new HashMap<>(), requestData, config, config.getDirectory(), getTaskDirectory());
       Assertions.fail("Generation was not canceled");
     } catch (Exception e) {
-      Assertions.assertTrue(e instanceof ExecutionException);
+      if (!(e instanceof ExecutionException)) {
+        e.printStackTrace(System.err);
+      }
+      Assertions.assertTrue(
+          e instanceof ExecutionException,
+          String.format(
+              "Expected ExecutionException, got %s (%s)", e.getClass().getName(), e.getMessage()));
     } finally {
       Assertions.assertTrue(
           wmsRequestsNb.get() < maxWmsRequestsNumber,
diff --git a/core/src/test/resources/mapfish-spring-hibernate.xml b/core/src/test/resources/mapfish-spring-hibernate.xml
index e1b82d348..cf7623d47 100644
--- a/core/src/test/resources/mapfish-spring-hibernate.xml
+++ b/core/src/test/resources/mapfish-spring-hibernate.xml
@@ -8,16 +8,6 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
-        <property name="annotatedClasses">
-            <list>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobEntryImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobStatusImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobResultImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobStatusExtImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobResultExtImpl</value>
-                <value>org.mapfish.print.servlet.job.HibernateAccountingEntry</value>
-            </list>
-        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update

From 1a63fc3a262b1522043d2534ee19a8f3a761729d Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 8 Dec 2025 14:45:53 +0100
Subject: [PATCH 10/61] Fixed NotAnEntity exception

---
 core/src/main/resources/mapfish-spring-hibernate.xml | 7 +++++++
 core/src/test/resources/mapfish-spring-hibernate.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/core/src/main/resources/mapfish-spring-hibernate.xml b/core/src/main/resources/mapfish-spring-hibernate.xml
index 7e0b74f2c..894a62baa 100644
--- a/core/src/main/resources/mapfish-spring-hibernate.xml
+++ b/core/src/main/resources/mapfish-spring-hibernate.xml
@@ -8,6 +8,13 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
+        <property name="packagesToScan">
+            <array>
+<!--                <value>org.mapfish.print.servlet.job</value>-->
+                <value>org.mapfish.print.servlet.job.impl</value>
+                <value>org.mapfish.print.servlet.job.impl.hibernate</value>
+            </array>
+        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update
diff --git a/core/src/test/resources/mapfish-spring-hibernate.xml b/core/src/test/resources/mapfish-spring-hibernate.xml
index cf7623d47..dbdf715ea 100644
--- a/core/src/test/resources/mapfish-spring-hibernate.xml
+++ b/core/src/test/resources/mapfish-spring-hibernate.xml
@@ -8,6 +8,13 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
+        <property name="packagesToScan">
+            <array>
+                <value>org.mapfish.print.servlet.job</value>
+                <value>org.mapfish.print.servlet.job.impl</value>
+                <value>org.mapfish.print.servlet.job.impl.hibernate</value>
+            </array>
+        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update

From 3764f607bd479c481448a6c71c08bd41ad9eeefa Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Tue, 9 Dec 2025 17:27:24 +0100
Subject: [PATCH 11/61] Fixed proxy and http auth parameters passing

---
 .../java/org/mapfish/print/VersionInfo.java   |  2 +-
 .../mapfish/print/http/HttpCredential.java    |  9 +------
 .../http/MfClientHttpRequestFactoryImpl.java  | 11 +++++++-
 .../mapfish/print/http/MfRoutePlanner.java    | 26 +++++++++----------
 .../org/mapfish/print/http/HttpProxyTest.java |  2 +-
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/VersionInfo.java b/core/src/main/java/org/mapfish/print/VersionInfo.java
index c7008d5ab..6d322e19e 100644
--- a/core/src/main/java/org/mapfish/print/VersionInfo.java
+++ b/core/src/main/java/org/mapfish/print/VersionInfo.java
@@ -2,13 +2,13 @@
 
 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.servlet.ServletContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index e8bb16bce..c34e4d39f 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -106,13 +106,6 @@ public final Credentials toCredentials(final AuthScope authscope) {
     if (this.username == null) {
       return null;
     }
-
-    final String passwordString;
-    if (this.password != null) {
-      passwordString = new String(this.password);
-    } else {
-      passwordString = null;
-    }
-    return new UsernamePasswordCredentials(this.username, passwordString.toCharArray());
+    return new UsernamePasswordCredentials(this.username, this.password);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index bd8147d9c..9591724e3 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -25,6 +25,7 @@
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
@@ -73,6 +74,13 @@ public MfClientHttpRequestFactoryImpl(
             connectionRequestTimeout,
             connectTimeout,
             socketTimeout));
+    setHttpContextFactory(
+        ((httpMethod, uri) -> {
+          var context = HttpClientContext.create();
+          context.setAttribute("request-uri", uri);
+          context.setAttribute("request-method", httpMethod);
+          return (HttpContext) context;
+        }));
   }
 
   @Nullable
@@ -231,7 +239,8 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
         entityEnclosingRequest.setEntity(requestEntity);
       }
 
-      ClassicHttpResponse response = this.client.executeOpen(null, this.request, this.context);
+      ClassicHttpResponse response =
+          (ClassicHttpResponse) this.client.execute(this.request, this.context);
       LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index 7598c812c..a8533f508 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -29,23 +29,23 @@ public MfRoutePlanner() {
   }
 
   @Override
-  protected HttpHost determineProxy(final HttpHost target, final HttpContext context) throws HttpException {
+  protected HttpHost determineProxy(final HttpHost target, final HttpContext context)
+      throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
-    if (config == null) {
+    if (config == null || context == null) {
       return null;
     }
-    var coreCtx = HttpCoreContext.cast(context);
-    if (coreCtx == null || coreCtx.getRequest() == null) {
-      return null;
-    }
-    var request = coreCtx.getRequest();
-    final URI uri;
-    try {
-      uri = request.getUri();
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    var ctx = HttpCoreContext.cast(context);
+    var uri = (URI) ctx.getAttribute("request-uri");
+    var method = (HttpMethod) ctx.getAttribute("request-method");
+    if (ctx.getRequest() != null) {
+      try {
+        uri = ctx.getRequest().getUri();
+        method = HttpMethod.valueOf(ctx.getRequest().getMethod());
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
     }
-    HttpMethod method = HttpMethod.valueOf(request.getMethod());
 
     final List<HttpProxy> proxies = config.getProxies();
     for (HttpProxy proxy : proxies) {
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index fdba68af7..534aea34f 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -230,7 +230,7 @@ public void testExecuteProxyWithUsername() throws Exception {
             httpExchange.sendResponseHeaders(401, 0);
             httpExchange.close();
           } else {
-            final String expectedAuth = "Basic dXNlcm5hbWU6bnVsbA==";
+            final String expectedAuth = "Basic dXNlcm5hbWU6";
             if (authorization.equals(expectedAuth)) {
               respond(httpExchange, MESSAGE_FROM_PROXY, 200);
             } else {

From 78bc2ecc40821b2c7f5bb7300b3646a0b5984bec Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Wed, 10 Dec 2025 18:14:07 +0100
Subject: [PATCH 12/61] Spring-security fix for the server

---
 core/Dockerfile                               |   2 +-
 core/build.gradle                             | 153 +++++++++---------
 .../print/servlet/MapPrinterServlet.java      |  16 +-
 .../print/servlet/RequestSizeFilter.java      |  14 +-
 .../impl/hibernate/PJsonObjectUserType.java   |   6 +-
 .../resources/mapfish-spring-security.xml     |  10 +-
 core/src/main/webapp/WEB-INF/web.xml          |   4 +-
 docs/build.gradle                             |   1 -
 8 files changed, 106 insertions(+), 100 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index bf93d4ecd..0ce57bb87 100644
--- a/core/Dockerfile
+++ b/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 <info@camptocamp.com>"
 
 RUN --mount=type=cache,target=/var/cache,sharing=locked \
diff --git a/core/build.gradle b/core/build.gradle
index 02f89cedd..00a6db3b5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -126,86 +126,89 @@ configurations {
 
 dependencies {
     implementation(
-            'org.springframework:spring-context: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:5.8.16',
-            'org.springframework.security:spring-security-web:5.8.16',
-            'com.thetransactioncompany:cors-filter:2.10',
-            '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'
+        '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.0',
+        'org.springframework.security:spring-security-web:7.0.0',
+        '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-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',
+        '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.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',
     )
 
     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'
@@ -231,14 +234,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')
     )
 }
 
@@ -283,7 +286,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')
         }
     }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index d5ba140c8..38a37bede 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -119,8 +119,8 @@ public class MapPrinterServlet extends BaseMapServlet {
   /**
    * If the job is done (value is true) or not (value is false).
    *
-   * <p>Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response.
+   * <p>Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response.
    */
   public static final String JSON_DONE = "done";
 
@@ -135,8 +135,8 @@ public class MapPrinterServlet extends BaseMapServlet {
    *   <li>error
    * </ul>
    *
-   * Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response
+   * Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response
    */
   public static final String JSON_STATUS = STATUS;
 
@@ -144,8 +144,8 @@ public class MapPrinterServlet extends BaseMapServlet {
    * The elapsed time in ms from the point the job started. If the job is finished, this is the
    * duration it took to process the job.
    *
-   * <p>Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response.
+   * <p>Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response.
    */
   public static final String JSON_ELAPSED_TIME = "elapsedTime";
 
@@ -153,8 +153,8 @@ public class MapPrinterServlet extends BaseMapServlet {
    * A rough estimate for the time in ms the job still has to wait in the queue until it starts
    * processing.
    *
-   * <p>Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response.
+   * <p>Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response.
    */
   public static final String JSON_WAITING_TIME = "waitingTime";
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java b/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java
index 22c9e0dd3..79c9b9075 100644
--- a/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java
+++ b/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
index 1620a273e..4bb3ce320 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
+import java.io.InvalidClassException;
 import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -20,7 +21,10 @@ public class PJsonObjectUserType implements UserType<PJsonObject> {
 
   @Override
   public final PJsonObject assemble(final Serializable cached, final Object owner) {
-    return deepCopy((PJsonObject) cached);
+    if (cached instanceof PJsonObject value) {
+      return deepCopy(value);
+    }
+    throw new RuntimeException(new InvalidClassException(cached.getClass().getName()));
   }
 
   @Override
diff --git a/core/src/main/resources/mapfish-spring-security.xml b/core/src/main/resources/mapfish-spring-security.xml
index ab3946b02..79d7e8dd6 100644
--- a/core/src/main/resources/mapfish-spring-security.xml
+++ b/core/src/main/resources/mapfish-spring-security.xml
@@ -5,14 +5,14 @@
              xmlns="http://www.springframework.org/schema/security"
              xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-7.0.xsd">
 
     <!-- needed to allow double slashes in the URLs -->
-    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">
-        <beans:property name="allowUrlEncodedSlash" value="true"/>
-    </beans:bean>
+<!--    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">-->
+<!--        <beans:property name="allowUrlEncodedSlash" value="true"/>-->
+<!--    </beans:bean>-->
 
-    <http-firewall ref="httpFirewall"/>
+<!--    <http-firewall ref="httpFirewall"/>-->
 
     <http use-expressions="true">
         <!-- in order to get a challenge (for capabilities for example) you need to use the print/sec/* urls -->
diff --git a/core/src/main/webapp/WEB-INF/web.xml b/core/src/main/webapp/WEB-INF/web.xml
index ca3cec8e2..69d4be0a2 100644
--- a/core/src/main/webapp/WEB-INF/web.xml
+++ b/core/src/main/webapp/WEB-INF/web.xml
@@ -71,7 +71,7 @@
 
     <filter>
         <filter-name>instrumentedFilter</filter-name>
-        <filter-class>com.codahale.metrics.servlet.InstrumentedFilter</filter-class>
+        <filter-class>io.dropwizard.metrics.servlet.InstrumentedFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>instrumentedFilter</filter-name>
@@ -101,7 +101,7 @@
 
     <servlet>
         <servlet-name>metrics-servlet</servlet-name>
-        <servlet-class>com.codahale.metrics.servlets.AdminServlet</servlet-class>
+        <servlet-class>io.dropwizard.metrics.servlets.AdminServlet</servlet-class>
     </servlet>
 
     <!-- single mapping to spring, this only works properly if the advanced dispatch filter is
diff --git a/docs/build.gradle b/docs/build.gradle
index 18632a540..a8e32898d 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -28,7 +28,6 @@ dependencies {
             "org.springframework:spring-beans:7.0.1",
             "org.springframework:spring-web:7.0.1",
             "org.springframework:spring-context:7.0.1",
-            'javax.servlet:javax.servlet-api:4.0.1'
     )
 }
 

From 7ba17416c3784a728d5bf97a7b383aa32e9aafb5 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 11 Dec 2025 10:40:08 +0100
Subject: [PATCH 13/61] Remove channel enforcing in the spring config.

HTTPs handling should be moved to web.xml
---
 core/src/main/resources/mapfish-spring-security.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/mapfish-spring-security.xml b/core/src/main/resources/mapfish-spring-security.xml
index 79d7e8dd6..830c47f3b 100644
--- a/core/src/main/resources/mapfish-spring-security.xml
+++ b/core/src/main/resources/mapfish-spring-security.xml
@@ -8,16 +8,15 @@
         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-7.0.xsd">
 
     <!-- needed to allow double slashes in the URLs -->
-<!--    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">-->
-<!--        <beans:property name="allowUrlEncodedSlash" value="true"/>-->
-<!--    </beans:bean>-->
+    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">
+        <beans:property name="allowUrlEncodedSlash" value="true"/>
+    </beans:bean>
 
-<!--    <http-firewall ref="httpFirewall"/>-->
+    <http-firewall ref="httpFirewall"/>
 
     <http use-expressions="true">
-        <!-- in order to get a challenge (for capabilities for example) you need to use the print/sec/* urls -->
         <csrf disabled="true"/>
-        <intercept-url pattern="/sec/print/**" requires-channel="https" access="isAuthenticated()"/>
+        <intercept-url pattern="/sec/print/**" access="isAuthenticated()"/>
         <intercept-url pattern="/**" access="permitAll()"/>
         <http-basic/>
         <anonymous/>

From 3c82c586f56d40d4bafb11414ccbec46d5add168 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 11 Dec 2025 12:40:31 +0100
Subject: [PATCH 14/61] Migrated 'examples' code

---
 examples/build.gradle                         |   3 +-
 .../java/org/mapfish/print/ExamplesTest.java  | 837 +++++++++---------
 2 files changed, 426 insertions(+), 414 deletions(-)

diff --git a/examples/build.gradle b/examples/build.gradle
index d2817ea62..17f7f7aa2 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -23,7 +23,8 @@ dependencies {
         "org.springframework:spring-test:7.0.1",
         "ch.qos.logback:logback-classic:1.5.15",
         "org.verapdf:validation-model:1.24.1",
-        "junit:junit:4.13.2",
+        'org.junit.platform:junit-platform-launcher:6.0.1',
+
     )
 }
 
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index b4ffe98e1..b44d995e0 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -1,417 +1,428 @@
 package org.mapfish.print;
 
-//
-// import static org.junit.jupiter.api.Assertions.assertEquals;
-// import static org.junit.jupiter.api.Assertions.fail;
-//
-// import ch.qos.logback.classic.LoggerContext;
-// import ch.qos.logback.classic.joran.JoranConfigurator;
-// import ch.qos.logback.core.joran.spi.JoranException;
-// import ch.qos.logback.core.util.StatusPrinter2;
-// import java.awt.image.BufferedImage;
-// import java.io.File;
-// import java.io.IOException;
-// import java.io.InputStream;
-// import java.io.OutputStream;
-// import java.io.PrintWriter;
-// import java.io.StringWriter;
-// import java.net.HttpURLConnection;
-// import java.net.URI;
-// import java.net.URISyntaxException;
-// import java.net.URL;
-// import java.net.URLConnection;
-// import java.nio.charset.StandardCharsets;
-// import java.util.List;
-// import java.util.Map;
-// import java.util.Objects;
-// import java.util.TreeMap;
-// import java.util.regex.Pattern;
-// import javax.imageio.ImageIO;
-// import org.apache.commons.io.IOUtils;
-// import org.apache.commons.lang3.ArrayUtils;
-// import org.apache.commons.lang3.StringUtils;
-// import org.junit.internal.TextListener;
-// import org.junit.jupiter.api.BeforeAll;
-// import org.junit.jupiter.api.Test;
-// import org.junit.runner.JUnitCore;
-// import org.junit.runner.RunWith;
-// import org.junit.runner.notification.RunListener;
-// import org.locationtech.jts.util.Assert;
-// import org.locationtech.jts.util.AssertionFailedException;
-// import org.mapfish.print.servlet.MapPrinterServlet;
-// import org.mapfish.print.test.util.ImageSimilarity;
-// import org.mapfish.print.url.data.Handler;
-// import org.mapfish.print.wrapper.json.PJsonObject;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
-// import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.test.context.ContextConfiguration;
-// import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-// import org.verapdf.core.EncryptedPdfException;
-// import org.verapdf.core.ModelParsingException;
-// import org.verapdf.core.ValidationException;
-// import org.verapdf.gf.model.GFModelParser;
-// import org.verapdf.pdfa.PDFAValidator;
-// import org.verapdf.pdfa.flavours.PDFAFlavour;
-// import org.verapdf.pdfa.results.ValidationResult;
-// import org.verapdf.pdfa.validation.validators.ValidatorFactory;
-//
-/// **
-// * To run this test make sure that the test GeoServer is running:
-// *
-// * <p>./gradlew examples:farmRun
-// *
-// * <p>Or run the tests with the following task (which automatically starts the server):
-// *
-// * <p>./gradlew examples:geoserver
-// */
-// @RunWith(SpringJUnit4ClassRunner.class)
-// @ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML,
-// ExamplesTest.TEST_SPRING_XML})
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter2;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
+import javax.imageio.ImageIO;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.AssertionFailedException;
+import org.mapfish.print.servlet.MapPrinterServlet;
+import org.mapfish.print.test.util.ImageSimilarity;
+import org.mapfish.print.url.data.Handler;
+import org.mapfish.print.wrapper.json.PJsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.verapdf.core.EncryptedPdfException;
+import org.verapdf.core.ModelParsingException;
+import org.verapdf.core.ValidationException;
+import org.verapdf.gf.model.GFModelParser;
+import org.verapdf.pdfa.PDFAValidator;
+import org.verapdf.pdfa.flavours.PDFAFlavour;
+import org.verapdf.pdfa.results.ValidationResult;
+import org.verapdf.pdfa.validation.validators.ValidatorFactory;
+
+/**
+ * To run this test make sure that the test GeoServer is running:
+ *
+ * <p>./gradlew examples:farmRun
+ *
+ * <p>Or run the tests with the following task (which automatically starts the server):
+ *
+ * <p>./gradlew examples:geoserver
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML, ExamplesTest.TEST_SPRING_XML})
 public class ExamplesTest {
-  //  public static final String DEFAULT_SPRING_XML =
-  //      "classpath:mapfish-spring-application-context.xml";
-  //  public static final String TEST_SPRING_XML =
-  //      "classpath:test-http-request-factory-application-context.xml";
-  //  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
-  //  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
-  //      Map.of(
-  //          "pdf", "application/pdf",
-  //          "png", "image/png",
-  //          "jpg", "image/jpeg",
-  //          "jpeg", "image/jpeg",
-  //          "tif", "image/tiff",
-  //          "tiff", "image/tiff",
-  //          "gif", "image/gif",
-  //          "bmp", "image/bmp");
-  //  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
-  //  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
-  //  private static final String CONFIG_FILE = "config.yaml";
-  //
-  //  /**
-  //   * If this system property is set then it will be interpreted as a regular expression and will
-  // be
-  //   * used to filter the examples that are run.
-  //   *
-  //   * <p>For example: -Dexamples.filter=verbose.*
-  //   *
-  //   * <p>will run all examples starting with verbose.
-  //   */
-  //  private static final String FILTER_PROPERTY = "examples.filter";
-  //
-  //  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
-  //  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
-  //  private static Pattern exampleFilter;
-  //  private static Pattern requestFilter;
-  //  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
-  //  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
-  //
-  //  static {
-  //    Handler.configureProtocolHandler();
-  //  }
-  //
-  //  @Autowired MapPrinter mapPrinter;
-  //
-  //  @BeforeAll
-  //  public static void setUp() {
-  //    final LoggerContext loggerContext = getLoggerContext();
-  //    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
-  //
-  //    String filterProperty = System.getProperty(FILTER_PROPERTY);
-  //    if (!StringUtils.isEmpty(filterProperty)) {
-  //      String[] parts = filterProperty.split("/", 2);
-  //
-  //      if (parts.length == 1) {
-  //        requestFilter = REQUEST_MATCH_ALL;
-  //      } else {
-  //        requestFilter = Pattern.compile(parts[1]);
-  //      }
-  //
-  //      exampleFilter = Pattern.compile(parts[0]);
-  //
-  //    } else {
-  //      requestFilter = REQUEST_MATCH_ALL;
-  //      exampleFilter = EXAMPLE_MATCH_ALL;
-  //    }
-  //  }
-  //
-  //  private static LoggerContext getLoggerContext() {
-  //    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
-  //    final URL logfile = classLoader.getResource("logback.xml");
-  //    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-  //    try {
-  //      final JoranConfigurator configurator = new JoranConfigurator();
-  //      configurator.setContext(loggerContext);
-  //      // Call context.reset() to clear any previous configuration, e.g. default
-  //      // configuration. For multi-step configuration, omit calling context.reset().
-  //      loggerContext.reset();
-  //      configurator.doConfigure(Objects.requireNonNull(logfile));
-  //    } catch (JoranException je) {
-  //      // StatusPrinter will handle this
-  //    }
-  //    return loggerContext;
-  //  }
-  //
-  //  private static File getFile(Class<?> testClass, String fileName) {
-  //    final URL resource = testClass.getResource(fileName);
-  //    if (resource == null) {
-  //      throw new AssertionError("Unable to find test resource: " + fileName);
-  //    }
-  //
-  //    return new File(resource.getFile());
-  //  }
-  //
-  //  public static void main(String[] args) {
-  //    JUnitCore junit = new JUnitCore();
-  //    if (args.length < 1) {
-  //      System.err.println(
-  //          "This main is expected to have at least one parameter, it is a regular "
-  //              + "expression for selecting the examples to run");
-  //      System.exit(1);
-  //    }
-  //    if (args.length > 2) {
-  //      System.err.println(
-  //          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
-  //              + "configRegexp");
-  //      System.exit(1);
-  //    }
-  //
-  //    String filter = args[0];
-  //    if (args.length == 2) {
-  //      filter += "/" + args[1];
-  //    }
-  //    System.setProperty(FILTER_PROPERTY, filter);
-  //    RunListener textListener = new TextListener(System.out);
-  //    junit.addListener(textListener);
-  //    junit.run(ExamplesTest.class);
-  //  }
-  //
-  //  @Test
-  //  public void testExampleDirectoryNames() {
-  //    final String namePattern = "[a-zA-Z0-9_]+";
-  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-  //    StringBuilder errors = new StringBuilder();
-  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-  //      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
-  //        errors.append("\n    * ").append(examplesDir.getName());
-  //      }
-  //    }
-  //
-  //    assertEquals(
-  //        0,
-  //        errors.length(),
-  //        String.format(
-  //            "All example directory names must match the pattern: '%s'.  "
-  //                + "The following fail that test: %s",
-  //            namePattern, errors));
-  //  }
-  //
-  //  @Test
-  //  public void testAllExamples() {
-  //    Map<String, Throwable> errors = new TreeMap<>();
-  //
-  //    int testsRan = 0;
-  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-  //
-  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-  //      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
-  //        testsRan += runExample(example, errors);
-  //      }
-  //    }
-  //
-  //    reportErrors(errors, testsRan);
-  //  }
-  //
-  //  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
-  //    if (!errors.isEmpty()) {
-  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-  //        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
-  //        error.getValue().printStackTrace();
-  //      }
-  //
-  //      StringBuilder errorReport = new StringBuilder();
-  //      errorReport.append("\n");
-  //      errorReport.append(errors.size());
-  //      errorReport.append(" errors encountered while running ");
-  //      errorReport.append(testsRan);
-  //      errorReport.append(" examples.\n");
-  //      errorReport.append(
-  //          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
-  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-  //        StringBuilder exampleName = new StringBuilder();
-  //        exampleName.append("The example ");
-  //        exampleName.append(error.getKey());
-  //        errorReport.append(exampleName);
-  //        errorReport.append('\n');
-  //        //noinspection ReplaceAllDot
-  //        errorReport.append(exampleName.toString().replaceAll(".", "="));
-  //        errorReport.append('\n');
-  //        errorReport.append("Failed with the error:\n");
-  //        final StringWriter sw = new StringWriter();
-  //        error.getValue().printStackTrace(new PrintWriter(sw));
-  //        errorReport.append(sw);
-  //        errorReport.append('\n');
-  //      }
-  //      errorReport.append("\n\n");
-  //      fail(errorReport.toString());
-  //    }
-  //  }
-  //
-  //  private int runExample(File example, Map<String, Throwable> errors) {
-  //    int testsRan = 0;
-  //    try {
-  //      final File configFile = new File(example, CONFIG_FILE);
-  //      this.mapPrinter.setConfiguration(configFile);
-  //
-  //      if (!hasRequestFile(example)) {
-  //        throw new AssertionError(
-  //            String.format(
-  //                "Example: '%s' does not have any request data files.", example.getName()));
-  //      }
-  //      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
-  //        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
-  //          continue;
-  //        }
-  //        try {
-  //          if (isRequestDataFile(requestFile)) {
-  //            // WARN to be displayed in the Travis logs
-  //            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
-  //            String requestData =
-  //                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
-  //
-  //            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
-  //
-  //            testsRan++;
-  //            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
-  //            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
-  //
-  //            HttpURLConnection http =
-  //                createHttpUrlConnection(example.getName(), outputFormat, data.length);
-  //            http.connect();
-  //            try (OutputStream os = http.getOutputStream()) {
-  //              os.write(data);
-  //            }
-  //            int responseCode = http.getResponseCode();
-  //
-  //            InputStream inputStr = http.getInputStream();
-  //            if (responseCode != 200) {
-  //              String encoding =
-  //                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
-  //              String response = IOUtils.toString(inputStr, encoding);
-  //              Assert.isTrue(false, response);
-  //            }
-  //
-  //            Assert.equals(
-  //                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
-  //
-  //            if (requiringPdfAValidationTests.contains(example.getName())) {
-  //              pdfaValidate(errors, http, example.getName(), requestFile.getName());
-  //            } else {
-  //              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
-  //            }
-  //          }
-  //        } catch (IOException | AssertionError | RuntimeException e) {
-  //          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
-  //        }
-  //      }
-  //    } catch (IOException | RuntimeException | URISyntaxException e) {
-  //      errors.put(example.getName(), e);
-  //    }
-  //
-  //    return testsRan;
-  //  }
-  //
-  //  private void compareImages(
-  //      Map<String, Throwable> errors,
-  //      InputStream stream,
-  //      File example,
-  //      File requestFile,
-  //      String outputFormat)
-  //      throws IOException {
-  //    BufferedImage image = ImageIO.read(stream);
-  //    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
-  //      File expectedOutputDir = new File(example, "expected_output");
-  //      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
-  //      if (!expectedOutput.exists()) {
-  //        errors.put(
-  //            example.getName() + " (" + requestFile.getName() + ")",
-  //            new Exception("File not found: " + expectedOutput));
-  //      }
-  //
-  //      if (!"bmp".equals(outputFormat)) {
-  //        // BMP is not supported by ImageIO
-  //        new ImageSimilarity(expectedOutput).assertSimilarity(image);
-  //      }
-  //    }
-  //  }
-  //
-  //  private void pdfaValidate(
-  //      Map<String, Throwable> errors,
-  //      HttpURLConnection http,
-  //      String exampleName,
-  //      String requestFileName) {
-  //    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
-  //    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
-  //      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(),
-  // flavour);
-  //      ValidationResult result = validator.validate(parser);
-  //      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
-  //      Assert.isTrue(result.isCompliant());
-  //    } catch (EncryptedPdfException
-  //        | ModelParsingException
-  //        | ValidationException
-  //        | IOException
-  //        | AssertionFailedException e) {
-  //      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
-  //    }
-  //  }
-  //
-  //  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir)
-  // {
-  //    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
-  //    return new File(expectedOutputDir, imageName);
-  //  }
-  //
-  //  private boolean hasRequestFile(File example) {
-  //    for (File file : Objects.requireNonNull(example.listFiles())) {
-  //      if (isRequestDataFile(file)) {
-  //        return true;
-  //      }
-  //    }
-  //    return false;
-  //  }
-  //
-  //  private boolean isRequestDataFile(File requestFile) {
-  //    return requestFile.getName().matches(REQUEST_DATA_FILE);
-  //  }
-  //
-  //  private HttpURLConnection createHttpUrlConnection(
-  //      String exampleName, String outputFormat, int contentLength)
-  //      throws IOException, URISyntaxException {
-  //    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
-  //    http.setRequestMethod("POST");
-  //    http.setDoInput(true);
-  //    http.setDoOutput(true);
-  //    http.setFixedLengthStreamingMode(contentLength);
-  //    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-  //    return http;
-  //  }
-  //
-  //  private URLConnection createUrlConnection(String exampleName, String outputFormat)
-  //      throws IOException, URISyntaxException {
-  //    URL url =
-  //        URL.of(
-  //            new URI(
-  //                AbstractApiTest.PRINT_SERVER
-  //                    + "print/"
-  //                    + exampleName
-  //                    + MapPrinterServlet.CREATE_AND_GET_URL
-  //                    + "."
-  //                    + outputFormat),
-  //            null);
-  //    URLConnection connection = url.openConnection();
-  //    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
-  //    connection.setRequestProperty("Cache-Control", "max-age=0");
-  //    return connection;
-  //  }
+  public static final String DEFAULT_SPRING_XML =
+      "classpath:mapfish-spring-application-context.xml";
+  public static final String TEST_SPRING_XML =
+      "classpath:test-http-request-factory-application-context.xml";
+  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
+  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
+      Map.of(
+          "pdf", "application/pdf",
+          "png", "image/png",
+          "jpg", "image/jpeg",
+          "jpeg", "image/jpeg",
+          "tif", "image/tiff",
+          "tiff", "image/tiff",
+          "gif", "image/gif",
+          "bmp", "image/bmp");
+  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
+  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
+  private static final String CONFIG_FILE = "config.yaml";
+
+  /**
+   * If this system property is set then it will be interpreted as a regular expression and will be
+   * used to filter the examples that are run.
+   *
+   * <p>For example: -Dexamples.filter=verbose.*
+   *
+   * <p>will run all examples starting with verbose.
+   */
+  private static final String FILTER_PROPERTY = "examples.filter";
+
+  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
+  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
+  private static Pattern exampleFilter;
+  private static Pattern requestFilter;
+  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
+  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
+
+  static {
+    Handler.configureProtocolHandler();
+  }
+
+  @Autowired MapPrinter mapPrinter;
+
+  @BeforeAll
+  public static void setUp() {
+    final LoggerContext loggerContext = getLoggerContext();
+    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
+
+    String filterProperty = System.getProperty(FILTER_PROPERTY);
+    if (!StringUtils.isEmpty(filterProperty)) {
+      String[] parts = filterProperty.split("/", 2);
+
+      if (parts.length == 1) {
+        requestFilter = REQUEST_MATCH_ALL;
+      } else {
+        requestFilter = Pattern.compile(parts[1]);
+      }
+
+      exampleFilter = Pattern.compile(parts[0]);
+
+    } else {
+      requestFilter = REQUEST_MATCH_ALL;
+      exampleFilter = EXAMPLE_MATCH_ALL;
+    }
+  }
+
+  private static LoggerContext getLoggerContext() {
+    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
+    final URL logfile = classLoader.getResource("logback.xml");
+    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+    try {
+      final JoranConfigurator configurator = new JoranConfigurator();
+      configurator.setContext(loggerContext);
+      // Call context.reset() to clear any previous configuration, e.g. default
+      // configuration. For multi-step configuration, omit calling context.reset().
+      loggerContext.reset();
+      configurator.doConfigure(Objects.requireNonNull(logfile));
+    } catch (JoranException je) {
+      // StatusPrinter will handle this
+    }
+    return loggerContext;
+  }
+
+  private static File getFile(Class<?> testClass, String fileName) {
+    final URL resource = testClass.getResource(fileName);
+    if (resource == null) {
+      throw new AssertionError("Unable to find test resource: " + fileName);
+    }
+
+    return new File(resource.getFile());
+  }
+
+  public static void main(String[] args) {
+    if (args.length < 1) {
+      System.err.println(
+          "This main is expected to have at least one parameter, it is a regular "
+              + "expression for selecting the examples to run");
+      System.exit(1);
+    }
+    if (args.length > 2) {
+      System.err.println(
+          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
+              + "configRegexp");
+      System.exit(1);
+    }
+
+    String filter = args[0];
+    if (args.length == 2) {
+      filter += "/" + args[1];
+    }
+    System.setProperty(FILTER_PROPERTY, filter);
+
+    LauncherDiscoveryRequest request =
+        LauncherDiscoveryRequestBuilder.request()
+            .selectors(selectClass(ExamplesTest.class))
+            .build();
+
+    Launcher launcher = LauncherFactory.create();
+    SummaryGeneratingListener listener = new SummaryGeneratingListener();
+    launcher.registerTestExecutionListeners(listener);
+
+    launcher.execute(request);
+
+    listener.getSummary().printTo(new PrintWriter(System.out));
+
+    if (listener.getSummary().getTestsFailedCount() > 0) {
+      System.exit(1);
+    }
+  }
+
+  @Test
+  public void testExampleDirectoryNames() {
+    final String namePattern = "[a-zA-Z0-9_]+";
+    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+    StringBuilder errors = new StringBuilder();
+    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
+        errors.append("\n    * ").append(examplesDir.getName());
+      }
+    }
+
+    assertEquals(
+        0,
+        errors.length(),
+        String.format(
+            "All example directory names must match the pattern: '%s'.  "
+                + "The following fail that test: %s",
+            namePattern, errors));
+  }
+
+  @Test
+  public void testAllExamples() {
+    Map<String, Throwable> errors = new TreeMap<>();
+
+    int testsRan = 0;
+    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+
+    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
+        testsRan += runExample(example, errors);
+      }
+    }
+
+    reportErrors(errors, testsRan);
+  }
+
+  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
+    if (!errors.isEmpty()) {
+      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
+        error.getValue().printStackTrace();
+      }
+
+      StringBuilder errorReport = new StringBuilder();
+      errorReport.append("\n");
+      errorReport.append(errors.size());
+      errorReport.append(" errors encountered while running ");
+      errorReport.append(testsRan);
+      errorReport.append(" examples.\n");
+      errorReport.append(
+          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
+      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+        StringBuilder exampleName = new StringBuilder();
+        exampleName.append("The example ");
+        exampleName.append(error.getKey());
+        errorReport.append(exampleName);
+        errorReport.append('\n');
+        //noinspection ReplaceAllDot
+        errorReport.append(exampleName.toString().replaceAll(".", "="));
+        errorReport.append('\n');
+        errorReport.append("Failed with the error:\n");
+        final StringWriter sw = new StringWriter();
+        error.getValue().printStackTrace(new PrintWriter(sw));
+        errorReport.append(sw);
+        errorReport.append('\n');
+      }
+      errorReport.append("\n\n");
+      fail(errorReport.toString());
+    }
+  }
+
+  private int runExample(File example, Map<String, Throwable> errors) {
+    int testsRan = 0;
+    try {
+      final File configFile = new File(example, CONFIG_FILE);
+      this.mapPrinter.setConfiguration(configFile);
+
+      if (!hasRequestFile(example)) {
+        throw new AssertionError(
+            String.format(
+                "Example: '%s' does not have any request data files.", example.getName()));
+      }
+      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
+        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
+          continue;
+        }
+        try {
+          if (isRequestDataFile(requestFile)) {
+            // WARN to be displayed in the Travis logs
+            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
+            String requestData =
+                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
+
+            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
+
+            testsRan++;
+            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
+            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
+
+            HttpURLConnection http =
+                createHttpUrlConnection(example.getName(), outputFormat, data.length);
+            http.connect();
+            try (OutputStream os = http.getOutputStream()) {
+              os.write(data);
+            }
+            int responseCode = http.getResponseCode();
+
+            InputStream inputStr = http.getInputStream();
+            if (responseCode != 200) {
+              String encoding =
+                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
+              String response = IOUtils.toString(inputStr, encoding);
+              Assert.isTrue(false, response);
+            }
+
+            Assert.equals(
+                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
+
+            if (requiringPdfAValidationTests.contains(example.getName())) {
+              pdfaValidate(errors, http, example.getName(), requestFile.getName());
+            } else {
+              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
+            }
+          }
+        } catch (IOException | AssertionError | RuntimeException e) {
+          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
+        }
+      }
+    } catch (IOException | RuntimeException | URISyntaxException e) {
+      errors.put(example.getName(), e);
+    }
+
+    return testsRan;
+  }
+
+  private void compareImages(
+      Map<String, Throwable> errors,
+      InputStream stream,
+      File example,
+      File requestFile,
+      String outputFormat)
+      throws IOException {
+    BufferedImage image = ImageIO.read(stream);
+    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
+      File expectedOutputDir = new File(example, "expected_output");
+      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
+      if (!expectedOutput.exists()) {
+        errors.put(
+            example.getName() + " (" + requestFile.getName() + ")",
+            new Exception("File not found: " + expectedOutput));
+      }
+
+      if (!"bmp".equals(outputFormat)) {
+        // BMP is not supported by ImageIO
+        new ImageSimilarity(expectedOutput).assertSimilarity(image);
+      }
+    }
+  }
+
+  private void pdfaValidate(
+      Map<String, Throwable> errors,
+      HttpURLConnection http,
+      String exampleName,
+      String requestFileName) {
+    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
+    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
+      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(), flavour);
+      ValidationResult result = validator.validate(parser);
+      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
+      Assert.isTrue(result.isCompliant());
+    } catch (EncryptedPdfException
+        | ModelParsingException
+        | ValidationException
+        | IOException
+        | AssertionFailedException e) {
+      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
+    }
+  }
+
+  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir) {
+    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
+    return new File(expectedOutputDir, imageName);
+  }
+
+  private boolean hasRequestFile(File example) {
+    for (File file : Objects.requireNonNull(example.listFiles())) {
+      if (isRequestDataFile(file)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private boolean isRequestDataFile(File requestFile) {
+    return requestFile.getName().matches(REQUEST_DATA_FILE);
+  }
+
+  private HttpURLConnection createHttpUrlConnection(
+      String exampleName, String outputFormat, int contentLength)
+      throws IOException, URISyntaxException {
+    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
+    http.setRequestMethod("POST");
+    http.setDoInput(true);
+    http.setDoOutput(true);
+    http.setFixedLengthStreamingMode(contentLength);
+    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+    return http;
+  }
+
+  private URLConnection createUrlConnection(String exampleName, String outputFormat)
+      throws IOException, URISyntaxException {
+    URL url =
+        URL.of(
+            new URI(
+                AbstractApiTest.PRINT_SERVER
+                    + "print/"
+                    + exampleName
+                    + MapPrinterServlet.CREATE_AND_GET_URL
+                    + "."
+                    + outputFormat),
+            null);
+    URLConnection connection = url.openConnection();
+    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
+    connection.setRequestProperty("Cache-Control", "max-age=0");
+    return connection;
+  }
 }

From 43e7135cb7c0e4ad1f5bf5343ca890a9e2d89f3a Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 11 Dec 2025 20:50:24 +0100
Subject: [PATCH 15/61] Re-enabled acceptance tests

---
 build.gradle                                  | 10 ---------
 examples/build.gradle                         | 21 +++++++++----------
 .../org/mapfish/print/AbstractApiTest.java    |  3 +++
 .../java/org/mapfish/print/ExamplesTest.java  |  2 +-
 .../org/mapfish/print/MetricsApiTest.java     |  3 +++
 .../java/org/mapfish/print/PrintApiTest.java  |  3 +++
 ...tp-request-factory-application-context.xml |  2 +-
 7 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index d3c309a6c..35ab00bb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
 
 plugins {
     id("com.github.spotbugs") version "6.4.7"
-    id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -94,12 +93,3 @@ tasks.register('docs') {
 repositories {
     mavenCentral()
 }
-
-rewrite {
-    activeRecipe("org.openrewrite.hibernate.MigrateToHibernate66")
-    setExportDatatables(true)
-}
-
-dependencies {
-    rewrite("org.openrewrite.recipe:rewrite-hibernate:2.16.0")
-}
diff --git a/examples/build.gradle b/examples/build.gradle
index 17f7f7aa2..ea6dc2250 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -6,7 +6,6 @@ repositories {
             excludeModule("javax.media", "jai_core")
         }
     }
-    maven { url = 'https://maven.restlet.org' }
     maven { url = "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts" }
     maven { url = "https://repo.osgeo.org/repository/release/" }
 }
@@ -14,17 +13,17 @@ repositories {
 dependencies {
     testImplementation(
         project(':core'),
-        'commons-io:commons-io:2.17.0',
-        "org.springframework:spring-web:7.0.1",
-        'org.json:json:20240303',
-        'org.apache.commons:commons-lang3:3.5',
+        'ch.qos.logback:logback-classic:1.5.21',
+        'org.springframework:spring-core:7.0.1',
+        'org.springframework:spring-tx:7.0.1',
+        'org.springframework:spring-test:7.0.1',
+        'org.springframework:spring-web:7.0.1',
+        'org.json:json:20250517',
+        'commons-io:commons-io:2.21.0',
+        'org.apache.commons:commons-lang3:3.20.0',
         "org.locationtech.jts:jts-core:1.18.2",
-        "org.slf4j:slf4j-api:2.0.16",
-        "org.springframework:spring-test:7.0.1",
-        "ch.qos.logback:logback-classic:1.5.15",
-        "org.verapdf:validation-model:1.24.1",
+        'org.verapdf:validation-model:1.28.2',
         'org.junit.platform:junit-platform-launcher:6.0.1',
-
     )
 }
 
@@ -54,7 +53,7 @@ tasks.register('integrationTest', Test) {
     classpath = sourceSets.test.runtimeClasspath
     dependsOn(':core:compileJava', 'geoserver', testClasses)
     // Use JUnit for tests discovery
-    useJUnit()
+    useJUnitPlatform()
     testLogging {
         exceptionFormat = 'full'
         showCauses true
diff --git a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
index 2f55b605d..7280988c8 100644
--- a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
@@ -10,13 +10,16 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.http.MfClientHttpRequestFactoryImpl;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(SpringExtension.class)
 public abstract class AbstractApiTest {
 
   protected static final String PRINT_SERVER = "http://print:8080/";
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index b44d995e0..31c1eb6ae 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -192,7 +192,7 @@ public static void main(String[] args) {
 
     launcher.execute(request);
 
-    listener.getSummary().printTo(new PrintWriter(System.out));
+    listener.getSummary().printTo(new PrintWriter(System.out, true, StandardCharsets.UTF_8));
 
     if (listener.getSummary().getTestsFailedCount() > 0) {
       System.exit(1);
diff --git a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
index a0ee14f16..4fed6d601 100644
--- a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
@@ -6,11 +6,13 @@
 import java.net.URISyntaxException;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /*
  * Test the servlet metrics API.
@@ -20,6 +22,7 @@
  *      docker compose up -d
  *      docker compose exec tests gradle :examples:test
  */
+@ExtendWith(SpringExtension.class)
 public class MetricsApiTest extends AbstractApiTest {
 
   @Test
diff --git a/examples/src/test/java/org/mapfish/print/PrintApiTest.java b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
index f3ddabd24..930d1396f 100644
--- a/examples/src/test/java/org/mapfish/print/PrintApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
@@ -15,12 +15,14 @@
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.servlet.MapPrinterServlet;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Test the servlet print API.
@@ -33,6 +35,7 @@
  *
  * <p>./gradlew examples:geoserver
  */
+@ExtendWith(SpringExtension.class)
 public class PrintApiTest extends AbstractApiTest {
 
   @Test
diff --git a/examples/src/test/resources/test-http-request-factory-application-context.xml b/examples/src/test/resources/test-http-request-factory-application-context.xml
index 454c0c0a8..84a0dcde9 100644
--- a/examples/src/test/resources/test-http-request-factory-application-context.xml
+++ b/examples/src/test/resources/test-http-request-factory-application-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     <bean id="servletContext" class="org.springframework.mock.web.MockServletContext"/>
 </beans>

From 991ecaa918240866cd622dff348e1238863a691a Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 12 Dec 2025 15:49:41 +0100
Subject: [PATCH 16/61] Increased log verbosity for debugging

---
 core/src/main/resources/logback.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
index 3a2dce5c8..7d5ad416c 100644
--- a/core/src/main/resources/logback.xml
+++ b/core/src/main/resources/logback.xml
@@ -8,11 +8,11 @@
         </encoder>
     </appender>
 
-    <logger name="org.mapfish" level="WARN" />
-    <logger name="com.codahale" level="WARN" />
-    <logger name="org.springframework" level="WARN" />
-    <logger name="org.apache" level="WARN" />
-    <logger name="org.hibernate" level="WARN" />
+    <logger name="org.mapfish" level="DEBUG" />
+    <logger name="com.codahale" level="DEBUG" />
+    <logger name="org.springframework" level="DEBUG" />
+    <logger name="org.apache" level="DEBUG" />
+    <logger name="org.hibernate" level="DEBUG" />
 
     <root level="INFO">
         <appender-ref ref="standardOut" />

From f262df6c4ad1c494ea9cf96139d3d6fd1cb9e5d2 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 15 Dec 2025 15:10:02 +0100
Subject: [PATCH 17/61] Explicitly define path param names in the main servlet

---
 .../print/servlet/MapPrinterServlet.java      | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index 38a37bede..d42b7e530 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -385,8 +385,8 @@ private static String maybeAddRequestId(final String ref, final HttpServletReque
       value = "/{appId}" + STATUS_URL + "/{referenceId:\\S+}.json",
       method = RequestMethod.GET)
   public final void getStatusSpecificAppId(
-      @Nonnull @PathVariable final String appId,
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
@@ -408,7 +408,7 @@ public final void getStatusSpecificAppId(
    */
   @RequestMapping(value = STATUS_URL + "/{referenceId:\\S+}.json", method = RequestMethod.GET)
   public final void getStatusPath(
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
@@ -478,8 +478,8 @@ private void getStatus(
       value = "/{appId}" + CANCEL_URL + "/{referenceId:\\S+}",
       method = RequestMethod.DELETE)
   public final void cancelSpecificAppId(
-      @Nonnull @PathVariable final String appId,
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
@@ -498,7 +498,8 @@ public final void cancelSpecificAppId(
    */
   @RequestMapping(value = CANCEL_URL + "/{referenceId:\\S+}", method = RequestMethod.DELETE)
   public final void cancelPath(
-      @Nonnull @PathVariable final String referenceId, final HttpServletResponse statusResponse) {
+      @Nonnull @PathVariable("referenceId") final String referenceId,
+      final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
       cancel("default", referenceId, statusResponse);
@@ -541,8 +542,8 @@ private void cancel(
    */
   @RequestMapping(value = "/{appId}" + REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @Nonnull @PathVariable final String appId,
-      @PathVariable final String format,
+      @Nonnull @PathVariable("appId") final String appId,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -597,8 +598,8 @@ private void doCreateReport(
       value = "/{appId}" + REPORT_URL + "/{referenceId:\\S+}",
       method = RequestMethod.GET)
   public final void getReportSpecificAppId(
-      @Nonnull @PathVariable final String appId,
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
       throws IOException, ServletException {
@@ -617,7 +618,7 @@ public final void getReportSpecificAppId(
    */
   @RequestMapping(value = REPORT_URL + "/{referenceId:\\S+}", method = RequestMethod.GET)
   public final void getReportPath(
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
       throws IOException, ServletException {
@@ -658,7 +659,7 @@ private void getReport(
    */
   @RequestMapping(value = REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @PathVariable final String format,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -703,8 +704,8 @@ private static String getAppId(
       value = "/{appId}" + CREATE_AND_GET_URL + ".{format:\\w+}",
       method = RequestMethod.POST)
   public final void createReportAndGet(
-      @Nonnull @PathVariable final String appId,
-      @PathVariable final String format,
+      @Nonnull @PathVariable("appId") final String appId,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -757,7 +758,7 @@ private void doCreateReportAndGet(
    */
   @RequestMapping(value = CREATE_AND_GET_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReportAndGetNoAppId(
-      @PathVariable final String format,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -830,7 +831,7 @@ public final void getCapabilities(
    */
   @RequestMapping(value = "/{appId}" + CAPABILITIES_URL, method = RequestMethod.GET)
   public final void getCapabilities(
-      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable("appId") final String appId,
       @RequestParam(value = "pretty", defaultValue = "false") final boolean pretty,
       final HttpServletRequest request,
       final HttpServletResponse capabilitiesResponse)
@@ -911,7 +912,7 @@ public final void getExampleRequest(
    */
   @RequestMapping(value = "{appId}" + EXAMPLE_REQUEST_URL, method = RequestMethod.GET)
   public final void getExampleRequest(
-      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable("appId") final String appId,
       final HttpServletRequest request,
       final HttpServletResponse getExampleResponse)
       throws IOException {

From 332439cd46ef6f75347e3bd0a29cc0c8153f9052 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 15 Dec 2025 16:01:35 +0100
Subject: [PATCH 18/61] Fixed test link generation for the acceptance tests

---
 .../src/test/java/org/mapfish/print/AbstractApiTest.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
index 7280988c8..e14af167b 100644
--- a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
@@ -9,6 +9,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.http.MfClientHttpRequestFactoryImpl;
@@ -29,7 +31,9 @@ public abstract class AbstractApiTest {
 
   protected ClientHttpRequest getRequest(String path, HttpMethod method)
       throws IOException, URISyntaxException {
-    return httpRequestFactory.createRequest(new URI(PRINT_SERVER + path), method);
+    var actualUrl =
+        Stream.of(path.split("/")).filter(s -> !s.isEmpty()).collect(Collectors.joining("/"));
+    return httpRequestFactory.createRequest(new URI(PRINT_SERVER + actualUrl), method);
   }
 
   protected String getBodyAsText(ClientHttpResponse response) throws IOException {

From 4437746633f342f5301289c5282acd927e05f588 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 18 Dec 2025 17:35:25 +0100
Subject: [PATCH 19/61] Proof of concept fix for the failing secure templates
 test

---
 build.gradle                                               | 5 -----
 core/Dockerfile                                            | 2 ++
 docker-compose.yaml                                        | 4 ++++
 examples/build.gradle                                      | 5 ++---
 examples/src/test/java/org/mapfish/print/PrintApiTest.java | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 35ab00bb0..4bcfcb83a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,6 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 
     dependencies {
         testImplementation(
-            'org.junit.jupiter:junit-jupiter:6.0.1',
             'org.mockito:mockito-core:5.20.0',
         )
     }
@@ -89,7 +88,3 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 tasks.register('docs') {
     enabled = false
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/core/Dockerfile b/core/Dockerfile
index 0ce57bb87..c5afc24d9 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -45,6 +45,8 @@ ENV LOG_LEVEL=INFO \
   PRINT_YAML_MAX_ALIASES=50 \
   SENTRY_DSN=
 
+COPY extraConfigFor/acceptanceTests/mapfish-spring-application-context-override.xml /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/
+
 CMD ["/usr/local/tomcat/bin/docker-start-print"]
 
 FROM runner AS tester
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 24fd5c3cd..0d6f46071 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,6 +22,9 @@ services:
     image: mapfish_print_builder
     user: ${USER_ID}
     command: tail --follow /dev/null
+    ports:
+      # Forward the port for Java remote debugging defined in the JAVA_OPTS environment variable
+      - 5006:5006
     volumes:
       - ./examples/src:/src/examples/src:ro
       - ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples
@@ -30,3 +33,4 @@ services:
     environment:
       PRINT_YAML_MAX_ALIASES: '200'
       GRADLE_USER_HOME: /home/gradle/.gradle
+      JAVA_OPTS: -Dsun.net.inetaddr.ttl=30 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006
diff --git a/examples/build.gradle b/examples/build.gradle
index ea6dc2250..ebf8048e0 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -18,6 +18,7 @@ dependencies {
         'org.springframework:spring-tx:7.0.1',
         'org.springframework:spring-test:7.0.1',
         'org.springframework:spring-web:7.0.1',
+        'org.junit.jupiter:junit-jupiter:6.0.1',
         'org.json:json:20250517',
         'commons-io:commons-io:2.21.0',
         'org.apache.commons:commons-lang3:3.20.0',
@@ -42,9 +43,7 @@ tasks.register('geoserver' , Exec) {
 // prevent that the tests target can be directly called. the integration tests
 // must be run with `./gradlew examples:geoserver` to make sure the
 // server is running
-test {
-    useJUnitPlatform()
-}
+test {}
 test.onlyIf { false }
 
 tasks.register('integrationTest', Test) {
diff --git a/examples/src/test/java/org/mapfish/print/PrintApiTest.java b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
index 930d1396f..2bff2c20c 100644
--- a/examples/src/test/java/org/mapfish/print/PrintApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
@@ -521,6 +521,7 @@ public void testCors() throws Exception {
     request.getHeaders().set("Origin", "http://example.com/");
     request.getHeaders().set("Access-Control-Request-Method", "POST");
     request.getHeaders().set("Access-Control-Request-Headers", "X-Toto");
+    request.getHeaders().set("Content-Type", "application/json");
     try (ClientHttpResponse response = request.execute()) {
       assertEquals(HttpStatus.OK, response.getStatusCode());
       assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));

From 7b4c100b8b0d3ec9435f15bf4ef99789362b01f6 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 19 Dec 2025 12:38:23 +0100
Subject: [PATCH 20/61] Removed WIP fix

---
 core/Dockerfile     | 2 --
 docker-compose.yaml | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index c5afc24d9..0ce57bb87 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -45,8 +45,6 @@ ENV LOG_LEVEL=INFO \
   PRINT_YAML_MAX_ALIASES=50 \
   SENTRY_DSN=
 
-COPY extraConfigFor/acceptanceTests/mapfish-spring-application-context-override.xml /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/
-
 CMD ["/usr/local/tomcat/bin/docker-start-print"]
 
 FROM runner AS tester
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0d6f46071..24fd5c3cd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,9 +22,6 @@ services:
     image: mapfish_print_builder
     user: ${USER_ID}
     command: tail --follow /dev/null
-    ports:
-      # Forward the port for Java remote debugging defined in the JAVA_OPTS environment variable
-      - 5006:5006
     volumes:
       - ./examples/src:/src/examples/src:ro
       - ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples
@@ -33,4 +30,3 @@ services:
     environment:
       PRINT_YAML_MAX_ALIASES: '200'
       GRADLE_USER_HOME: /home/gradle/.gradle
-      JAVA_OPTS: -Dsun.net.inetaddr.ttl=30 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006

From 7e3023c6ad2051732f337372f3c57867f83f15c9 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 19 Dec 2025 15:44:27 +0100
Subject: [PATCH 21/61] Fixed http to https redirect for the private templates

---
 core/build.gradle                                   | 4 ++--
 core/src/main/resources/mapfish-spring-security.xml | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 00a6db3b5..c4fa6c590 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -135,8 +135,8 @@ dependencies {
         '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.0',
-        'org.springframework.security:spring-security-web:7.0.0',
+        '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',
diff --git a/core/src/main/resources/mapfish-spring-security.xml b/core/src/main/resources/mapfish-spring-security.xml
index 830c47f3b..13df38e6b 100644
--- a/core/src/main/resources/mapfish-spring-security.xml
+++ b/core/src/main/resources/mapfish-spring-security.xml
@@ -12,6 +12,14 @@
         <beans:property name="allowUrlEncodedSlash" value="true"/>
     </beans:bean>
 
+    <beans:bean id="httpsRedirectFilter" class="org.springframework.security.web.transport.HttpsRedirectFilter">
+        <beans:property name="requestMatcher">
+            <beans:bean factory-method="pathPattern" class="org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher">
+                <beans:constructor-arg value="/sec/print/**"/>
+            </beans:bean>
+        </beans:property>
+    </beans:bean>
+
     <http-firewall ref="httpFirewall"/>
 
     <http use-expressions="true">
@@ -20,6 +28,7 @@
         <intercept-url pattern="/**" access="permitAll()"/>
         <http-basic/>
         <anonymous/>
+        <custom-filter ref="httpsRedirectFilter" after="FIRST"/>
     </http>
 
     <!--

From 536c1a49dfd1e19eec9b14dc3c52d81b96124466 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 19 Dec 2025 18:54:32 +0100
Subject: [PATCH 22/61] Restored missing dependencies for unit tests

---
 core/build.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index c4fa6c590..afdb6e950 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -211,8 +211,12 @@ dependencies {
     //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() {

From c892deb166e21af65551ad20d2fa31088d487581 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 22 Dec 2025 15:20:24 +0100
Subject: [PATCH 23/61] Fixed clustering tests.

Removed length constraints for the data table in the PrintJobResultExtImpl
---
 .../print/servlet/job/impl/PrintJobResultImpl.java        | 8 ++++----
 .../print/servlet/job/impl/PrintJobStatusImpl.java        | 2 +-
 .../servlet/job/impl/hibernate/PrintJobResultExtImpl.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
index afae27063..d0c1b6d82 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
@@ -20,13 +20,13 @@
 @Table(name = "print_job_results")
 public class PrintJobResultImpl implements PrintJobResult {
 
-  @Id private final String reportURI;
+  @Id private String reportURI;
 
-  @Column private final String mimeType;
+  @Column private String mimeType;
 
-  @Column private final String fileExtension;
+  @Column private String fileExtension;
 
-  @Column private final String fileName;
+  @Column private String fileName;
 
   @OneToOne(targetEntity = PrintJobStatusImpl.class, fetch = FetchType.LAZY)
   @OnDelete(action = OnDeleteAction.CASCADE)
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index a97ef0e78..80db119d7 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -23,7 +23,7 @@
 public class PrintJobStatusImpl implements PrintJobStatus {
   @Embedded
   @Target(PrintJobEntryImpl.class)
-  private final PrintJobEntry entry;
+  private PrintJobEntry entry;
 
   @Id private String referenceId;
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
index c839af946..3eadb8112 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
@@ -10,7 +10,7 @@
 @Entity
 public class PrintJobResultExtImpl extends PrintJobResultImpl {
 
-  @Column(length = 1000000000)
+  @Column(length = 1000000)
   @Basic
   private byte[] data;
 

From a251f33b8729d48f3df881527ae3f10c76fbf094 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 22 Dec 2025 16:21:15 +0100
Subject: [PATCH 24/61] Added size constraints instead of the default ones

---
 .../org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index 80db119d7..3709ac726 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -35,6 +35,7 @@ public class PrintJobStatusImpl implements PrintJobStatus {
 
   @Column private long requestCount;
 
+  @Column(length = 4096)
   private String error;
 
   @OneToOne(targetEntity = PrintJobResultImpl.class, cascade = CascadeType.ALL, mappedBy = "status")

From 1f7665ace35281652fa8051fa591d14451181668 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Tue, 23 Dec 2025 13:12:45 +0100
Subject: [PATCH 25/61] Merge PrintJobImpl interface and implementation

---
 core/build.gradle                             |   1 +
 .../print/servlet/MapPrinterServlet.java      |   4 +-
 .../mapfish/print/servlet/job/PrintJob.java   |   3 +-
 .../print/servlet/job/PrintJobEntry.java      | 137 ++++++++++++++--
 .../servlet/job/impl/PrintJobEntryImpl.java   | 153 ------------------
 .../servlet/job/impl/PrintJobStatusImpl.java  |   6 +-
 .../servlet/job/impl/RegistryJobQueue.java    |   2 +-
 .../print/servlet/job/ClusteringTaskTest.java |   9 +-
 .../job/PostResultToRegistryTaskTest.java     |   5 +-
 9 files changed, 141 insertions(+), 179 deletions(-)
 delete mode 100644 core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java

diff --git a/core/build.gradle b/core/build.gradle
index afdb6e950..db3fddc10 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,6 +91,7 @@ test {
         junitXml.getRequired().set(true)
         html.getRequired().set(true)
     }
+    maxHeapSize = "2G"
     useJUnitPlatform()
 }
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index d42b7e530..d4c104632 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -53,8 +53,8 @@
 import org.mapfish.print.processor.http.matcher.UriMatchers;
 import org.mapfish.print.servlet.job.JobManager;
 import org.mapfish.print.servlet.job.NoSuchReferenceException;
+import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.PrintJobStatus;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.mapfish.print.url.data.Handler;
@@ -1152,7 +1152,7 @@ private String createAndSubmitPrintJob(
       return null;
     }
 
-    PrintJobEntryImpl jobEntry = new PrintJobEntryImpl(ref, specJson, System.currentTimeMillis());
+    PrintJobEntry jobEntry = new PrintJobEntry(ref, specJson, System.currentTimeMillis());
     jobEntry.configureAccess(template, this.context);
 
     try {
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
index 4c921e1c6..5681abadc 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
@@ -39,7 +39,6 @@
 import org.mapfish.print.output.OutputFormat;
 import org.mapfish.print.processor.ExecutionStats;
 import org.mapfish.print.processor.Processor;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -385,7 +384,7 @@ public Set<String> getAppIds() {
             return null;
           }
         };
-    this.entry = new PrintJobEntryImpl();
+    this.entry = new PrintJobEntry();
   }
 
   /** Interface encapsulating the code to run with the open output stream. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java
index 2f0a833ec..e3e68d38a 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java
@@ -1,33 +1,152 @@
 package org.mapfish.print.servlet.job;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.util.Date;
+import org.hibernate.annotations.Type;
+import org.mapfish.print.config.Configuration;
+import org.mapfish.print.config.Template;
 import org.mapfish.print.config.access.AccessAssertion;
+import org.mapfish.print.config.access.AndAccessAssertion;
+import org.mapfish.print.servlet.MapPrinterServlet;
+import org.mapfish.print.servlet.ServletMapPrinterFactory;
+import org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType;
+import org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType;
 import org.mapfish.print.wrapper.json.PJsonObject;
+import org.springframework.context.ApplicationContext;
 
 /** Print Job Entry. */
-public interface PrintJobEntry {
+@Embeddable
+public class PrintJobEntry {
+
+  @Column(insertable = false, updatable = false)
+  private String referenceId;
+
+  @Column()
+  @Type(PJsonObjectUserType.class)
+  private PJsonObject requestData;
+
+  @Column private long startTime;
+
+  @Column()
+  @Type(AccessAssertionUserType.class)
+  private AccessAssertion access;
+
+  /** Constructor. */
+  public PrintJobEntry() {}
+
+  /**
+   * Constructor.
+   *
+   * @param referenceId reference of the report.
+   * @param requestData the request data
+   * @param startTime the time when the print job started.
+   */
+  public PrintJobEntry(
+      final String referenceId, final PJsonObject requestData, final long startTime) {
+    this.referenceId = referenceId;
+    this.requestData = requestData;
+    this.startTime = startTime;
+  }
+
+  /**
+   * Constructor.
+   *
+   * @param referenceId reference of the report.
+   * @param requestData the request data
+   * @param startTime the time when the print job started.
+   * @param access the an access control object for downloading this report. Typically this is
+   *     combined access of the template and the configuration.
+   */
+  public PrintJobEntry(
+      final String referenceId,
+      final PJsonObject requestData,
+      final long startTime,
+      final AccessAssertion access) {
+    this.referenceId = referenceId;
+    this.requestData = requestData;
+    this.access = access;
+    this.startTime = startTime;
+  }
 
   /** Get reference ID. */
-  String getReferenceId();
+  public final String getReferenceId() {
+    return this.referenceId;
+  }
+
+  public final void setReferenceId(final String referenceId) {
+    this.referenceId = referenceId;
+  }
 
   /** Get request data. */
-  PJsonObject getRequestData();
+  public final PJsonObject getRequestData() {
+    return this.requestData;
+  }
+
+  public final void setRequestData(final PJsonObject requestData) {
+    this.requestData = requestData;
+  }
 
   /** Get start time (as long). */
-  long getStartTime();
+  public final long getStartTime() {
+    return this.startTime;
+  }
+
+  public final void setStartTime(final long startTime) {
+    this.startTime = startTime;
+  }
 
   /** Get start time (as date). */
-  Date getStartDate();
+  public final Date getStartDate() {
+    return new Date(this.startTime);
+  }
 
   /** Get access assertion. */
-  AccessAssertion getAccess();
+  public final AccessAssertion getAccess() {
+    return this.access;
+  }
+
+  public final void setAccess(final AccessAssertion access) {
+    this.access = access;
+  }
 
   /** Get app ID. */
-  String getAppId();
+  public final String getAppId() {
+    return getRequestData()
+        .optString(
+            MapPrinterServlet.JSON_APP, ServletMapPrinterFactory.DEFAULT_CONFIGURATION_FILE_KEY);
+  }
 
   /** Get time since start. */
-  long getTimeSinceStart();
+  public final long getTimeSinceStart() {
+    return System.currentTimeMillis() - getStartTime();
+  }
 
   /** Assert that the current is authorized to access this job. */
-  void assertAccess();
+  public final void assertAccess() {
+    this.access.assertAccess(
+        getClass().getSimpleName()
+            + " for app '"
+            + getAppId()
+            + "' for print job '"
+            + getReferenceId()
+            + "'",
+        this);
+  }
+
+  /**
+   * Configure the access permissions required to access this print job.
+   *
+   * @param template the containing print template which should have sufficient information to
+   *     configure the access.
+   * @param context the application context
+   */
+  public final void configureAccess(final Template template, final ApplicationContext context) {
+    final Configuration configuration = template.getConfiguration();
+
+    AndAccessAssertion accessAssertion = context.getBean(AndAccessAssertion.class);
+    accessAssertion.setPredicates(
+        configuration.getAccessAssertion(), template.getAccessAssertion());
+    this.access = accessAssertion;
+  }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
deleted file mode 100644
index 7940c00fc..000000000
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.mapfish.print.servlet.job.impl;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import java.util.Date;
-import org.hibernate.annotations.Type;
-import org.mapfish.print.config.Configuration;
-import org.mapfish.print.config.Template;
-import org.mapfish.print.config.access.AccessAssertion;
-import org.mapfish.print.config.access.AndAccessAssertion;
-import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.servlet.ServletMapPrinterFactory;
-import org.mapfish.print.servlet.job.PrintJobEntry;
-import org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType;
-import org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType;
-import org.mapfish.print.wrapper.json.PJsonObject;
-import org.springframework.context.ApplicationContext;
-
-/** Print Job Entry. */
-@Embeddable
-public class PrintJobEntryImpl implements PrintJobEntry {
-
-  @Column(insertable = false, updatable = false)
-  private String referenceId;
-
-  @Column()
-  @Type(PJsonObjectUserType.class)
-  private PJsonObject requestData;
-
-  @Column private long startTime;
-
-  @Column()
-  @Type(AccessAssertionUserType.class)
-  private AccessAssertion access;
-
-  /** Constructor. */
-  public PrintJobEntryImpl() {}
-
-  /**
-   * Constructor.
-   *
-   * @param referenceId reference of the report.
-   * @param requestData the request data
-   * @param startTime the time when the print job started.
-   */
-  public PrintJobEntryImpl(
-      final String referenceId, final PJsonObject requestData, final long startTime) {
-    this.referenceId = referenceId;
-    this.requestData = requestData;
-    this.startTime = startTime;
-  }
-
-  /**
-   * Constructor.
-   *
-   * @param referenceId reference of the report.
-   * @param requestData the request data
-   * @param startTime the time when the print job started.
-   * @param access the an access control object for downloading this report. Typically this is
-   *     combined access of the template and the configuration.
-   */
-  public PrintJobEntryImpl(
-      final String referenceId,
-      final PJsonObject requestData,
-      final long startTime,
-      final AccessAssertion access) {
-    this.referenceId = referenceId;
-    this.requestData = requestData;
-    this.access = access;
-    this.startTime = startTime;
-  }
-
-  @Override
-  public final String getReferenceId() {
-    return this.referenceId;
-  }
-
-  public final void setReferenceId(final String referenceId) {
-    this.referenceId = referenceId;
-  }
-
-  @Override
-  public final PJsonObject getRequestData() {
-    return this.requestData;
-  }
-
-  public final void setRequestData(final PJsonObject requestData) {
-    this.requestData = requestData;
-  }
-
-  @Override
-  public final long getStartTime() {
-    return this.startTime;
-  }
-
-  public final void setStartTime(final long startTime) {
-    this.startTime = startTime;
-  }
-
-  @Override
-  public final Date getStartDate() {
-    return new Date(this.startTime);
-  }
-
-  @Override
-  public final AccessAssertion getAccess() {
-    return this.access;
-  }
-
-  public final void setAccess(final AccessAssertion access) {
-    this.access = access;
-  }
-
-  @Override
-  public final String getAppId() {
-    return getRequestData()
-        .optString(
-            MapPrinterServlet.JSON_APP, ServletMapPrinterFactory.DEFAULT_CONFIGURATION_FILE_KEY);
-  }
-
-  @Override
-  public final long getTimeSinceStart() {
-    return System.currentTimeMillis() - getStartTime();
-  }
-
-  @Override
-  public final void assertAccess() {
-    this.access.assertAccess(
-        getClass().getSimpleName()
-            + " for app '"
-            + getAppId()
-            + "' for print job '"
-            + getReferenceId()
-            + "'",
-        this);
-  }
-
-  /**
-   * Configure the access permissions required to access this print job.
-   *
-   * @param template the containing print template which should have sufficient information to
-   *     configure the access.
-   * @param context the application context
-   */
-  public final void configureAccess(final Template template, final ApplicationContext context) {
-    final Configuration configuration = template.getConfiguration();
-
-    AndAccessAssertion accessAssertion = context.getBean(AndAccessAssertion.class);
-    accessAssertion.setPredicates(
-        configuration.getAccessAssertion(), template.getAccessAssertion());
-    this.access = accessAssertion;
-  }
-}
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index 3709ac726..ef832fb12 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -11,7 +11,6 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import java.util.Date;
-import org.hibernate.annotations.Target;
 import org.mapfish.print.config.access.AccessAssertion;
 import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.PrintJobResult;
@@ -21,9 +20,8 @@
 @Entity
 @Table(name = "print_job_statuses")
 public class PrintJobStatusImpl implements PrintJobStatus {
-  @Embedded
-  @Target(PrintJobEntryImpl.class)
-  private PrintJobEntry entry;
+
+  @Embedded private PrintJobEntry entry;
 
   @Id private String referenceId;
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java
index a71008760..db2d44304 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java
@@ -225,7 +225,7 @@ private PrintJobStatusImpl load(final String referenceId)
 
       PrintJobStatusImpl report =
           new PrintJobStatusImpl(
-              new PrintJobEntryImpl(referenceId, requestData, startTime, accessAssertion),
+              new PrintJobEntry(referenceId, requestData, startTime, accessAssertion),
               requestCount);
       report.setStatus(status);
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
index efc96be3e..91caf79a7 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
@@ -13,7 +13,6 @@
 import org.mapfish.print.config.access.AlwaysAllowAssertion;
 import org.mapfish.print.servlet.ClusteredMapPrinterServletTest;
 import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.slf4j.Logger;
@@ -63,16 +62,16 @@ public void testRun() throws Exception {
                     + "}"),
             "job");
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "first job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "second job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "third job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "fourth job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
 
     int ready = 0;
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
index c6cde2bad..6c26e399d 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
@@ -14,7 +14,6 @@
 import org.mapfish.print.config.Template;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +31,7 @@ public void testRun() {
 
     assertRegistryValues(0, 0, true);
     TestPrintJob printJob = new TestPrintJob();
-    PrintJobEntryImpl entry = (PrintJobEntryImpl) printJob.getEntry();
+    PrintJobEntry entry = (PrintJobEntry) printJob.getEntry();
     entry.setStartTime(System.currentTimeMillis());
     jobManager.submit(printJob);
 
@@ -99,7 +98,7 @@ private class TestPrintJob extends PrintJob {
     {
       try {
         initForTesting(context);
-        PrintJobEntryImpl entry = (PrintJobEntryImpl) getEntry();
+        PrintJobEntry entry = (PrintJobEntry) getEntry();
         entry.setRequestData(
             new PJsonObject(
                 new JSONObject(

From 02e7130a7bcb9ed2f7a0f5125e7e8da4a9c8a5dd Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Wed, 24 Dec 2025 14:49:08 +0100
Subject: [PATCH 26/61] Resolved the deprecated issues

---
 .../http/ErrorResponseClientHttpResponse.java |  4 ++--
 .../mapfish/print/http/HttpCredential.java    |  3 +--
 .../http/MfClientHttpRequestFactoryImpl.java  | 14 +++++++------
 .../print/map/image/wms/WmsUtilities.java     | 20 +++++++++----------
 .../servlet/job/HibernateAccounting.java      | 18 ++++++-----------
 .../job/impl/hibernate/PrintJobDao.java       |  8 ++++----
 .../print/http/HttpCredentialTest.java        |  6 +++---
 .../org/mapfish/print/http/HttpProxyTest.java |  5 ++++-
 8 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index a6ae2429a..eac9fb703 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -6,7 +6,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.StreamUtils;
 
 public class ErrorResponseClientHttpResponse implements ClientHttpResponse {
   private final Exception exception;
@@ -28,10 +27,11 @@ public HttpHeaders getHeaders() {
   @Override
   @Nonnull
   public InputStream getBody() {
-    return StreamUtils.emptyInput();
+    return InputStream.nullInputStream();
   }
 
   @Override
+  @Nonnull
   public HttpStatusCode getStatusCode() throws IOException {
     return FAKE_HTTP_ERROR_CODE;
   }
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index c34e4d39f..09aad5841 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -6,7 +6,6 @@
 import java.net.UnknownHostException;
 import java.util.List;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationObject;
@@ -94,7 +93,7 @@ public boolean matches(final MatchInfo matchInfo)
    * @param authscope the scope to test against.
    */
   @Nullable
-  public final Credentials toCredentials(final AuthScope authscope) {
+  public final UsernamePasswordCredentials toCredentials(final AuthScope authscope) {
     try {
 
       if (!matches(MatchInfo.fromAuthScope(authscope))) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 9591724e3..f5c0a0908 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -20,6 +20,7 @@
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -97,7 +98,6 @@ private static CloseableHttpClient createHttpClient(
     final RequestConfig requestConfig =
         RequestConfig.custom()
             .setConnectionRequestTimeout(connectionRequestTimeout, TimeUnit.MILLISECONDS)
-            .setConnectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
             .setResponseTimeout(socketTimeout, TimeUnit.MILLISECONDS)
             .build();
 
@@ -106,6 +106,10 @@ private static CloseableHttpClient createHttpClient(
             .disableCookieManagement()
             .setConnectionManager(
                 PoolingHttpClientConnectionManagerBuilder.create()
+                    .setDefaultConnectionConfig(
+                        ConnectionConfig.custom()
+                            .setConnectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+                            .build())
                     .setTlsSocketStrategy(new MfTLSSocketStrategy())
                     .setDnsResolver(new RandomizingDnsResolver())
                     .setMaxConnPerRoute(maxConnTotal)
@@ -238,9 +242,7 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
             new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
         entityEnclosingRequest.setEntity(requestEntity);
       }
-
-      ClassicHttpResponse response =
-          (ClassicHttpResponse) this.client.execute(this.request, this.context);
+      ClassicHttpResponse response = this.client.executeOpen(null, this.request, this.context);
       LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
@@ -274,16 +276,16 @@ public String getStatusText() {
     @Override
     public void close() {
       try {
-        getBody();
         if (inputStream != null) {
           inputStream.close();
-          inputStream = null;
         }
+        this.response.close();
       } catch (IOException e) {
         LOGGER.error(
             "Error occurred while trying to retrieve Http Response {} in order to close it.",
             this.id,
             e);
+      } finally {
         inputStream = null;
       }
       LOGGER.trace("Closed Http Response object: {}", this.id);
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
index 441a26147..f0c2ae4ef 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -14,8 +14,8 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hc.core5.net.URLEncodedUtils;
 import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.net.URIBuilder;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.ows.wms.request.GetMapRequest;
@@ -73,7 +73,7 @@ public static URI makeWmsGetLayerRequest(
 
     Multimap<String, String> extraParams = HashMultimap.create();
     if (commonURI.getQuery() != null) {
-      for (NameValuePair pair : URLEncodedUtils.parse(commonURI, StandardCharsets.UTF_8)) {
+      for (NameValuePair pair : new URIBuilder(commonURI).getQueryParams()) {
         extraParams.put(pair.getName(), pair.getValue());
       }
     }
@@ -201,14 +201,14 @@ public static ClientHttpRequest createWmsRequest(
       final URI paramlessUri;
       try {
         paramlessUri =
-          new URI(
-            uri.getScheme(),
-            uri.getUserInfo(),
-            uri.getHost(),
-            uri.getPort(),
-            uri.getPath(),
-            null,
-            null);
+            new URI(
+                uri.getScheme(),
+                uri.getUserInfo(),
+                uri.getHost(),
+                uri.getPort(),
+                uri.getPath(),
+                null,
+                null);
       } catch (URISyntaxException e) {
         throw new RuntimeException(e);
       }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
index 22cba9cf9..3ddf38977 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
@@ -1,6 +1,5 @@
 package org.mapfish.print.servlet.job;
 
-import jakarta.annotation.Nonnull;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -10,8 +9,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
 
 /** Store accounting info in the DB. */
@@ -73,15 +70,12 @@ private void insertRecord(final HibernateAccountingEntry tuple) {
       try {
         final TransactionTemplate tmpl =
             new TransactionTemplate(HibernateAccounting.this.txManager);
-        tmpl.execute(
-            new TransactionCallbackWithoutResult() {
-              @Override
-              protected void doInTransactionWithoutResult(@Nonnull final TransactionStatus status) {
-                final Session currentSession = HibernateAccounting.this.sf.getCurrentSession();
-                currentSession.merge(tuple);
-                currentSession.flush();
-                currentSession.evict(tuple);
-              }
+        tmpl.executeWithoutResult(
+            (status) -> {
+              final Session currentSession = HibernateAccounting.this.sf.getCurrentSession();
+              currentSession.merge(tuple);
+              currentSession.flush();
+              currentSession.evict(tuple);
             });
       } catch (HibernateException ex) {
         unhealthyCountersHealthCheck.recordUnhealthyProblem(
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index 3d5a93445..bc765d755 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -164,7 +164,7 @@ public final void cancelOld(
                     builder.lessThan(root.get("lastCheckTime"), checkTimeThreshold)))));
     update.set(root.get("status"), PrintJobStatus.Status.CANCELED);
     update.set(root.get("error"), message);
-    getSession().createQuery(update).executeUpdate();
+    getSession().createMutationQuery(update).executeUpdate();
   }
 
   /**
@@ -180,7 +180,7 @@ public final void updateLastCheckTime(final String id, final long lastCheckTime)
     final Root<PrintJobStatusExtImpl> root = update.from(PrintJobStatusExtImpl.class);
     update.where(builder.equal(root.get("referenceId"), id));
     update.set(root.get("lastCheckTime"), lastCheckTime);
-    getSession().createQuery(update).executeUpdate();
+    getSession().createMutationQuery(update).executeUpdate();
   }
 
   /**
@@ -198,7 +198,7 @@ public final int deleteOld(final long checkTimeThreshold) {
         builder.and(
             builder.isNotNull(root.get("lastCheckTime")),
             builder.lessThan(root.get("lastCheckTime"), checkTimeThreshold)));
-    return getSession().createQuery(delete).executeUpdate();
+    return getSession().createMutationQuery(delete).executeUpdate();
   }
 
   /**
@@ -255,6 +255,6 @@ public void delete(final String referenceId) {
         builder.createCriteriaDelete(PrintJobStatusExtImpl.class);
     final Root<PrintJobStatusExtImpl> root = delete.from(PrintJobStatusExtImpl.class);
     delete.where(builder.equal(root.get("referenceId"), referenceId));
-    getSession().createQuery(delete).executeUpdate();
+    getSession().createMutationQuery(delete).executeUpdate();
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index 5ecd92883..304db43d0 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -7,7 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -77,10 +77,10 @@ public void testToCredentials() throws Exception {
     credential.setMatchers(Collections.singletonList(matcher));
 
     AuthScope authscope = new AuthScope(null, -1);
-    final Credentials object = credential.toCredentials(authscope);
+    final UsernamePasswordCredentials object = credential.toCredentials(authscope);
     assertNotNull(object);
     assertEquals(USERNAME, object.getUserPrincipal().getName());
-    assertEquals(PASSWORD, new String(object.getPassword()));
+    assertEquals(PASSWORD, new String(object.getUserPassword()));
 
     authscope =
         new AuthScope(
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index 534aea34f..d2ac1fac4 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -12,6 +12,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.security.KeyManagementException;
@@ -160,7 +161,9 @@ public static void respond(HttpExchange httpExchange, String errorMessage, int r
       throws IOException {
     final byte[] bytes = errorMessage.getBytes(Constants.DEFAULT_CHARSET);
     httpExchange.sendResponseHeaders(responseCode, bytes.length);
-    httpExchange.getResponseBody().write(bytes);
+    try (OutputStream os = httpExchange.getResponseBody()) {
+      os.write(bytes);
+    }
     httpExchange.close();
   }
 

From 28fb20060722bde276a3a53d6658468728975466 Mon Sep 17 00:00:00 2001
From: "geo-ghci-int[bot]"
 <146321879+geo-ghci-int[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 09:29:31 +0000
Subject: [PATCH 27/61] Apply pre-commit fix

From the artifact of the previous workflow run
---
 .../mapfish/print/cli/CliServletContext.java  |  12 +-
 .../print/http/MfCredentialsProvider.java     |   4 +-
 .../print/http/MfTLSSocketStrategy.java       |  13 +-
 .../mapfish/print/http/UserAgentCreator.java  |   4 +-
 .../java/org/mapfish/print/http/Utils.java    |   3 +-
 .../MetricsRegistryContextListener.java       |   2 +-
 .../print/processor/ExecutionStats.java       |   6 +-
 .../processor/http/matcher/MatchInfo.java     |  63 +++------
 .../mapfish/print/servlet/BaseMapServlet.java |   4 +-
 .../BooleanHandleReportLoadResult.java        |   2 +-
 .../print/servlet/HandleReportLoadResult.java |   2 +-
 .../servlet/VoidHandleReportLoadResult.java   |   2 +-
 .../fileloader/ServletConfigFileLoader.java   |   2 +-
 .../print/AbstractMapfishSpringTest.java      |  42 +++---
 ...eredReflectiveAttributeValidationTest.java |  13 +-
 .../attribute/ReflectiveAttributeTest.java    |  23 +--
 .../attribute/ScalebarAttributeTest.java      |  53 ++++---
 .../print/attribute/StringAttributeTest.java  |  33 +++--
 .../print/attribute/map/MapAttributeTest.java |  40 +++---
 ...oryAllConfigObjectMustBePrototypeTest.java |  24 ++--
 .../config/ConfigurationFactoryTest.java      |  26 ++--
 .../config/access/AndAccessAssertionTest.java |  37 ++---
 .../access/RoleAccessAssertionTest.java       | 118 +++++++++-------
 ...igFileResolvingHttpRequestFactoryTest.java |  14 +-
 .../print/map/geotools/GeoJsonLayerTest.java  | 129 +++++++++--------
 .../GeotiffLayerFactoryPluginTest.java        |  61 ++++----
 .../metrics/JobQueueHealthCheckTest.java      |   4 +-
 ...JasperReportOutputFormatSimpleMapTest.java |  44 +++---
 .../org/mapfish/print/output/ValuesTest.java  | 115 +++++++--------
 .../print/parser/MapfishParserTest.java       | 132 ++++++++++--------
 .../PdfConfigurationProcessorTest.java        |  62 ++++----
 .../ProcessorDependencyGraphFactoryTest.java  |  40 +++---
 .../http/RestrictUrisProcessorTest.java       |  32 +++--
 .../http/matcher/AddressHostMatcherTest.java  |  34 ++++-
 .../http/matcher/DnsHostMatcherTest.java      |  17 ++-
 .../http/matcher/HostnameMatcherTest.java     |  17 ++-
 .../http/matcher/LocalHostMatcherTest.java    |  17 ++-
 .../MapPrinterServletSecurityTest.java        |  38 ++---
 .../ClasspathConfigFileLoaderTest.java        |  79 ++++++-----
 .../fileloader/FileConfigFileLoaderTest.java  |  39 +++---
 .../ServletConfigFileLoaderTest.java          |  44 +++---
 41 files changed, 813 insertions(+), 633 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
index 38ccc0917..cafe0a97d 100644
--- a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
+++ b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
@@ -1,11 +1,5 @@
 package org.mapfish.print.cli;
 
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.EventListener;
-import java.util.Map;
-import java.util.Set;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterRegistration;
 import jakarta.servlet.RequestDispatcher;
@@ -15,6 +9,12 @@
 import jakarta.servlet.SessionCookieConfig;
 import jakarta.servlet.SessionTrackingMode;
 import jakarta.servlet.descriptor.JspConfigDescriptor;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * An essentially non-functional servlet context that is used by the CLI application to satisfy the
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 3edecb2e4..79f50ca25 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 
diff --git a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
index f54b3de3d..0b79ec966 100644
--- a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
+++ b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.Socket;
 import javax.net.ssl.SSLSocket;
-
 import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
 import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.protocol.HttpContext;
@@ -14,11 +13,13 @@ public final class MfTLSSocketStrategy implements TlsSocketStrategy {
   private final TlsSocketStrategy defaultStrategy = DefaultClientTlsStrategy.createDefault();
 
   @Override
-  public SSLSocket upgrade(final Socket socket,
-                           final String target,
-                           final int port,
-                           final Object attachment,
-                           final HttpContext context) throws IOException {
+  public SSLSocket upgrade(
+      final Socket socket,
+      final String target,
+      final int port,
+      final Object attachment,
+      final HttpContext context)
+      throws IOException {
     return getSocketStrategy().upgrade(socket, target, port, attachment, context);
   }
 
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index 16dd0a164..8eec77600 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -24,8 +24,8 @@ private UserAgentCreator() {}
    */
   public static String getUserAgent() {
 
-    final String httpClientUserAgent = getUserAgent(
-            "Apache-HttpClient", "org.apache.http.client", UserAgentCreator.class);
+    final String httpClientUserAgent =
+        getUserAgent("Apache-HttpClient", "org.apache.http.client", UserAgentCreator.class);
 
     // This is based on the code from HttpClient:
     final VersionInfo mapFishPrintVersionInfo =
diff --git a/core/src/main/java/org/mapfish/print/http/Utils.java b/core/src/main/java/org/mapfish/print/http/Utils.java
index 50b19a27a..423004aa6 100644
--- a/core/src/main/java/org/mapfish/print/http/Utils.java
+++ b/core/src/main/java/org/mapfish/print/http/Utils.java
@@ -1,10 +1,9 @@
 package org.mapfish.print.http;
 
-import org.springframework.http.HttpHeaders;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.springframework.http.HttpHeaders;
 
 /** Network utils class. */
 public final class Utils {
diff --git a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
index aacdd0ba6..b9ea2d088 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
@@ -26,7 +26,7 @@ public final void contextInitialized(final ServletContextEvent event) {
   protected final MetricRegistry getMetricRegistry() {
     // In Spring 6+, getWebApplicationContext accepts jakarta.servlet.ServletContext
     final WebApplicationContext webApplicationContext =
-      getWebApplicationContext(this.servletContext);
+        getWebApplicationContext(this.servletContext);
     return webApplicationContext.getBean(MetricRegistry.class);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
index 6467551c3..889c5a259 100644
--- a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
+++ b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
@@ -1,8 +1,5 @@
 package org.mapfish.print.processor;
 
-import tools.jackson.databind.node.ArrayNode;
-import tools.jackson.databind.node.JsonNodeFactory;
-import tools.jackson.databind.node.ObjectNode;
 import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +7,9 @@
 import net.sf.jasperreports.engine.PrintPageFormat;
 import org.mapfish.print.attribute.map.MapAttribute;
 import org.mapfish.print.attribute.map.MapfishMapContext;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.ObjectNode;
 
 /** Statisctics about the execution of a print job. */
 public class ExecutionStats {
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index f5696be13..c75eff754 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -2,53 +2,34 @@
 
 import java.net.MalformedURLException;
 import java.net.URI;
-
 import org.apache.commons.lang3.Strings;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
 
-/**
- * Information required for performing a request match.
- */
+/** Information required for performing a request match. */
 public final class MatchInfo {
-  /**
-   * A value representing all and any schemes.
-   */
+  /** A value representing all and any schemes. */
   public static final String ANY_SCHEME = null;
 
-  /**
-   * A value representing all and any hosts.
-   */
+  /** A value representing all and any hosts. */
   public static final String ANY_HOST = null;
 
-  /**
-   * A value representing all and any realms.
-   */
+  /** A value representing all and any realms. */
   public static final String ANY_REALM = null;
 
-  /**
-   * A value representing all and any paths.
-   */
+  /** A value representing all and any paths. */
   public static final String ANY_PATH = null;
 
-  /**
-   * A value representing all and any fragments.
-   */
+  /** A value representing all and any fragments. */
   public static final String ANY_FRAGMENT = null;
 
-  /**
-   * A value representing all and any queries.
-   */
+  /** A value representing all and any queries. */
   public static final String ANY_QUERY = null;
 
-  /**
-   * A value representing all and any queries.
-   */
+  /** A value representing all and any queries. */
   public static final HttpMethod ANY_METHOD = null;
 
-  /**
-   * A value representing all and any ports.
-   */
+  /** A value representing all and any ports. */
   public static final int ANY_PORT = -1;
 
   private final String scheme;
@@ -64,9 +45,9 @@ public final class MatchInfo {
    * Constructor.
    *
    * @param scheme the scheme to match.
-   * @param host   the host to match.
-   * @param port   the host to match.
-   * @param realm  the realm to match.
+   * @param host the host to match.
+   * @param port the host to match.
+   * @param realm the realm to match.
    */
   private MatchInfo(final String scheme, final String host, final int port, final String realm) {
     this.scheme = scheme;
@@ -82,8 +63,8 @@ private MatchInfo(final String scheme, final String host, final int port, final
   /**
    * Constructor.
    *
-   * @param uri    the uri containing the parameters to match.
-   * @param port   the host to match.
+   * @param uri the uri containing the parameters to match.
+   * @param port the host to match.
    * @param method the method to match.
    */
   private MatchInfo(final URI uri, final int port, final HttpMethod method) {
@@ -100,7 +81,7 @@ private MatchInfo(final URI uri, final int port, final HttpMethod method) {
   /**
    * Create an info object from a uri and the http method object.
    *
-   * @param uri    the uri
+   * @param uri the uri
    * @param method the method
    */
   public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
@@ -123,13 +104,15 @@ public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
    */
   public static MatchInfo fromAuthScope(final AuthScope authscope) {
 
-    String newScheme = Strings.CS.equals(authscope.getSchemeName(), ANY_SCHEME) ? ANY_SCHEME
-      : authscope.getSchemeName();
-    String newHost = Strings.CS.equals(authscope.getHost(), ANY_HOST) ? ANY_HOST
-      : authscope.getHost();
+    String newScheme =
+        Strings.CS.equals(authscope.getSchemeName(), ANY_SCHEME)
+            ? ANY_SCHEME
+            : authscope.getSchemeName();
+    String newHost =
+        Strings.CS.equals(authscope.getHost(), ANY_HOST) ? ANY_HOST : authscope.getHost();
     int newPort = authscope.getPort() == ANY_PORT ? ANY_PORT : authscope.getPort();
-    String newRealm = Strings.CS.equals(authscope.getRealm(), ANY_REALM) ? ANY_REALM
-      : authscope.getRealm();
+    String newRealm =
+        Strings.CS.equals(authscope.getRealm(), ANY_REALM) ? ANY_REALM : authscope.getRealm();
 
     return new MatchInfo(newScheme, newHost, newPort, newRealm);
   }
diff --git a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
index e835f518e..4688a2a6a 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.servlet;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import org.mapfish.print.PrintException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
index 2b15ffbb7..f910a0188 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
-import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
index eadca958b..bfe418600 100644
--- a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
@@ -8,7 +9,6 @@
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.slf4j.Logger;
diff --git a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
index 47abe82c9..ec2c06032 100644
--- a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
-import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
index bc67539f5..f1c894326 100644
--- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
+++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.servlet.fileloader;
 
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.net.URI;
 import java.util.Collections;
 import java.util.Iterator;
-import jakarta.servlet.ServletContext;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** A plugin that loads the config resources from urls starting with prefix: {@value #PREFIX}://. */
diff --git a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
index ac1c80871..29ca711d3 100644
--- a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
+++ b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
@@ -34,24 +34,24 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
-  locations = {
-    AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
-    AbstractMapfishSpringTest.TEST_SPRING_XML,
-    AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
-  })
+    locations = {
+      AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
+      AbstractMapfishSpringTest.TEST_SPRING_XML,
+      AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
+    })
 public abstract class AbstractMapfishSpringTest {
   public static final String DEFAULT_SPRING_XML =
-    "classpath:mapfish-spring-application-context.xml";
+      "classpath:mapfish-spring-application-context.xml";
   public static final String TEST_SPRING_XML =
-    "classpath:test-http-request-factory-application-context.xml";
+      "classpath:test-http-request-factory-application-context.xml";
   public static final String TEST_SPRING_FONT_XML =
-    "classpath:test-mapfish-spring-custom-fonts.xml";
+      "classpath:test-mapfish-spring-custom-fonts.xml";
   // The maximum number of times to retry fetching a resource used in tests
   public static final int HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY = 2;
   // The interval between retries used in tests
   public static final int HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS = 1;
   protected static final Processor.ExecutionContext CONTEXT =
-    new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
+      new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
   static final Pattern IMPORT_PATTERN = Pattern.compile("@@importFile\\((\\S+)\\)@@");
 
   @Autowired private WorkingDirectories workingDirectories;
@@ -67,7 +67,7 @@ public static File getFile(Class<?> testClass, String fileName) {
     final URL resource = testClass.getResource(fileName);
     if (resource == null) {
       throw new AssertionError(
-        "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
+          "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
     }
 
     return new File(resource.getFile());
@@ -87,7 +87,7 @@ public static PJsonObject parseJSONObjectFromString(String jsonString) {
   }
 
   public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fileName)
-    throws IOException {
+      throws IOException {
     final File file = getFile(testClass, fileName);
     String jsonString = Files.readString(file.toPath(), Constants.DEFAULT_CHARSET);
     Matcher matcher = IMPORT_PATTERN.matcher(jsonString);
@@ -105,7 +105,7 @@ public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fil
   public static MapfishMapContext createTestMapContext() {
     try {
       final CenterScaleMapBounds bounds =
-        new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
+          new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
       return new MapfishMapContext(bounds, new Dimension(500, 500), 0, 72, true, true);
     } catch (FactoryException e) {
       throw new RuntimeException(e);
@@ -187,13 +187,13 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     }
 
     String platformVersionName =
-      "expectedSimpleImage"
-        + classifier
-        + "-"
-        + normalizedOSName()
-        + "-jdk"
-        + javaVersion
-        + ".png";
+        "expectedSimpleImage"
+            + classifier
+            + "-"
+            + normalizedOSName()
+            + "-jdk"
+            + javaVersion
+            + ".png";
     String platformName = "expectedSimpleImage" + classifier + "-" + normalizedOSName() + ".png";
     String defaultName = "expectedSimpleImage" + classifier + ".png";
 
@@ -203,8 +203,8 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     //        ImageIO.write(actualImage, "png", new File(TMP, baseDir + "/" + defaultName));
 
     return OptionalUtils.or(
-        () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
-      .orElse(defaultName);
+            () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
+        .orElse(defaultName);
   }
 
   private Optional<String> findImage(final String baseDir, final String fileName) {
diff --git a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
index 6fc2383f2..7f016456d 100644
--- a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
@@ -22,13 +22,14 @@ public class AllRegisteredReflectiveAttributeValidationTest extends AbstractMapf
 
   @Test
   public void testAllAttributesHaveLegalValues() {
-    assertDoesNotThrow(() -> {
-      for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
-        attribute.init();
-      }
+    assertDoesNotThrow(
+        () -> {
+          for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
+            attribute.init();
+          }
 
-      // no exception... good
-    });
+          // no exception... good
+        });
 
     // no exception... good
   }
diff --git a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
index f3c974deb..c099477bc 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
@@ -15,32 +15,35 @@
 public class ReflectiveAttributeTest {
   @Test
   public void testPJsonObjIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(PJsonObjParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(PJsonObjParamIllegal.class).init());
   }
 
   @Test
   public void testPJsonArrayIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(PJsonArrayParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(PJsonArrayParamIllegal.class).init());
   }
 
   @Test
   public void testJsonObjIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(JsonObjParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(JsonObjParamIllegal.class).init());
   }
 
   @Test
   public void testJsonArrayIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(JsonArrayParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(JsonArrayParamIllegal.class).init());
   }
 
   @Test
   public void testEmpty() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(Empty.class).init());
+    assertThrows(AssertionFailedException.class, () -> new TestReflectiveAtt(Empty.class).init());
   }
 
   private static class TestReflectiveAtt extends ReflectiveAttribute<Object> {
diff --git a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
index f52e6d39a..23b85996c 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
@@ -43,42 +43,49 @@ public void testCreateValue() {
 
   @Test
   public void testPostConstruct() {
-    assertDoesNotThrow(() -> {
-      ScalebarAttributeValues values = getValues();
-      values.postConstruct();
-      // passes.. ok
-    });
+    assertDoesNotThrow(
+        () -> {
+          ScalebarAttributeValues values = getValues();
+          values.postConstruct();
+          // passes.. ok
+        });
     // passes.. ok
   }
 
   @Test
   public void testPostConstructInvalidColor() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      ScalebarAttributeValues values = getValues();
-
-      values.backgroundColor = "sun-yellow";
-      values.postConstruct();
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          ScalebarAttributeValues values = getValues();
+
+          values.backgroundColor = "sun-yellow";
+          values.postConstruct();
+        });
   }
 
   @Test
   public void testPostConstructInvalidUnit() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      ScalebarAttributeValues values = getValues();
-
-      values.unit = "light-years";
-      values.postConstruct();
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          ScalebarAttributeValues values = getValues();
+
+          values.unit = "light-years";
+          values.postConstruct();
+        });
   }
 
   @Test
   public void testPostConstructInvalidIntervals() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      ScalebarAttributeValues values = getValues();
-
-      values.intervals = 0;
-      values.postConstruct();
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          ScalebarAttributeValues values = getValues();
+
+          values.intervals = 0;
+          values.postConstruct();
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
index 791e5c3c8..d2bd67ea6 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
@@ -47,22 +47,25 @@ public void testParsableByValues() throws Exception {
 
   @Test
   public void testParsableByValuesError() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-      PJsonObject requestData = loadJsonRequestDataError();
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+          PJsonObject requestData = loadJsonRequestDataError();
 
-      Template template = config.getTemplate("main");
-      new Values(
-          new HashMap<>(),
-          requestData,
-          template,
-          config.getDirectory(),
-          httpClientFactory,
-          config.getDirectory(),
-          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-          new AtomicBoolean(false));
-    });
+          Template template = config.getTemplate("main");
+          new Values(
+              new HashMap<>(),
+              requestData,
+              template,
+              config.getDirectory(),
+              httpClientFactory,
+              config.getDirectory(),
+              HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+              HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+              new AtomicBoolean(false));
+        });
   }
 
   private PJsonObject loadJsonRequestData() throws IOException {
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
index 6f20799ec..3d675a0e0 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
@@ -40,24 +40,28 @@ public void setUp() {
   @SuppressWarnings("unchecked")
   @Test
   public void testMaxDpi() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final File configFile =
-          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
-      final Configuration config = configurationFactory.getConfig(configFile);
-      final Template template = config.getTemplate("main");
-
-      final PJsonObject pJsonObject = loadJsonRequestData();
-      final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
-      final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
-      map.remove("dpi");
-      map.accumulate("dpi", 1000);
-
-      final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
-          (ReflectiveAttribute<MapAttribute.MapAttributeValues>) template.getAttributes().get("map");
-
-      final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
-      MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final File configFile =
+              getFile(
+                  CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
+          final Configuration config = configurationFactory.getConfig(configFile);
+          final Template template = config.getTemplate("main");
+
+          final PJsonObject pJsonObject = loadJsonRequestData();
+          final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
+          final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
+          map.remove("dpi");
+          map.accumulate("dpi", 1000);
+
+          final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
+              (ReflectiveAttribute<MapAttribute.MapAttributeValues>)
+                  template.getAttributes().get("map");
+
+          final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
+          MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
index 7bd6aa253..5801a5dfe 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
@@ -17,16 +17,18 @@ public class ConfigurationFactoryAllConfigObjectMustBePrototypeTest {
 
   @Test
   public void testAll() throws Exception {
-    assertThrows(BeanCreationException.class, () -> {
-      ClassPathXmlApplicationContext applicationContext =
-          new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
-      ConfigurationFactory configurationFactory =
-          applicationContext.getBean(ConfigurationFactory.class);
-      File configFile =
-          AbstractMapfishSpringTest.getFile(
-              ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
-              "configRequiringSpringInjection.yaml");
-      configurationFactory.getConfig(configFile);
-    });
+    assertThrows(
+        BeanCreationException.class,
+        () -> {
+          ClassPathXmlApplicationContext applicationContext =
+              new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
+          ConfigurationFactory configurationFactory =
+              applicationContext.getBean(ConfigurationFactory.class);
+          File configFile =
+              AbstractMapfishSpringTest.getFile(
+                  ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
+                  "configRequiringSpringInjection.yaml");
+          configurationFactory.getConfig(configFile);
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
index b12d104e7..cf1a4eef5 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
@@ -120,19 +120,25 @@ public void testConfigurationInjection() throws Exception {
 
   @Test
   public void testConfigurationAttributeMustImplementAttribute() throws Exception {
-    assertThrows(ConstructorException.class, () -> {
-      File configFile =
-          getFile(ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
-      configurationFactory.getConfig(configFile);
-    });
+    assertThrows(
+        ConstructorException.class,
+        () -> {
+          File configFile =
+              getFile(
+                  ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
+          configurationFactory.getConfig(configFile);
+        });
   }
 
   @Test
   public void testConfigurationProcessorMustImplementProcessor() throws Exception {
-    assertThrows(ConstructorException.class, () -> {
-      File configFile =
-          getFile(ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
-      configurationFactory.getConfig(configFile);
-    });
+    assertThrows(
+        ConstructorException.class,
+        () -> {
+          File configFile =
+              getFile(
+                  ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
+          configurationFactory.getConfig(configFile);
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
index 238bbfb00..ae08bd29f 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
@@ -23,27 +23,32 @@ public void tearDown() {
 
   @Test
   public void testSetPredicates() {
-    assertThrows(AssertionError.class, () -> {
-
-      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
-      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
-    });
+    assertThrows(
+        AssertionError.class,
+        () -> {
+          final AndAccessAssertion andAssertion =
+              applicationContext.getBean(AndAccessAssertion.class);
+          andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
+          andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
+        });
   }
 
   @Test
   public void testAssertAccessNotAllowed() {
-    assertThrows(AccessDeniedException.class, () -> {
-      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-      AccessAssertion pred1 =
-          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
-      AccessAssertion pred2 =
-          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
-      andAssertion.setPredicates(pred1, pred2);
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          final AndAccessAssertion andAssertion =
+              applicationContext.getBean(AndAccessAssertion.class);
+          AccessAssertion pred1 =
+              new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
+          AccessAssertion pred2 =
+              new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
+          andAssertion.setPredicates(pred1, pred2);
 
-      AccessAssertionTestUtil.setCreds("ROLE_USER");
-      andAssertion.assertAccess("", this);
-    });
+          AccessAssertionTestUtil.setCreds("ROLE_USER");
+          andAssertion.assertAccess("", this);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
index 294a83e04..c3907616e 100644
--- a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
@@ -25,32 +25,38 @@ public void tearDown() {
 
   @Test
   public void testSetRequiredRoles() {
-    assertThrows(AssertionError.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    });
+    assertThrows(
+        AssertionError.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+        });
   }
 
   @Test
   public void testAssertAccessNoCredentials() {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
   public void testAssertAccessWrongCreds() {
-    assertThrows(AccessDeniedException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-
-      setCreds("ROLE_USER2");
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+
+          setCreds("ROLE_USER2");
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
@@ -82,25 +88,29 @@ public void testAssertAccessOneOf() {
 
   @Test
   public void testAssertAccessOneOfFailed() {
-    assertThrows(AccessDeniedException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
-
-      setCreds("ROLE_OTHER");
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
+
+          setCreds("ROLE_OTHER");
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
   public void testAssertNoRolesNoCreds() {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(new HashSet<>());
-
-      assertion.assertAccess("", this);
-      setCreds("ROLE_OTHER", "ROLE_USER2");
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(new HashSet<>());
+
+          assertion.assertAccess("", this);
+          setCreds("ROLE_OTHER", "ROLE_USER2");
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
@@ -117,29 +127,33 @@ public void testAssertNoRolesSomeCreds() {
 
   @Test
   public void testMarshalUnmarshalNoAuth() {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-      final JSONObject marshalData = assertion.marshal();
-
-      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-      newAssertion.unmarshal(marshalData);
-      newAssertion.assertAccess("", this);
-    });
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+          final JSONObject marshalData = assertion.marshal();
+
+          RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+          newAssertion.unmarshal(marshalData);
+          newAssertion.assertAccess("", this);
+        });
   }
 
   @Test
   public void testMarshalUnmarshalNotPermitted() {
-    assertThrows(AccessDeniedException.class, () -> {
-      setCreds("ROLE_OTHER");
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-      final JSONObject marshalData = assertion.marshal();
-
-      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-      newAssertion.unmarshal(marshalData);
-      newAssertion.assertAccess("", this);
-    });
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          setCreds("ROLE_OTHER");
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+          final JSONObject marshalData = assertion.marshal();
+
+          RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+          newAssertion.unmarshal(marshalData);
+          newAssertion.assertAccess("", this);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
index 7daaf50c6..25b566a5a 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
@@ -149,12 +149,14 @@ public void testCreateRequestRelativeFileToConfig() throws Exception {
 
   @Test
   public void testCreateRequestIllegalFile() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI uri = logbackXml.toURI();
-      final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
-
-      request.execute();
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI uri = logbackXml.toURI();
+          final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
+
+          request.execute();
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
index 0af9af867..8ff4f417a 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
@@ -70,70 +70,87 @@ public void testGeoJsonEmbedded() throws Exception {
 
   @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final File file =
-          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-      final PJsonObject requestData =
-          parseJSONObjectFromString(
-              "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
-
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-      configuration.setFileLoaderManager(this.fileLoaderManager);
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-      MapfishParserTest.populateLayerParam(requestData, param, "type");
-      geojsonLayerParser
-          .parse(template, param)
-          .getLayers(
-              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final File file =
+              getFile(
+                  CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+          final PJsonObject requestData =
+              parseJSONObjectFromString(
+                  "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
+
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+          configuration.setFileLoaderManager(this.fileLoaderManager);
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+          MapfishParserTest.populateLayerParam(requestData, param, "type");
+          geojsonLayerParser
+              .parse(template, param)
+              .getLayers(
+                  httpRequestFactory,
+                  AbstractMapfishSpringTest.createTestMapContext(),
+                  CONTEXT,
+                  null);
+        });
   }
 
   @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-      configuration.setFileLoaderManager(this.fileLoaderManager);
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-      param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
-      geojsonLayerParser
-          .parse(template, param)
-          .getLayers(
-              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+          configuration.setFileLoaderManager(this.fileLoaderManager);
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+          param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
+          geojsonLayerParser
+              .parse(template, param)
+              .getLayers(
+                  httpRequestFactory,
+                  AbstractMapfishSpringTest.createTestMapContext(),
+                  CONTEXT,
+                  null);
+        });
   }
 
   @Test
   public void testGeoNotUrlNotGeoJson() {
-    assertThrows(Exception.class, () -> {
-      final File file =
-          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-      final PJsonObject requestData =
-          parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
-
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(file);
-      configuration.setFileLoaderManager(this.fileLoaderManager);
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-      MapfishParserTest.populateLayerParam(requestData, param, "type");
-      geojsonLayerParser
-          .parse(template, param)
-          .getLayers(
-              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
-    });
+    assertThrows(
+        Exception.class,
+        () -> {
+          final File file =
+              getFile(
+                  CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+          final PJsonObject requestData =
+              parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
+
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(file);
+          configuration.setFileLoaderManager(this.fileLoaderManager);
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+          MapfishParserTest.populateLayerParam(requestData, param, "type");
+          geojsonLayerParser
+              .parse(template, param)
+              .getLayers(
+                  httpRequestFactory,
+                  AbstractMapfishSpringTest.createTestMapContext(),
+                  CONTEXT,
+                  null);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
index c82f9df40..5add674fd 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
@@ -15,36 +15,43 @@ public class GeotiffLayerFactoryPluginTest {
 
   @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final File file =
-          AbstractMapfishSpringTest.getFile(
-              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
-              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR + "sampleGeoTiff.tif");
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-      param.url = file.toURI().toURL().toString();
-      new GeotiffLayer.Plugin().parse(template, param);
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final File file =
+              AbstractMapfishSpringTest.getFile(
+                  CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
+                  CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR
+                      + "sampleGeoTiff.tif");
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+          param.url = file.toURI().toURL().toString();
+          new GeotiffLayer.Plugin().parse(template, param);
+        });
   }
 
   @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-      param.url =
-          "file://../" + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR + "/geojson.json";
-      new GeotiffLayer.Plugin().parse(template, param);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+          param.url =
+              "file://../"
+                  + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR
+                  + "/geojson.json";
+          new GeotiffLayer.Plugin().parse(template, param);
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
index 0662ff45c..283157522 100644
--- a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
+++ b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
@@ -51,8 +51,8 @@ public void testCheck_Failed_NoPrintJobs() {
         assertThrowsExactly(
             RuntimeException.class,
             () ->
-              // WHEN
-              jobQueueHealthCheck.check());
+                // WHEN
+                jobQueueHealthCheck.check());
 
     assertEquals(
         "None of the print job queued was processed by this server, in the last (seconds): 300",
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
index d5e754814..4f280918a 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
@@ -52,28 +52,30 @@ public void testPrint() throws Exception {
 
   @Test
   public void testAllOutputFormats() throws Exception {
-    assertDoesNotThrow(() -> {
-      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-      final PJsonObject requestData = loadJsonRequestData();
+    assertDoesNotThrow(
+        () -> {
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+          final PJsonObject requestData = loadJsonRequestData();
 
-      for (OutputFormat format : this.outputFormat.values()) {
-        if ("bmp".equals(format.getFileSuffix())
-            || "jpeg".equals(format.getFileSuffix())
-            || "jpg".equals(format.getFileSuffix())) {
-          // BMP and JPEG do not support transparency
-          continue;
-        }
-        final OutputStream outputStream = new ByteArrayOutputStream();
-        format.print(
-            new HashMap<>(),
-            requestData,
-            config,
-            getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
-            getTaskDirectory(),
-            outputStream);
-        // no error?  its a pass
+          for (OutputFormat format : this.outputFormat.values()) {
+            if ("bmp".equals(format.getFileSuffix())
+                || "jpeg".equals(format.getFileSuffix())
+                || "jpg".equals(format.getFileSuffix())) {
+              // BMP and JPEG do not support transparency
+              continue;
+            }
+            final OutputStream outputStream = new ByteArrayOutputStream();
+            format.print(
+                new HashMap<>(),
+                requestData,
+                config,
+                getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
+                getTaskDirectory(),
+                outputStream);
+            // no error?  its a pass
 
-      }
-    });
+          }
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/ValuesTest.java b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
index c71e39a40..684d3c939 100644
--- a/core/src/test/java/org/mapfish/print/output/ValuesTest.java
+++ b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
@@ -72,27 +72,29 @@ public void testNoDefaults() throws Exception {
 
   @Test
   public void testNoDefaults_Error_OnMissing_Attribute() throws Exception {
-    assertThrows(ObjectMissingException.class, () -> {
-      configurationFactory.setDoValidation(false);
-      final JSONObject obj = new JSONObject();
-      PJsonObject requestData = new PJsonObject(obj, "");
-      final JSONObject atts = new JSONObject();
-      obj.put("attributes", atts);
-      final Configuration config =
-          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-      Template template = config.getTemplates().values().iterator().next();
-      new Values(
-          new HashMap<>(),
-          requestData,
-          template,
-          new File("tmp"),
-          this.httpRequestFactory,
-          new File("."),
-          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-          new AtomicBoolean(false));
-    });
+    assertThrows(
+        ObjectMissingException.class,
+        () -> {
+          configurationFactory.setDoValidation(false);
+          final JSONObject obj = new JSONObject();
+          PJsonObject requestData = new PJsonObject(obj, "");
+          final JSONObject atts = new JSONObject();
+          obj.put("attributes", atts);
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+          Template template = config.getTemplates().values().iterator().next();
+          new Values(
+              new HashMap<>(),
+              requestData,
+              template,
+              new File("tmp"),
+              this.httpRequestFactory,
+              new File("."),
+              HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+              HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+              new AtomicBoolean(false));
+        });
   }
 
   @Test
@@ -138,40 +140,41 @@ public void testDefaults() throws Exception {
 
   @Test
   public void testExpectObjectGetArray() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-
-      PJsonObject requestData =
-          parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
-      String badLegendConf =
-          """
-        [{
-            "name": "",
-            "classes": [{
-                "name": "osm",
-                "icons":\
-         ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
-        &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
-            }]
-        }]
-        """;
-      requestData
-          .getInternalObj()
-          .getJSONObject("attributes")
-          .put("legend", new JSONArray(badLegendConf));
-      final Configuration config =
-          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-      Template template = config.getTemplates().values().iterator().next();
-      new Values(
-          new HashMap<>(),
-          requestData,
-          template,
-          new File("tmp"),
-          this.httpRequestFactory,
-          new File("."),
-          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-          new AtomicBoolean(false));
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          PJsonObject requestData =
+              parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
+          String badLegendConf =
+              """
+              [{
+                  "name": "",
+                  "classes": [{
+                      "name": "osm",
+                      "icons":\
+               ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
+              &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
+                  }]
+              }]
+              """;
+          requestData
+              .getInternalObj()
+              .getJSONObject("attributes")
+              .put("legend", new JSONArray(badLegendConf));
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+          Template template = config.getTemplates().values().iterator().next();
+          new Values(
+              new HashMap<>(),
+              requestData,
+              template,
+              new File("tmp"),
+              this.httpRequestFactory,
+              new File("."),
+              HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+              HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+              new AtomicBoolean(false));
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
index 482832d85..b7a06afa7 100644
--- a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
+++ b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
@@ -91,32 +91,39 @@ public void testChoice() {
 
   @Test
   public void testBothOneOfChoices() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestChoiceClass p = new TestChoiceClass();
-      PJsonObject json =
-          AbstractMapfishSpringTest.parseJSONObjectFromString("{\"choiceA\":1,\"choiceB\":2.0}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestChoiceClass p = new TestChoiceClass();
+          PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString(
+                  "{\"choiceA\":1,\"choiceB\":2.0}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testBothOneOfChoicesAndCanSatisfyOneOf() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestChoiceClass p = new TestChoiceClass();
-      PJsonObject json =
-          AbstractMapfishSpringTest.parseJSONObjectFromString(
-              "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestChoiceClass p = new TestChoiceClass();
+          PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString(
+                  "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testMissingOneOfChoices() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestChoiceClass p = new TestChoiceClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestChoiceClass p = new TestChoiceClass();
+          PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
@@ -152,20 +159,25 @@ public void testOnlyRequirementDefinedNotDependant() {
 
   @Test
   public void testMissingBothRequirements() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestRequireClass p = new TestRequireClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestRequireClass p = new TestRequireClass();
+          PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testMissingOneOfTwoRequirements() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestRequireClass p = new TestRequireClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestRequireClass p = new TestRequireClass();
+          PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
@@ -178,24 +190,28 @@ public void testFinalPublic() {
 
   @Test
   public void testFinalFieldMustNotBeInJson() {
-    assertThrows(ExtraPropertyException.class, () -> {
-      TestFinalClass p = new TestFinalClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        ExtraPropertyException.class,
+        () -> {
+          TestFinalClass p = new TestFinalClass();
+          PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testEnumIllegalVal() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      TestEnumParam p = new TestEnumParam();
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          TestEnumParam p = new TestEnumParam();
 
-      final PJsonObject json =
-          AbstractMapfishSpringTest.parseJSONObjectFromString(
-              "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
+          final PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString(
+                  "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
 
-      MapfishParser.parse(true, json, p, "toIgnore");
-    });
+          MapfishParser.parse(true, json, p, "toIgnore");
+        });
   }
 
   @Test
@@ -300,23 +316,25 @@ public void testPopulateLayerParam_TooManyParams() throws IOException {
 
   @Test
   public void testDoesntMap() {
-    assertThrows(ExtraPropertyException.class, () -> {
-      String legendAtts =
-          """
-        {
-            "extra": "",
-            "classes": [{
-                "name": "osm",
-                "icons":\
-         ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
-        &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
-            }]
-        }
-        """;
-      PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
-      LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
-      MapfishParser.parse(true, requestData, param);
-    });
+    assertThrows(
+        ExtraPropertyException.class,
+        () -> {
+          String legendAtts =
+              """
+              {
+                  "extra": "",
+                  "classes": [{
+                      "name": "osm",
+                      "icons":\
+               ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
+              &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
+                  }]
+              }
+              """;
+          PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
+          LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
+          MapfishParser.parse(true, requestData, param);
+        });
   }
 
   enum TestEnum {
diff --git a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
index a0c67bf5e..ae3fdfccc 100644
--- a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
@@ -121,38 +121,44 @@ public void testKeywords() {
 
   @Test
   public void testExec_WrongFieldName() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      Map<String, Object> attributeMap = new HashMap<>();
-      final String titleKey = "titleAtt";
-      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-      in.values = new Values();
-      in.pdfConfig = new PDFConfig();
-
-      attributeMap.put("title", titleKey + ".xxx");
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      in.values.put(titleKey, new CustomTitleAtt());
-      pdfConfigurationProcessor.execute(in, null);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          Map<String, Object> attributeMap = new HashMap<>();
+          final String titleKey = "titleAtt";
+          final PdfConfigurationProcessor pdfConfigurationProcessor =
+              new PdfConfigurationProcessor();
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+          in.values = new Values();
+          in.pdfConfig = new PDFConfig();
+
+          attributeMap.put("title", titleKey + ".xxx");
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          in.values.put(titleKey, new CustomTitleAtt());
+          pdfConfigurationProcessor.execute(in, null);
+        });
   }
 
   @Test
   public void testExec_NullValue() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      Map<String, Object> attributeMap = new HashMap<>();
-      final String titleKey = "titleAtt";
-      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-      in.values = new Values();
-      in.pdfConfig = new PDFConfig();
-
-      attributeMap.put("title", titleKey + ".value");
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      in.values.put(titleKey, new CustomTitleAtt());
-      pdfConfigurationProcessor.execute(in, null);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          Map<String, Object> attributeMap = new HashMap<>();
+          final String titleKey = "titleAtt";
+          final PdfConfigurationProcessor pdfConfigurationProcessor =
+              new PdfConfigurationProcessor();
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+          in.values = new Values();
+          in.pdfConfig = new PDFConfig();
+
+          attributeMap.put("title", titleKey + ".value");
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          in.values.put(titleKey, new CustomTitleAtt());
+          pdfConfigurationProcessor.execute(in, null);
+        });
   }
 
   private void assertNumErrors(Map<String, Object> attributeMap, int expectedNumErrors) {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
index 8f071a583..3f33be1c1 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
@@ -396,12 +396,14 @@ public void testBuildProcessInputHasValuesAndOtherInput_WithInputMapping() {
    */
   @Test
   public void testBuildDependencyAttachesToLastElementProducingTheValue() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final List<TestProcessor<MapInput, Void>> processors =
-          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final List<TestProcessor<MapInput, Void>> processors =
+              Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
 
-      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-    });
+          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+        });
   }
 
   /**
@@ -424,11 +426,13 @@ public void testBuildDebugOutput() {
    */
   @Test
   public void testBuildValuesWithSameNameAndDifferentType() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
 
-      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-    });
+          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+        });
   }
 
   /**
@@ -452,14 +456,16 @@ public void testBuildWhenOutputsMapToAllOtherInputs() {
    */
   @Test
   public void testExtraOutputMapperMapping() {
-    assertThrows(RuntimeException.class, () -> {
-      final List<TestProcessor<MapInput, Void>> processors =
-          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
-
-      ProcessorDependencyGraph graph =
-          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-      assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
-    });
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          final List<TestProcessor<MapInput, Void>> processors =
+              Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+
+          ProcessorDependencyGraph graph =
+              this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+          assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
+        });
   }
 
   private void assertHasOrdering(TestOrderExecution execution, Processor... processors) {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
index 815182a5f..b6c947ba0 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
@@ -46,13 +46,15 @@ public void testCreateFactoryWrapperLegalRequest() throws Exception {
 
   @Test
   public void testCreateFactoryWrapperIllegalRequest() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
-      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-      final ClientHttpRequestFactory factoryWrapper =
-          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-      factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
+          ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+          final ClientHttpRequestFactory factoryWrapper =
+              restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+          factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
+        });
   }
 
   @Test
@@ -66,13 +68,15 @@ public void testRejectWithLegalRequest() throws Exception {
 
   @Test
   public void testRejectWithIllegalRequest() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
-      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-      final ClientHttpRequestFactory factoryWrapper =
-          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-      factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
+          ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+          final ClientHttpRequestFactory factoryWrapper =
+              restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+          factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
+        });
   }
 
   private RestrictUrisProcessor createLocalhostOnly() {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index 7fa82089e..a93be856a 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -20,15 +20,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setMask("255.255.255.0");
     addressHostMatcher.setIp("127.0.0.0");
@@ -42,15 +53,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setPort(8080);
     assertMatch(addressHostMatcher, true, new URI("http://127.0.0.1:8080"), HttpMethod.GET);
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index ba68c69cc..00594c330 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -30,15 +30,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "localhost",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     dnsHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index 7f1abc87b..675f7549f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -39,15 +39,26 @@ public void testNoSubdomain() throws Exception {
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "localhost",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertFalse(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     hostnameHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 85ff93117..77fb2a7b0 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -47,15 +47,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     assertMatch(localHostMatcher, false, new URI("http://www.camptocamp.com/"), HttpMethod.GET);
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
index 2687eeab3..26db0e7b7 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
@@ -60,34 +60,38 @@ public void testCreateReportAndGet_Success() throws Exception {
   @Test
   @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_InsufficientPrivileges() throws Exception {
-    assertThrows(AccessDeniedException.class, () -> {
-      AccessAssertionTestUtil.setCreds("ROLE_USER");
-      setUpConfigFiles();
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          AccessAssertionTestUtil.setCreds("ROLE_USER");
+          setUpConfigFiles();
 
-      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+          final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+          final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-      String requestData = loadRequestDataAsString();
+          String requestData = loadRequestDataAsString();
 
-      this.servlet.createReportAndGetNoAppId(
-          "png", requestData, false, servletCreateRequest, servletCreateResponse);
-    });
+          this.servlet.createReportAndGetNoAppId(
+              "png", requestData, false, servletCreateRequest, servletCreateResponse);
+        });
   }
 
   @Test
   @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_NoCredentials() throws Exception {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      setUpConfigFiles();
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          setUpConfigFiles();
 
-      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+          final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+          final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-      String requestData = loadRequestDataAsString();
+          String requestData = loadRequestDataAsString();
 
-      this.servlet.createReportAndGetNoAppId(
-          "png", requestData, false, servletCreateRequest, servletCreateResponse);
-    });
+          this.servlet.createReportAndGetNoAppId(
+              "png", requestData, false, servletCreateRequest, servletCreateResponse);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
index 70d3c2da2..366b003e0 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
@@ -100,55 +100,68 @@ public void testLoadFileChildResource() throws Exception {
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
-
-      this.loader.loadFile(
-          configFileUri, "classpath://test-http-request-factory-application-context.xml");
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
+
+          this.loader.loadFile(
+              configFileUri, "classpath://test-http-request-factory-application-context.xml");
+        });
   }
 
   @Test
   public void testLoadFileChildResource_NotClasspathURI() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
-      final String resourceFileName = "resourceFile.txt";
-
-      final String uri = getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
-      this.loader.loadFile(configFileUri, uri);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
+          final String resourceFileName = "resourceFile.txt";
+
+          final String uri =
+              getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
+          this.loader.loadFile(configFileUri, uri);
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
-      final String resourceFileName = "resourceFile.txt";
-
-      final File file =
-          new File(
-              getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(), "doesNotExist");
-      this.loader.loadFile(configFileUri, file.getPath());
-    });
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
+          final String resourceFileName = "resourceFile.txt";
+
+          final File file =
+              new File(
+                  getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(),
+                  "doesNotExist");
+          this.loader.loadFile(configFileUri, file.getPath());
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist2() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
 
-      this.loader.loadFile(configFileUri, "doesNotExist");
-    });
+          this.loader.loadFile(configFileUri, "doesNotExist");
+        });
   }
 
   @Test
   public void testLoadFileChildResource_ConfigFileDoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI("classpath://xyz.yaml");
-      final String resourceFileName = "resourceFile.txt";
-
-      this.loader.loadFile(
-          configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
-    });
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI("classpath://xyz.yaml");
+          final String resourceFileName = "resourceFile.txt";
+
+          this.loader.loadFile(
+              configFileUri,
+              getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
index d71772b31..dfb39afc4 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
@@ -54,14 +54,15 @@ public void testLoadFile() throws Exception {
 
   @Test
   public void testLoadFileMissingFile() throws Exception {
-    assertThrows(NoSuchElementException.class, () ->
-      this.loader.loadFile(new URI("file:/c:/doesnotexist")));
+    assertThrows(
+        NoSuchElementException.class, () -> this.loader.loadFile(new URI("file:/c:/doesnotexist")));
   }
 
   @Test
   public void testLastModifiedMissingFile() throws Exception {
-    assertThrows(NoSuchElementException.class, () ->
-      this.loader.lastModified(new URI("file:/c:/doesnotexist")));
+    assertThrows(
+        NoSuchElementException.class,
+        () -> this.loader.lastModified(new URI("file:/c:/doesnotexist")));
   }
 
   @Test
@@ -113,22 +114,28 @@ public void testLoadFileChildResource() throws Exception {
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI configFileUri = CONFIG_FILE.toURI();
-
-      this.loader.loadFile(
-          configFileUri,
-          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-              .getAbsolutePath());
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI configFileUri = CONFIG_FILE.toURI();
+
+          this.loader.loadFile(
+              configFileUri,
+              getFile(
+                      FileConfigFileLoader.class,
+                      "/test-http-request-factory-application-context.xml")
+                  .getAbsolutePath());
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = CONFIG_FILE.toURI();
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = CONFIG_FILE.toURI();
 
-      this.loader.loadFile(configFileUri, "doesNotExist");
-    });
+          this.loader.loadFile(configFileUri, "doesNotExist");
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
index 689c63f58..f9dec053b 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
@@ -111,32 +111,40 @@ public void testLoadFileChildResource() throws Exception {
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
-
-      this.loader.loadFile(
-          configFileUri,
-          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-              .getAbsolutePath());
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+
+          this.loader.loadFile(
+              configFileUri,
+              getFile(
+                      FileConfigFileLoader.class,
+                      "/test-http-request-factory-application-context.xml")
+                  .getAbsolutePath());
+        });
   }
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir_ServletURI() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
-
-      this.loader.loadFile(
-          configFileUri, "servlet:///test-http-request-factory-application-context.xml");
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+
+          this.loader.loadFile(
+              configFileUri, "servlet:///test-http-request-factory-application-context.xml");
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
 
-      this.loader.loadFile(configFileUri, "doesNotExist");
-    });
+          this.loader.loadFile(configFileUri, "doesNotExist");
+        });
   }
 }

From 0065e5e5c81c35ed70c50d1c1262228507147210 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 29 Dec 2025 14:10:23 +0100
Subject: [PATCH 28/61] Addressed linter errors regarding path variable names

---
 .../print/servlet/MapPrinterServlet.java      | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index d4c104632..d3a6e9401 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -385,8 +385,8 @@ private static String maybeAddRequestId(final String ref, final HttpServletReque
       value = "/{appId}" + STATUS_URL + "/{referenceId:\\S+}.json",
       method = RequestMethod.GET)
   public final void getStatusSpecificAppId(
-      @Nonnull @PathVariable("appId") final String appId,
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
@@ -408,7 +408,7 @@ public final void getStatusSpecificAppId(
    */
   @RequestMapping(value = STATUS_URL + "/{referenceId:\\S+}.json", method = RequestMethod.GET)
   public final void getStatusPath(
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
@@ -478,8 +478,8 @@ private void getStatus(
       value = "/{appId}" + CANCEL_URL + "/{referenceId:\\S+}",
       method = RequestMethod.DELETE)
   public final void cancelSpecificAppId(
-      @Nonnull @PathVariable("appId") final String appId,
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable final String referenceId,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
@@ -498,8 +498,7 @@ public final void cancelSpecificAppId(
    */
   @RequestMapping(value = CANCEL_URL + "/{referenceId:\\S+}", method = RequestMethod.DELETE)
   public final void cancelPath(
-      @Nonnull @PathVariable("referenceId") final String referenceId,
-      final HttpServletResponse statusResponse) {
+      @Nonnull @PathVariable final String referenceId, final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
       cancel("default", referenceId, statusResponse);
@@ -542,8 +541,8 @@ private void cancel(
    */
   @RequestMapping(value = "/{appId}" + REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @Nonnull @PathVariable("appId") final String appId,
-      @PathVariable("format") final String format,
+      @Nonnull @PathVariable final String appId,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -598,11 +597,11 @@ private void doCreateReport(
       value = "/{appId}" + REPORT_URL + "/{referenceId:\\S+}",
       method = RequestMethod.GET)
   public final void getReportSpecificAppId(
-      @Nonnull @PathVariable("appId") final String appId,
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
-      throws IOException, ServletException {
+      throws IOException {
     withAppIdCounter.inc();
     try (Timer.Context ignored = getReportTimer.time()) {
       getReport(appId, referenceId, inline, getReportResponse);
@@ -618,10 +617,10 @@ public final void getReportSpecificAppId(
    */
   @RequestMapping(value = REPORT_URL + "/{referenceId:\\S+}", method = RequestMethod.GET)
   public final void getReportPath(
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
-      throws IOException, ServletException {
+      throws IOException {
     noAppIdCounter.inc();
     try (Timer.Context ignored = getReportTimer.time()) {
       getReport("default", referenceId, inline, getReportResponse);
@@ -641,7 +640,7 @@ private void getReport(
       @Nonnull final String referenceId,
       final boolean inline,
       final HttpServletResponse getReportResponse)
-      throws IOException, ServletException {
+      throws IOException {
     MDC.put(Processor.MDC_APPLICATION_ID_KEY, applicationId);
     MDC.put(Processor.MDC_JOB_ID_KEY, referenceId);
     setNoCache(getReportResponse);
@@ -659,7 +658,7 @@ private void getReport(
    */
   @RequestMapping(value = REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @PathVariable("format") final String format,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -704,8 +703,8 @@ private static String getAppId(
       value = "/{appId}" + CREATE_AND_GET_URL + ".{format:\\w+}",
       method = RequestMethod.POST)
   public final void createReportAndGet(
-      @Nonnull @PathVariable("appId") final String appId,
-      @PathVariable("format") final String format,
+      @Nonnull @PathVariable final String appId,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -726,7 +725,7 @@ private void doCreateReportAndGet(
       final boolean inline,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
-      throws NoSuchAppException, InterruptedException, IOException, ServletException {
+      throws NoSuchAppException, InterruptedException, IOException {
     String ref =
         createAndSubmitPrintJob(
             appId, format, requestData, createReportRequest, createReportResponse);
@@ -758,7 +757,7 @@ private void doCreateReportAndGet(
    */
   @RequestMapping(value = CREATE_AND_GET_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReportAndGetNoAppId(
-      @PathVariable("format") final String format,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -831,7 +830,7 @@ public final void getCapabilities(
    */
   @RequestMapping(value = "/{appId}" + CAPABILITIES_URL, method = RequestMethod.GET)
   public final void getCapabilities(
-      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable final String appId,
       @RequestParam(value = "pretty", defaultValue = "false") final boolean pretty,
       final HttpServletRequest request,
       final HttpServletResponse capabilitiesResponse)
@@ -912,7 +911,7 @@ public final void getExampleRequest(
    */
   @RequestMapping(value = "{appId}" + EXAMPLE_REQUEST_URL, method = RequestMethod.GET)
   public final void getExampleRequest(
-      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable final String appId,
       final HttpServletRequest request,
       final HttpServletResponse getExampleResponse)
       throws IOException {

From 72c9d23daae8f20948f482c08dbf485052d9a735 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 06:27:07 +0000
Subject: [PATCH 29/61] Update CI dependencies (#3907)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/main.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index ef021d119..e373aecf8 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -41,7 +41,7 @@ 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') }}
@@ -49,7 +49,7 @@ jobs:
       - 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

From 08c15ad40850822affc40d959196a68b9cab21a5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 06:28:07 +0000
Subject: [PATCH 30/61] Update all patch/minor versions (#3905)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 build.gradle      |  4 ++--
 core/Dockerfile   |  2 +-
 core/build.gradle | 12 ++++++------
 docs/build.gradle |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0ea89a6ab..8dc1127ec 100644
--- a/build.gradle
+++ b/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'
@@ -65,7 +65,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 
     dependencies {
         testImplementation(
-                'org.mockito:mockito-core:5.20.0',
+                'org.mockito:mockito-core:5.21.0',
         )
     }
 
diff --git a/core/Dockerfile b/core/Dockerfile
index bf93d4ecd..b69847c2c 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,6 +1,6 @@
 FROM mapfish_print_builder AS builder
 
-FROM tomcat:9.0.112-jre21-temurin-jammy AS runner
+FROM tomcat:9.0.113-jre21-temurin-jammy AS runner
 LABEL maintainer="Camptocamp <info@camptocamp.com>"
 
 RUN --mount=type=cache,target=/var/cache,sharing=locked \
diff --git a/core/build.gradle b/core/build.gradle
index 1f82b982e..e61992124 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -176,14 +176,14 @@ dependencies {
             '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',
+            '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.794',
-            'io.sentry:sentry-logback:8.27.1',
+            '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
@@ -191,10 +191,10 @@ dependencies {
             // For JasperReports
             'joda-time:joda-time:2.14.0',
             'org.jfree:jcommon:1.0.24',
-            'org.apache.groovy:groovy-all:5.0.2',
+            'org.apache.groovy:groovy-all:5.0.3',
             'xalan:serializer:2.7.3',
             // For WebP images
-            'com.twelvemonkeys.imageio:imageio-webp:3.12.0',
+            'com.twelvemonkeys.imageio:imageio-webp:3.13.0',
     )
 
     implementation(
diff --git a/docs/build.gradle b/docs/build.gradle
index 242e90c7c..98ecdf3a3 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -18,8 +18,8 @@ repositories {
 dependencies {
     implementation project(':core')
     implementation (
-            'org.apache.groovy:groovy-xml:5.0.2',
-            'org.apache.groovy:groovy-json:5.0.2',
+            'org.apache.groovy:groovy-xml:5.0.3',
+            'org.apache.groovy:groovy-json:5.0.3',
             "org.springframework:spring-test:5.3.39",
             'org.ccil.cowan.tagsoup:tagsoup:1.2.1',
             'com.samskivert:jmustache:1.16',

From eb9b857dc661066ae027efac4b2f2844ce83c141 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Jan 2026 06:28:57 +0000
Subject: [PATCH 31/61] Update CI dependencies (#3906)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 4 ++--
 ci/requirements.txt     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dcbeca825..bab946eec 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ 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
@@ -29,7 +29,7 @@ repos:
     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
diff --git a/ci/requirements.txt b/ci/requirements.txt
index e3c198010..a74616340 100644
--- a/ci/requirements.txt
+++ b/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

From 95e7dcdeba40e8160853c9c5af213f9b5839abb4 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 5 Jan 2026 10:56:02 +0100
Subject: [PATCH 32/61] Fixed the linter recommendation for the path variable
 names

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4bcfcb83a..aba499815 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,7 +60,7 @@ 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 {

From f2b4060d485bc200293e1e6f514086f250a1889c Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 4 Dec 2025 15:54:16 +0100
Subject: [PATCH 33/61] OpenRewrite config

---
 build.gradle | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/build.gradle b/build.gradle
index 8dc1127ec..79efd174c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
 
 plugins {
   id("com.github.spotbugs") version "6.4.8"
+  id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -89,3 +90,16 @@ tasks.register('docs') {
     enabled = false
 }
 
+
+rewrite {
+    activeRecipe("org.openrewrite.java.spring.framework.UpgradeSpringFramework_7_0")
+    setExportDatatables(true)
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    rewrite("org.openrewrite.recipe:rewrite-spring:6.19.0")
+}

From 904e0a9f81f2863f984048f514924b0668ed66e9 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 4 Dec 2025 16:04:57 +0100
Subject: [PATCH 34/61] OpenRewrite automated upgrade

---
 core/build.gradle                             | 17 ++---
 .../http/ConfigFileResolvingRequest.java      |  2 +-
 .../print/http/ConfigurableRequest.java       |  4 +-
 .../mapfish/print/http/HttpCredential.java    |  8 +--
 .../org/mapfish/print/http/HttpProxy.java     |  4 +-
 .../print/http/HttpRequestFetcher.java        |  2 +-
 .../http/MfClientHttpRequestFactoryImpl.java  | 64 +++++++++----------
 .../print/http/MfCredentialsProvider.java     | 10 +--
 .../mapfish/print/http/MfRoutePlanner.java    | 12 ++--
 .../print/http/MfSSLSocketFactory.java        |  8 +--
 .../mapfish/print/http/UserAgentCreator.java  |  2 +-
 .../print/map/geotools/FeaturesParser.java    |  2 +-
 .../map/image/AbstractSingleImageLayer.java   |  4 +-
 .../print/map/image/wms/WmsUtilities.java     |  4 +-
 .../print/map/style/ParserPluginUtils.java    |  2 +-
 .../mapfish/print/map/tiled/CoverageTask.java |  4 +-
 .../print/processor/ExecutionStats.java       |  6 +-
 .../processor/http/matcher/MatchInfo.java     |  2 +-
 .../processor/jasper/HttpImageResolver.java   |  4 +-
 .../processor/jasper/LegendProcessor.java     |  4 +-
 .../servlet/job/HibernateAccountingEntry.java |  2 +-
 .../print/url/data/DataUrlConnection.java     |  2 +-
 .../mapfish/print/TestHttpClientFactory.java  |  4 +-
 .../http/ConfigFileResolvingRequestTest.java  |  6 +-
 .../print/http/HttpCredentialTest.java        |  6 +-
 .../map/style/ParserPluginUtilsTest.java      |  2 +-
 .../map/tiled/SingleTileLoaderTaskTest.java   |  2 +-
 .../http/matcher/AddressHostMatcherTest.java  |  2 +-
 .../http/matcher/DnsHostMatcherTest.java      |  2 +-
 .../http/matcher/HostnameMatcherTest.java     |  2 +-
 .../http/matcher/LocalHostMatcherTest.java    |  2 +-
 docs/build.gradle                             |  8 +--
 examples/build.gradle                         |  4 +-
 33 files changed, 105 insertions(+), 104 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index e61992124..edf5797b9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -125,14 +125,14 @@ 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:spring-context: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:5.8.16',
             'org.springframework.security:spring-security-web:5.8.16',
             'com.thetransactioncompany:cors-filter:2.10',
@@ -161,6 +161,7 @@ dependencies {
             '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',
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
index 304f1590e..9e308dec8 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
@@ -184,7 +184,7 @@ private ClientHttpResponse attemptToFetchResponse(final HttpHeaders headers) thr
     final int minStatusCodeError = HttpStatus.INTERNAL_SERVER_ERROR.value();
     int rawStatusCode = minStatusCodeError;
     try {
-      rawStatusCode = response.getRawStatusCode();
+      rawStatusCode = response.getStatusCode().value();
       if (rawStatusCode < minStatusCodeError) {
         LOGGER.debug("Successfully fetched {}, with status code {}", getURI(), rawStatusCode);
         return response;
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java
index b30361916..e3e026910 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigurableRequest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.http;
 
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.mapfish.print.config.Configuration;
 import org.springframework.http.client.ClientHttpRequest;
 
@@ -10,7 +10,7 @@
  */
 public interface ConfigurableRequest extends ClientHttpRequest {
   /** Obtain the request object. */
-  HttpRequestBase getUnderlyingRequest();
+  HttpUriRequestBase getUnderlyingRequest();
 
   /**
    * Set the current configuration object. This should only be called by {@link
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index 63f8fe1e1..cda3bbf32 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -5,9 +5,9 @@
 import java.net.UnknownHostException;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationObject;
 import org.mapfish.print.processor.http.matcher.MatchInfo;
@@ -113,6 +113,6 @@ public final Credentials toCredentials(final AuthScope authscope) {
     } else {
       passwordString = null;
     }
-    return new UsernamePasswordCredentials(this.username, passwordString);
+    return new UsernamePasswordCredentials(this.username, passwordString.toCharArray());
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/HttpProxy.java b/core/src/main/java/org/mapfish/print/http/HttpProxy.java
index eb0e1eb90..b95ce4dac 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpProxy.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpProxy.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
 import java.util.List;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.http.matcher.URIMatcher;
 
@@ -34,7 +34,7 @@ public final class HttpProxy extends HttpCredential {
   private String scheme;
 
   public HttpHost getHttpHost() {
-    return new HttpHost(this.host, this.port, getScheme());
+    return new HttpHost(getScheme(), this.host, this.port);
   }
 
   private String getScheme() {
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
index 51a81325f..18eb0e6ae 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -85,7 +85,7 @@ private final class CachedClientHttpResponse extends AbstractClientHttpResponse
 
     private CachedClientHttpResponse(final ClientHttpResponse originalResponse) throws IOException {
       this.headers = originalResponse.getHeaders();
-      this.status = originalResponse.getRawStatusCode();
+      this.status = originalResponse.getStatusCode().value();
       this.statusText = originalResponse.getStatusText();
       this.cachedFile = createCachedFile(originalResponse.getBody());
     }
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 50c04b769..6ba9d1db6 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -12,24 +12,24 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.apache.http.Header;
-import org.apache.http.HeaderElement;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.SystemDefaultDnsResolver;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.SystemDefaultDnsResolver;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpEntityContainer;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,9 +85,9 @@ private static CloseableHttpClient createHttpClient(
       final int socketTimeout) {
     final RequestConfig requestConfig =
         RequestConfig.custom()
-            .setConnectionRequestTimeout(connectionRequestTimeout)
-            .setConnectTimeout(connectTimeout)
-            .setSocketTimeout(socketTimeout)
+            .setConnectionRequestTimeout(connectionRequestTimeout, TimeUnit.MILLISECONDS)
+            .setConnectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+            .setResponseTimeout(socketTimeout, TimeUnit.MILLISECONDS)
             .build();
 
     final HttpClientBuilder httpClientBuilder =
@@ -116,7 +116,7 @@ private static CloseableHttpClient createHttpClient(
   @Nonnull
   public ConfigurableRequest createRequest(
       @Nonnull final URI uri, @Nonnull final HttpMethod httpMethod) {
-    HttpRequestBase httpRequest = (HttpRequestBase) createHttpUriRequest(httpMethod, uri);
+    HttpUriRequestBase httpRequest = (HttpUriRequestBase) createHttpUriRequest(httpMethod, uri);
     return new Request(getHttpClient(), httpRequest, createHttpContext(httpMethod, uri));
   }
 
@@ -146,14 +146,14 @@ public static final class Request extends AbstractClientHttpRequest
       implements ConfigurableRequest {
 
     private final HttpClient client;
-    private final HttpRequestBase request;
+    private final HttpUriRequestBase request;
     private final HttpContext context;
     private final ByteArrayOutputStream outputStream;
     private Configuration configuration;
 
     Request(
         @Nonnull final HttpClient client,
-        @Nonnull final HttpRequestBase request,
+        @Nonnull final HttpUriRequestBase request,
         @Nullable final HttpContext context) {
       this.client = client;
       this.request = request;
@@ -173,7 +173,7 @@ public HttpContext getContext() {
       return this.context;
     }
 
-    public HttpRequestBase getUnderlyingRequest() {
+    public HttpUriRequestBase getUnderlyingRequest() {
       return this.request;
     }
 
@@ -189,7 +189,7 @@ public String getMethodValue() {
 
     @Nonnull
     public URI getURI() {
-      return this.request.getURI();
+      return this.request.getUri();
     }
 
     @Nonnull
@@ -211,19 +211,19 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
 
       for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
         String headerName = entry.getKey();
-        if (!headerName.equalsIgnoreCase(HTTP.CONTENT_LEN)
-            && !headerName.equalsIgnoreCase(HTTP.TRANSFER_ENCODING)) {
+        if (!headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.CONTENT_LENGTH)
+            && !headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
           for (String headerValue : entry.getValue()) {
             this.request.addHeader(headerName, headerValue);
           }
         }
       }
-      if (this.request instanceof HttpEntityEnclosingRequest entityEnclosingRequest) {
+      if (this.request instanceof HttpEntityContainer entityEnclosingRequest) {
         final HttpEntity requestEntity = new ByteArrayEntity(this.outputStream.toByteArray());
         entityEnclosingRequest.setEntity(requestEntity);
       }
-      HttpResponse response = this.client.execute(this.request, this.context);
-      LOGGER.debug("Response: {} -- {}", response.getStatusLine().getStatusCode(), this.getURI());
+      ClassicHttpResponse response = this.client.execute(this.request, this.context);
+      LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
     }
@@ -232,24 +232,24 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
   public static class Response extends AbstractClientHttpResponse {
     private static final Logger LOGGER = LoggerFactory.getLogger(Response.class);
     private static final AtomicInteger ID_COUNTER = new AtomicInteger();
-    private final HttpResponse response;
+    private final ClassicHttpResponse response;
     private final int id = ID_COUNTER.incrementAndGet();
     private InputStream inputStream;
 
-    Response(@Nonnull final HttpResponse response) {
+    Response(@Nonnull final ClassicHttpResponse response) {
       this.response = response;
       LOGGER.trace("Creating Http Response object: {}", this.id);
     }
 
     @Override
     public int getRawStatusCode() {
-      return this.response.getStatusLine().getStatusCode();
+      return this.response.getCode();
     }
 
     @Nonnull
     @Override
     public String getStatusText() {
-      return this.response.getStatusLine().getReasonPhrase();
+      return this.response.getReasonPhrase();
     }
 
     @Override
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 2bf7719b8..98ee84a40 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.SystemDefaultCredentialsProvider;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
 import org.mapfish.print.config.Configuration;
 
 /**
@@ -13,7 +13,7 @@
  * org.mapfish.print.http.MfClientHttpRequestFactoryImpl#CURRENT_CONFIGURATION}.
  *
  * <p>If authentication is not found in configuration then it will fall back to {@link
- * org.apache.http.impl.client.SystemDefaultCredentialsProvider}
+ * org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider}
  *
  * <p>{@link MfClientHttpRequestFactoryImpl.Request} will set the correct configuration before the
  * request is executed so that correct proxies will be set.
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index 68a571a35..dcd469867 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -6,11 +6,11 @@
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.List;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.impl.conn.DefaultRoutePlanner;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.http.HttpMethod;
@@ -30,7 +30,7 @@ public MfRoutePlanner() {
 
   @Override
   protected HttpHost determineProxy(
-      final HttpHost target, final HttpRequest request, final HttpContext context)
+      final HttpHost target, final ClassicHttpRequest request, final HttpContext context)
       throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config == null) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java b/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
index ff52cda70..d761bb6fd 100644
--- a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
+++ b/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
@@ -4,10 +4,10 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import javax.net.ssl.SSLContext;
-import org.apache.http.HttpHost;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 
 /** A ssl socket factory that obtains the keystore from the current configuration. */
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index 6d1ca88a2..a6bc9af55 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.http;
 
-import org.apache.http.util.VersionInfo;
+import org.apache.hc.core5.util.VersionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
index 65f9d9375..5ce2466d1 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
@@ -93,7 +93,7 @@ static CoordinateReferenceSystem parseCoordinateReferenceSystem(
                   requestFactory.createRequest(new URI(uri), HttpMethod.GET);
               try (ClientHttpResponse response = request.execute()) {
 
-                if (response.getRawStatusCode() == HttpStatus.OK.value()) {
+                if (response.getStatusCode().value() == HttpStatus.OK.value()) {
                   final String wkt =
                       IOUtils.toString(response.getBody(), Constants.DEFAULT_ENCODING);
                   try {
diff --git a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
index f7a7c43fb..69489e24c 100644
--- a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
@@ -198,7 +198,7 @@ private boolean isResponseStatusCodeValid(
       final String stringBody,
       final String baseMetricName)
       throws IOException {
-    if (httpResponse.getRawStatusCode() != HttpStatus.OK.value()) {
+    if (httpResponse.getStatusCode().value() != HttpStatus.OK.value()) {
       String message =
           String.format(
               """
@@ -209,7 +209,7 @@ private boolean isResponseStatusCodeValid(
               %s\
               """,
               request.getURI(),
-              httpResponse.getRawStatusCode(),
+              httpResponse.getStatusCode().value(),
               HttpStatus.OK.value(),
               httpResponse.getStatusText(),
               String.join("\n", Utils.getPrintableHeadersList(request.getHeaders())),
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
index ed3acf986..00c003ec6 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -14,8 +14,8 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.hc.core5.net.URLEncodedUtils;
+import org.apache.hc.core5.http.NameValuePair;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.ows.wms.request.GetMapRequest;
diff --git a/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java b/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
index 4fc4635c5..4b6b7c7a5 100644
--- a/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
+++ b/core/src/main/java/org/mapfish/print/map/style/ParserPluginUtils.java
@@ -47,7 +47,7 @@ public static Optional<Style> loadStyleAsURI(
     try {
       final ClientHttpRequest request = clientHttpRequestFactory.createRequest(uri, HttpMethod.GET);
       try (ClientHttpResponse response = request.execute()) {
-        httpStatusCode = response.getRawStatusCode();
+        httpStatusCode = response.getStatusCode().value();
         input = IOUtils.toByteArray(response.getBody());
       }
     } catch (Exception e) {
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
index 556fcd197..c57241b4c 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
@@ -251,7 +251,7 @@ protected Tile compute() {
 
     private Tile handleSpecialStatuses(
         final ClientHttpResponse response, final String baseMetricName) throws IOException {
-      final int httpStatusCode = response.getRawStatusCode();
+      final int httpStatusCode = response.getStatusCode().value();
       if (httpStatusCode == HttpStatus.NO_CONTENT.value()
           || httpStatusCode == HttpStatus.NOT_FOUND.value()) {
         if (httpStatusCode == HttpStatus.NOT_FOUND.value()) {
@@ -291,7 +291,7 @@ private BufferedImage getImageFromResponse(
 
     private Tile handleNonOkStatus(final ClientHttpResponse response, final String baseMetricName)
         throws IOException {
-      final int httpStatusCode = response.getRawStatusCode();
+      final int httpStatusCode = response.getStatusCode().value();
       String errorMessage =
           String.format(
               "Error making tile request: %s\n\tStatus: %d\n\tStatus message: %s",
diff --git a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
index 85fb6d45a..6467551c3 100644
--- a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
+++ b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.ObjectNode;
 import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index 5e6548539..e20435adb 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -3,7 +3,7 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
 
 /** Information required for performing a request match. */
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java b/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
index 5bc6ee6fd..ae6753f49 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/HttpImageResolver.java
@@ -83,7 +83,7 @@ public BufferedImage resolve(final MfClientHttpRequestFactory requestFactory, fi
 
   private BufferedImage getImageFromResponse(final ClientHttpResponse response, final URI url)
       throws IOException {
-    if (response.getRawStatusCode() == HttpStatus.OK.value()) {
+    if (response.getStatusCode().value() == HttpStatus.OK.value()) {
       try {
         final BufferedImage image = ImageIO.read(response.getBody());
         if (image == null) {
@@ -98,7 +98,7 @@ private BufferedImage getImageFromResponse(final ClientHttpResponse response, fi
       LOGGER.warn(
           "Error loading the table row image: {}.\nStatus Code: {}\nStatus Text: {}",
           url,
-          response.getRawStatusCode(),
+          response.getStatusCode().value(),
           response.getStatusText());
     }
     return this.defaultImage;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
index 12d30a8b5..200435373 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
@@ -386,7 +386,7 @@ private BufferedImage loadImage(final URI uri) {
               this.clientHttpRequestFactory.createRequest(uri, HttpMethod.GET);
           try (Timer.Context ignored = metricRegistry.timer(metricName).time()) {
             try (ClientHttpResponse httpResponse = request.execute()) {
-              if (httpResponse.getRawStatusCode() == HttpStatus.OK.value()) {
+              if (httpResponse.getStatusCode().value() == HttpStatus.OK.value()) {
                 image = ImageIO.read(httpResponse.getBody());
                 if (image == null) {
                   LOGGER.warn("There is no image in this response body {}", httpResponse.getBody());
@@ -419,7 +419,7 @@ private void logNotOkResponseStatus(final ClientHttpResponse httpResponse) throw
           \t{}\
           """,
           this.icon,
-          httpResponse.getRawStatusCode(),
+          httpResponse.getStatusCode().value(),
           httpResponse.getStatusText(),
           String.join("\n\t", Utils.getPrintableHeadersList(httpResponse.getHeaders())));
     }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
index 79f038810..0d79057ab 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.servlet.job;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.ObjectNode;
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import java.util.Date;
 import javax.persistence.Column;
diff --git a/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java b/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java
index 888e3bb14..ea3f2db39 100644
--- a/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java
+++ b/core/src/main/java/org/mapfish/print/url/data/DataUrlConnection.java
@@ -8,7 +8,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
-import org.apache.http.entity.ContentType;
+import org.apache.hc.core5.http.ContentType;
 
 /** Decodes the base64 data and provides an appropriate InputStream. */
 public class DataUrlConnection extends URLConnection {
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index 1af6a56df..dbac83626 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -7,7 +7,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import javax.annotation.Nonnull;
-import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.ConfigurableRequest;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
@@ -85,7 +85,7 @@ private record TestConfigurableRequest(MockClientHttpRequest httpRequest)
       implements ConfigurableRequest {
 
     @Override
-    public HttpRequestBase getUnderlyingRequest() {
+    public HttpUriRequestBase getUnderlyingRequest() {
       throw new UnsupportedOperationException("Not supported");
     }
 
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
index 331d3964b..cff48acf3 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
@@ -46,7 +46,7 @@ public void httpRequestWithRetryShouldSucceedAtSecondAttempt() throws IOExceptio
     var resp = req.executeInternal(new HttpHeaders());
 
     // Then
-    assertEquals(200, resp.getRawStatusCode());
+    assertEquals(200, resp.getStatusCode().value());
     resp.close();
   }
 
@@ -67,7 +67,7 @@ public void httpRequestWithRetryShouldSucceedDespiteException() throws IOExcepti
     var resp = req.executeInternal(new HttpHeaders());
 
     // Then
-    assertEquals(200, resp.getRawStatusCode());
+    assertEquals(200, resp.getStatusCode().value());
     resp.close();
   }
 
@@ -108,7 +108,7 @@ private MfClientHttpRequestFactoryImpl.Request initTestDefaultBehaviour(
 
   private ClientHttpResponse createResponse(final int statusCode) throws IOException {
     var clientHttpResponse = mock(ClientHttpResponse.class);
-    when(clientHttpResponse.getRawStatusCode()).thenReturn(statusCode);
+    when(clientHttpResponse.getStatusCode().value()).thenReturn(statusCode);
     return clientHttpResponse;
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index e2841f952..ccd4e2f2e 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -8,8 +8,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.Credentials;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -77,7 +77,7 @@ public void testToCredentials() throws Exception {
     matcher.setHost(HttpProxyTest.LOCALHOST);
     credential.setMatchers(Collections.singletonList(matcher));
 
-    AuthScope authscope = AuthScope.ANY;
+    AuthScope authscope = new AuthScope(null, -1);
     final Credentials object = credential.toCredentials(authscope);
     assertNotNull(object);
     assertEquals(USERNAME, object.getUserPrincipal().getName());
diff --git a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
index 2dfe7cd64..8cac6572b 100644
--- a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
@@ -43,7 +43,7 @@ private static Optional<Style> testLoadingStyleWithStatusCode(
 
     when(factory.createRequest(new URI("http://valid.uri"), HttpMethod.GET)).thenReturn(request);
     when(request.execute()).thenReturn(response);
-    when(response.getRawStatusCode()).thenReturn(httpStatusCode);
+    when(response.getStatusCode().value()).thenReturn(httpStatusCode);
     when(response.getBody())
         .thenReturn(
             new ByteArrayInputStream(
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
index 050725212..f07d3ab50 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
@@ -88,7 +88,7 @@ public void testComputeWithUnsupportedStatusCode() throws IOException, URISyntax
 
   private ClientHttpResponse getMockResponse(int rawStatusCode) throws IOException {
     ClientHttpResponse response = mock(ClientHttpResponse.class);
-    when(response.getRawStatusCode()).thenReturn(rawStatusCode);
+    when(response.getStatusCode().value()).thenReturn(rawStatusCode);
     when(response.getStatusCode())
         .thenThrow(new RuntimeException("Unsupported status code has no HttpStatus"));
     when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index 164fcae0e..b5f7ec604 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -4,7 +4,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index efd55821c..8f022940f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -4,7 +4,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index 0e1461c20..9a8d31e83 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -5,7 +5,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 0359923bc..74d917627 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -9,7 +9,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
-import org.apache.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.AuthScope;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
diff --git a/docs/build.gradle b/docs/build.gradle
index 98ecdf3a3..5d1146138 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -20,14 +20,14 @@ dependencies {
     implementation (
             'org.apache.groovy:groovy-xml:5.0.3',
             'org.apache.groovy:groovy-json:5.0.3',
-            "org.springframework:spring-test:5.3.39",
+            "org.springframework:spring-test:7.0.1",
             'org.ccil.cowan.tagsoup:tagsoup:1.2.1',
             'com.samskivert:jmustache:1.16',
             'com.google.guava:guava:33.5.0-jre',
             'commons-io:commons-io:2.21.0',
-            "org.springframework:spring-beans:5.3.39",
-            "org.springframework:spring-web:5.3.39",
-            "org.springframework:spring-context:5.3.39",
+            "org.springframework:spring-beans:7.0.1",
+            "org.springframework:spring-web:7.0.1",
+            "org.springframework:spring-context:7.0.1",
             'javax.servlet:javax.servlet-api:4.0.1'
     )
 }
diff --git a/examples/build.gradle b/examples/build.gradle
index 8e058e354..5eb716a0d 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -15,12 +15,12 @@ dependencies {
     testImplementation(
         project(':core'),
         'commons-io:commons-io:2.17.0',
-        "org.springframework:spring-web:5.3.39",
+        "org.springframework:spring-web:7.0.1",
         'org.json:json:20240303',
         'org.apache.commons:commons-lang3:3.5',
         "org.locationtech.jts:jts-core:1.18.2",
         "org.slf4j:slf4j-api:2.0.16",
-        "org.springframework:spring-test:5.3.39",
+        "org.springframework:spring-test:7.0.1",
         "ch.qos.logback:logback-classic:1.5.15",
         "org.verapdf:validation-model:1.24.1",
         "junit:junit:4.13.2",

From 92850766ab609e2547194af3c1fcb23dd539dc17 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 11:04:24 +0100
Subject: [PATCH 35/61] Moved metrics from javax.servlet to jakarta.servlet

---
 core/build.gradle                                      |  4 ++--
 .../metrics/HealthCheckRegistryContextListener.java    |  6 +++---
 .../MapfishPrintInstrumentedFilterContextListener.java |  6 ++++--
 .../print/metrics/MetricsRegistryContextListener.java  | 10 ++++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index edf5797b9..33895399a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -144,9 +144,9 @@ dependencies {
     )
     metrics(
             'io.dropwizard.metrics:metrics-core:4.2.37',
-            'io.dropwizard.metrics:metrics-servlet: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-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',
diff --git a/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java
index c81f193ad..c39d8b7b4 100644
--- a/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/HealthCheckRegistryContextListener.java
@@ -3,9 +3,9 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.health.HealthCheckRegistry;
-import com.codahale.metrics.servlets.HealthCheckServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import io.dropwizard.metrics.servlets.HealthCheckServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
diff --git a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
index 6aebdf4ae..02b05f82a 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
@@ -3,9 +3,10 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.MetricRegistry;
+import io.dropwizard.metrics.servlets.HealthCheckServlet;
 import com.codahale.metrics.servlet.InstrumentedFilterContextListener;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -18,6 +19,7 @@ public class MapfishPrintInstrumentedFilterContextListener
 
   @Override
   protected final MetricRegistry getMetricRegistry() {
+
     final WebApplicationContext webApplicationContext =
         getWebApplicationContext(this.servletContext);
     return webApplicationContext.getBean(MetricRegistry.class);
diff --git a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
index b53e87ac2..aacdd0ba6 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
@@ -3,9 +3,9 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.servlets.MetricsServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
+import io.dropwizard.metrics.servlets.MetricsServlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -17,14 +17,16 @@ public class MetricsRegistryContextListener extends MetricsServlet.ContextListen
 
   @Override
   public final void contextInitialized(final ServletContextEvent event) {
+
     this.servletContext = event.getServletContext();
     super.contextInitialized(event);
   }
 
   @Override
   protected final MetricRegistry getMetricRegistry() {
+    // In Spring 6+, getWebApplicationContext accepts jakarta.servlet.ServletContext
     final WebApplicationContext webApplicationContext =
-        getWebApplicationContext(this.servletContext);
+      getWebApplicationContext(this.servletContext);
     return webApplicationContext.getBean(MetricRegistry.class);
   }
 }

From 83d9be5ae74b531be70f95f33c2816bf37362c11 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 13:27:39 +0100
Subject: [PATCH 36/61] Completed refactored core

---
 .../http/ConfigFileResolvingRequest.java      | 13 +---
 .../http/ErrorResponseClientHttpResponse.java | 11 +--
 .../print/http/HttpRequestFetcher.java        | 21 +++---
 .../http/MfClientHttpRequestFactoryImpl.java  | 68 +++++++++---------
 .../print/http/MfCredentialsProvider.java     | 19 ++---
 .../mapfish/print/http/MfRoutePlanner.java    | 15 ++--
 .../print/http/MfSSLSocketFactory.java        | 54 --------------
 .../print/http/MfTLSSocketStrategy.java       | 28 ++++++++
 .../mapfish/print/http/UserAgentCreator.java  | 10 ++-
 .../java/org/mapfish/print/http/Utils.java    |  6 +-
 .../print/map/image/wms/WmsUtilities.java     | 55 +++++++-------
 ...rintInstrumentedFilterContextListener.java |  3 +-
 .../processor/http/matcher/MatchInfo.java     | 71 +++++++++++--------
 .../print/servlet/MapPrinterServlet.java      | 10 +--
 .../mapfish/print/TestHttpClientFactory.java  |  7 --
 15 files changed, 180 insertions(+), 211 deletions(-)
 delete mode 100644 core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
 create mode 100644 core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java

diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
index 9e308dec8..72f766eee 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
@@ -171,7 +171,7 @@ private void logFetchingURIResource(final HttpHeaders headers) {
     LOGGER.debug(
         "Fetching {}, using headers:\n{}",
         this.getURI(),
-        headers.entrySet().stream()
+        headers.headerSet().stream()
             .map(entry -> entry.getKey() + "=" + String.join(", ", entry.getValue()))
             .collect(Collectors.joining("\n")));
   }
@@ -246,12 +246,6 @@ public HttpMethod getMethod() {
     return this.httpMethod;
   }
 
-  @Override
-  @Nonnull
-  public String getMethodValue() {
-    return this.httpMethod.name();
-  }
-
   @Override
   @Nonnull
   public URI getURI() {
@@ -267,11 +261,6 @@ public HttpStatus getStatusCode() {
       return HttpStatus.OK;
     }
 
-    @Override
-    public int getRawStatusCode() {
-      return getStatusCode().value();
-    }
-
     @Override
     @Nonnull
     public String getStatusText() {
diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index c21874a2b..9eb30ab35 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -1,16 +1,19 @@
 package org.mapfish.print.http;
 
+import java.io.IOException;
 import java.io.InputStream;
 import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.StreamUtils;
 
-public class ErrorResponseClientHttpResponse extends AbstractClientHttpResponse {
+public class ErrorResponseClientHttpResponse implements ClientHttpResponse {
   private final Exception exception;
 
   /** HTTP code use in response for non HTTP errors, (Not Acceptable). */
-  private static final int FAKE_HTTP_ERROR_CODE = 406;
+  private static final HttpStatusCode FAKE_HTTP_ERROR_CODE = HttpStatusCode.valueOf(406);
 
   public ErrorResponseClientHttpResponse(final Exception e) {
     assert e != null;
@@ -30,7 +33,7 @@ public InputStream getBody() {
   }
 
   @Override
-  public int getRawStatusCode() {
+  public HttpStatusCode getStatusCode() throws IOException {
     return FAKE_HTTP_ERROR_CODE;
   }
 
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
index 18eb0e6ae..3c72e5849 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -9,6 +9,7 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.nio.file.Files;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -21,7 +22,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 
@@ -75,17 +76,17 @@ public ClientHttpRequest register(final ClientHttpRequest originalRequest) {
     return add(new CachedClientHttpRequest(originalRequest, this.context));
   }
 
-  private final class CachedClientHttpResponse extends AbstractClientHttpResponse {
+  private final class CachedClientHttpResponse implements ClientHttpResponse {
 
     private final File cachedFile;
     private final HttpHeaders headers;
-    private final int status;
+    private final HttpStatusCode status;
     private final String statusText;
     private InputStream body;
 
     private CachedClientHttpResponse(final ClientHttpResponse originalResponse) throws IOException {
       this.headers = originalResponse.getHeaders();
-      this.status = originalResponse.getStatusCode().value();
+      this.status = originalResponse.getStatusCode();
       this.statusText = originalResponse.getStatusText();
       this.cachedFile = createCachedFile(originalResponse.getBody());
     }
@@ -122,7 +123,7 @@ public HttpHeaders getHeaders() {
     }
 
     @Override
-    public int getRawStatusCode() {
+    public HttpStatusCode getStatusCode() throws IOException {
       return this.status;
     }
 
@@ -165,15 +166,13 @@ public HttpMethod getMethod() {
 
     @Override
     @Nonnull
-    public String getMethodValue() {
-      final HttpMethod method = getMethod();
-      return method != null ? method.name() : "";
+    public URI getURI() {
+      return this.originalRequest.getURI();
     }
 
     @Override
-    @Nonnull
-    public URI getURI() {
-      return this.originalRequest.getURI();
+    public Map<String, Object> getAttributes() {
+      return this.originalRequest.getAttributes();
     }
 
     @Override
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 6ba9d1db6..736f16783 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -7,6 +7,7 @@
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,12 +20,10 @@
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
-import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HeaderElement;
-import org.apache.hc.core5.http.HttpEntity;
-import org.apache.hc.core5.http.HttpEntityContainer;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.core5.http.*;
 import org.apache.hc.client5.http.config.RequestConfig;
-import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -35,8 +34,9 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.AbstractClientHttpRequest;
-import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 
 /** Default implementation. */
@@ -91,16 +91,18 @@ private static CloseableHttpClient createHttpClient(
             .build();
 
     final HttpClientBuilder httpClientBuilder =
-        HttpClients.custom()
-            .disableCookieManagement()
-            .setDnsResolver(new RandomizingDnsResolver())
-            .setRoutePlanner(new MfRoutePlanner())
-            .setSSLSocketFactory(new MfSSLSocketFactory())
-            .setDefaultCredentialsProvider(new MfCredentialsProvider())
-            .setDefaultRequestConfig(requestConfig)
-            .setMaxConnTotal(maxConnTotal)
-            .setMaxConnPerRoute(maxConnPerRoute)
-            .setUserAgent(UserAgentCreator.getUserAgent());
+      HttpClients.custom()
+        .disableCookieManagement()
+        .setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
+          .setTlsSocketStrategy(new MfTLSSocketStrategy())
+          .setDnsResolver(new RandomizingDnsResolver())
+          .setMaxConnPerRoute(maxConnTotal)
+          .setMaxConnPerRoute(maxConnPerRoute)
+          .build())
+        .setRoutePlanner(new MfRoutePlanner())
+        .setDefaultCredentialsProvider(new MfCredentialsProvider())
+        .setDefaultRequestConfig(requestConfig)
+        .setUserAgent(UserAgentCreator.getUserAgent());
     CloseableHttpClient closeableHttpClient = httpClientBuilder.build();
     LOGGER.debug(
         "Created CloseableHttpClient using connectionRequestTimeout: {} connectTimeout: {}"
@@ -177,19 +179,18 @@ public HttpUriRequestBase getUnderlyingRequest() {
       return this.request;
     }
 
+    @Override
     public HttpMethod getMethod() {
       return HttpMethod.valueOf(this.request.getMethod());
     }
 
-    @Nonnull
-    @Override
-    public String getMethodValue() {
-      return this.request.getMethod();
-    }
-
     @Nonnull
     public URI getURI() {
-      return this.request.getUri();
+      try {
+        return this.request.getUri();
+      } catch (URISyntaxException ex) {
+        throw new RuntimeException(ex);
+      }
     }
 
     @Nonnull
@@ -209,7 +210,7 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
           this.getURI(),
           String.join("\n", Utils.getPrintableHeadersList(headers)));
 
-      for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+      for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
         String headerName = entry.getKey();
         if (!headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.CONTENT_LENGTH)
             && !headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
@@ -219,17 +220,20 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
         }
       }
       if (this.request instanceof HttpEntityContainer entityEnclosingRequest) {
-        final HttpEntity requestEntity = new ByteArrayEntity(this.outputStream.toByteArray());
+        var bytes = this.outputStream.toByteArray();
+        final HttpEntity requestEntity = new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
         entityEnclosingRequest.setEntity(requestEntity);
       }
-      ClassicHttpResponse response = this.client.execute(this.request, this.context);
+
+      ClassicHttpResponse response = this.client.executeOpen(null, this.request, this.context);
       LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
     }
   }
 
-  public static class Response extends AbstractClientHttpResponse {
+  // TODO: Do we need this class after all?
+  public static class Response implements ClientHttpResponse {
     private static final Logger LOGGER = LoggerFactory.getLogger(Response.class);
     private static final AtomicInteger ID_COUNTER = new AtomicInteger();
     private final ClassicHttpResponse response;
@@ -242,8 +246,8 @@ public static class Response extends AbstractClientHttpResponse {
     }
 
     @Override
-    public int getRawStatusCode() {
-      return this.response.getCode();
+    public HttpStatusCode getStatusCode() throws IOException {
+      return HttpStatusCode.valueOf(this.response.getCode());
     }
 
     @Nonnull
@@ -290,11 +294,9 @@ public synchronized InputStream getBody() throws IOException {
     @Override
     public HttpHeaders getHeaders() {
       final HttpHeaders translatedHeaders = new HttpHeaders();
-      final Header[] allHeaders = this.response.getAllHeaders();
+      final Header[] allHeaders = this.response.getHeaders();
       for (Header header : allHeaders) {
-        for (HeaderElement element : header.getElements()) {
-          translatedHeaders.add(header.getName(), element.toString());
-        }
+          translatedHeaders.add(header.getName(), header.getValue());
       }
       return translatedHeaders;
     }
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 98ee84a40..861673a44 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -6,6 +6,7 @@
 import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 
 /**
@@ -22,13 +23,7 @@ public final class MfCredentialsProvider implements CredentialsProvider {
   private final CredentialsProvider fallback = new SystemDefaultCredentialsProvider();
 
   @Override
-  public void setCredentials(final AuthScope authscope, final Credentials credentials) {
-    throw new UnsupportedOperationException(
-        "Credentials should be set the default Java way or in the configuration yaml file.");
-  }
-
-  @Override
-  public Credentials getCredentials(final AuthScope authscope) {
+  public Credentials getCredentials(AuthScope authScope, HttpContext context) {
 
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config != null) {
@@ -36,18 +31,12 @@ public Credentials getCredentials(final AuthScope authscope) {
       allCredentials.addAll(config.getProxies());
 
       for (HttpCredential credential : allCredentials) {
-        final Credentials credentials = credential.toCredentials(authscope);
+        final Credentials credentials = credential.toCredentials(authScope);
         if (credentials != null) {
           return credentials;
         }
       }
     }
-    return this.fallback.getCredentials(authscope);
-  }
-
-  @Override
-  public void clear() {
-    throw new UnsupportedOperationException(
-        "Credentials should be set the default Java way or in the configuration yaml file.");
+    return this.fallback.getCredentials(authScope, context);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index dcd469867..d926c29f0 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -10,7 +10,9 @@
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.http.HttpMethod;
@@ -29,20 +31,23 @@ public MfRoutePlanner() {
   }
 
   @Override
-  protected HttpHost determineProxy(
-      final HttpHost target, final ClassicHttpRequest request, final HttpContext context)
-      throws HttpException {
+  protected HttpHost determineProxy(HttpHost target, HttpContext context) throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config == null) {
       return null;
     }
+    var coreCtx = HttpCoreContext.cast(context);
+    if (coreCtx == null || coreCtx.getRequest() == null) {
+      return null;
+    }
+    var request = coreCtx.getRequest();
     final URI uri;
     try {
-      uri = new URI(request.getRequestLine().getUri());
+      uri = request.getUri();
     } catch (URISyntaxException e) {
       throw new RuntimeException(e);
     }
-    HttpMethod method = HttpMethod.valueOf(request.getRequestLine().getMethod());
+    HttpMethod method = HttpMethod.valueOf(request.getMethod());
 
     final List<HttpProxy> proxies = config.getProxies();
     for (HttpProxy proxy : proxies) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java b/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
deleted file mode 100644
index d761bb6fd..000000000
--- a/core/src/main/java/org/mapfish/print/http/MfSSLSocketFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.mapfish.print.http;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import javax.net.ssl.SSLContext;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.core5.http.protocol.HttpContext;
-import org.mapfish.print.config.Configuration;
-
-/** A ssl socket factory that obtains the keystore from the current configuration. */
-public final class MfSSLSocketFactory implements LayeredConnectionSocketFactory {
-  private LayeredConnectionSocketFactory defaultFactory =
-      SSLConnectionSocketFactory.getSystemSocketFactory();
-
-  @Override
-  public Socket createLayeredSocket(
-      final Socket socket, final String target, final int port, final HttpContext context)
-      throws IOException {
-    LayeredConnectionSocketFactory factory = getSSLSocketFactory();
-    return factory.createLayeredSocket(socket, target, port, context);
-  }
-
-  @Override
-  public Socket createSocket(final HttpContext context) throws IOException {
-    LayeredConnectionSocketFactory factory = getSSLSocketFactory();
-    return factory.createSocket(context);
-  }
-
-  @Override
-  public Socket connectSocket(
-      final int connectTimeout,
-      final Socket sock,
-      final HttpHost host,
-      final InetSocketAddress remoteAddress,
-      final InetSocketAddress localAddress,
-      final HttpContext context)
-      throws IOException {
-    LayeredConnectionSocketFactory factory = getSSLSocketFactory();
-    return factory.connectSocket(connectTimeout, sock, host, remoteAddress, localAddress, context);
-  }
-
-  private LayeredConnectionSocketFactory getSSLSocketFactory() {
-    final Configuration currentConfiguration =
-        MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
-    if (currentConfiguration == null || currentConfiguration.getCertificateStore() == null) {
-      return this.defaultFactory;
-    }
-    SSLContext context = currentConfiguration.getCertificateStore().getSSLContext();
-    return new SSLConnectionSocketFactory(context);
-  }
-}
diff --git a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
new file mode 100644
index 000000000..5be4447bc
--- /dev/null
+++ b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
@@ -0,0 +1,28 @@
+package org.mapfish.print.http;
+
+import java.io.IOException;
+import java.net.Socket;
+import javax.net.ssl.SSLSocket;
+
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.mapfish.print.config.Configuration;
+
+/** A ssl socket factory that obtains the keystore from the current configuration. */
+public final class MfTLSSocketStrategy implements TlsSocketStrategy {
+  private final TlsSocketStrategy defaultStrategy = DefaultClientTlsStrategy.createDefault();
+
+  @Override
+  public SSLSocket upgrade(Socket socket, String target, int port, Object attachment, HttpContext context) throws IOException {
+    return getSocketStrategy().upgrade(socket, target, port, attachment, context);
+  }
+
+  private TlsSocketStrategy getSocketStrategy() {
+    final Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
+    if (config == null || config.getCertificateStore() == null) {
+      return this.defaultStrategy;
+    }
+    return new DefaultClientTlsStrategy(config.getCertificateStore().getSSLContext());
+  }
+}
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index a6bc9af55..9633bc162 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -24,8 +24,7 @@ private UserAgentCreator() {}
    */
   public static String getUserAgent() {
 
-    final String httpClientUserAgent =
-        VersionInfo.getUserAgent(
+    final String httpClientUserAgent = getUserAgent(
             "Apache-HttpClient", "org.apache.http.client", UserAgentCreator.class);
 
     // This is based on the code from HttpClient:
@@ -41,4 +40,11 @@ public static String getUserAgent() {
 
     return String.format("%s/%s %s", AGENT_NAME, mfpRelease, httpClientUserAgent);
   }
+
+  public static String getUserAgent(String name, String pkg, Class<?> cls) {
+    var vi = VersionInfo.loadVersionInfo(pkg, cls.getClassLoader());
+    String release = vi != null ? vi.getRelease() : "UNAVAILABLE";
+    String javaVersion = System.getProperty("java.version");
+    return String.format("%s/%s (Java/%s)", name, release, javaVersion);
+  }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/Utils.java b/core/src/main/java/org/mapfish/print/http/Utils.java
index 3ad7b8642..9ed7df29e 100644
--- a/core/src/main/java/org/mapfish/print/http/Utils.java
+++ b/core/src/main/java/org/mapfish/print/http/Utils.java
@@ -1,5 +1,7 @@
 package org.mapfish.print.http;
 
+import org.springframework.http.HttpHeaders;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -17,9 +19,9 @@ private Utils() {}
    *
    * @param headers The headers
    */
-  public static List<String> getPrintableHeadersList(final Map<String, List<String>> headers) {
+  public static List<String> getPrintableHeadersList(HttpHeaders headers) {
     final List<String> result = new ArrayList<>();
-    for (String header : headers.keySet()) {
+    for (String header : headers.headerNames()) {
       List<String> value = headers.get(header);
       if (AUTH_HEADERS.contains(header.toLowerCase())) {
         value = Arrays.asList(new String[] {"***"});
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
index 00c003ec6..441a26147 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -193,34 +193,33 @@ private static void setDpiValue(final Multimap<String, String> extraParams, fina
   public static ClientHttpRequest createWmsRequest(
       final MfClientHttpRequestFactory httpRequestFactory, final URI uri, final HttpMethod method)
       throws IOException {
-    switch (method) {
-      case GET:
-        return httpRequestFactory.createRequest(uri, method);
-      case POST:
-        final String params = uri.getQuery();
-        final URI paramlessUri;
-        try {
-          paramlessUri =
-              new URI(
-                  uri.getScheme(),
-                  uri.getUserInfo(),
-                  uri.getHost(),
-                  uri.getPort(),
-                  uri.getPath(),
-                  null,
-                  null);
-        } catch (URISyntaxException e) {
-          throw new RuntimeException(e);
-        }
-        final ClientHttpRequest request = httpRequestFactory.createRequest(paramlessUri, method);
-        final byte[] encodedParams = params.getBytes(StandardCharsets.UTF_8);
-        request.getHeaders().set("Content-Type", "application/x-www-form-urlencoded");
-        request.getHeaders().set("Charset", "utf-8");
-        request.getHeaders().set("Content-Length", Integer.toString(encodedParams.length));
-        request.getBody().write(encodedParams);
-        return request;
-      default:
-        throw new RuntimeException("Unsupported WMS request method: " + method);
+    if (method.equals(HttpMethod.GET)) {
+      return httpRequestFactory.createRequest(uri, method);
+    }
+    if (method.equals(HttpMethod.POST)) {
+      final String params = uri.getQuery();
+      final URI paramlessUri;
+      try {
+        paramlessUri =
+          new URI(
+            uri.getScheme(),
+            uri.getUserInfo(),
+            uri.getHost(),
+            uri.getPort(),
+            uri.getPath(),
+            null,
+            null);
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+      final ClientHttpRequest request = httpRequestFactory.createRequest(paramlessUri, method);
+      final byte[] encodedParams = params.getBytes(StandardCharsets.UTF_8);
+      request.getHeaders().set("Content-Type", "application/x-www-form-urlencoded");
+      request.getHeaders().set("Charset", "utf-8");
+      request.getHeaders().set("Content-Length", Integer.toString(encodedParams.length));
+      request.getBody().write(encodedParams);
+      return request;
     }
+    throw new RuntimeException("Unsupported WMS request method: " + method);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
index 02b05f82a..d84d3d1e8 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MapfishPrintInstrumentedFilterContextListener.java
@@ -3,8 +3,7 @@
 import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext;
 
 import com.codahale.metrics.MetricRegistry;
-import io.dropwizard.metrics.servlets.HealthCheckServlet;
-import com.codahale.metrics.servlet.InstrumentedFilterContextListener;
+import io.dropwizard.metrics.servlet.InstrumentedFilterContextListener;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletContextEvent;
 import org.springframework.web.context.WebApplicationContext;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index e20435adb..b8db087a4 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -2,34 +2,54 @@
 
 import java.net.MalformedURLException;
 import java.net.URI;
+
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
 
-/** Information required for performing a request match. */
+/**
+ * Information required for performing a request match.
+ */
 public final class MatchInfo {
-  /** A value representing all and any schemes. */
+  /**
+   * A value representing all and any schemes.
+   */
   public static final String ANY_SCHEME = null;
 
-  /** A value representing all and any hosts. */
+  /**
+   * A value representing all and any hosts.
+   */
   public static final String ANY_HOST = null;
 
-  /** A value representing all and any realms. */
+  /**
+   * A value representing all and any realms.
+   */
   public static final String ANY_REALM = null;
 
-  /** A value representing all and any paths. */
+  /**
+   * A value representing all and any paths.
+   */
   public static final String ANY_PATH = null;
 
-  /** A value representing all and any fragments. */
+  /**
+   * A value representing all and any fragments.
+   */
   public static final String ANY_FRAGMENT = null;
 
-  /** A value representing all and any queries. */
+  /**
+   * A value representing all and any queries.
+   */
   public static final String ANY_QUERY = null;
 
-  /** A value representing all and any queries. */
+  /**
+   * A value representing all and any queries.
+   */
   public static final HttpMethod ANY_METHOD = null;
 
-  /** A value representing all and any ports. */
+  /**
+   * A value representing all and any ports.
+   */
   public static final int ANY_PORT = -1;
 
   private final String scheme;
@@ -45,9 +65,9 @@ public final class MatchInfo {
    * Constructor.
    *
    * @param scheme the scheme to match.
-   * @param host the host to match.
-   * @param port the host to match.
-   * @param realm the realm to match.
+   * @param host   the host to match.
+   * @param port   the host to match.
+   * @param realm  the realm to match.
    */
   private MatchInfo(final String scheme, final String host, final int port, final String realm) {
     this.scheme = scheme;
@@ -63,8 +83,8 @@ private MatchInfo(final String scheme, final String host, final int port, final
   /**
    * Constructor.
    *
-   * @param uri the uri containing the parameters to match.
-   * @param port the host to match.
+   * @param uri    the uri containing the parameters to match.
+   * @param port   the host to match.
    * @param method the method to match.
    */
   private MatchInfo(final URI uri, final int port, final HttpMethod method) {
@@ -81,7 +101,7 @@ private MatchInfo(final URI uri, final int port, final HttpMethod method) {
   /**
    * Create an info object from a uri and the http method object.
    *
-   * @param uri the uri
+   * @param uri    the uri
    * @param method the method
    */
   public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
@@ -103,19 +123,14 @@ public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
    * @param authscope the authscope
    */
   public static MatchInfo fromAuthScope(final AuthScope authscope) {
-    String newScheme =
-        StringUtils.equals(authscope.getScheme(), AuthScope.ANY_SCHEME)
-            ? ANY_SCHEME
-            : authscope.getScheme();
-    String newHost =
-        StringUtils.equals(authscope.getHost(), AuthScope.ANY_HOST)
-            ? ANY_HOST
-            : authscope.getHost();
-    int newPort = authscope.getPort() == AuthScope.ANY_PORT ? ANY_PORT : authscope.getPort();
-    String newRealm =
-        StringUtils.equals(authscope.getRealm(), AuthScope.ANY_REALM)
-            ? ANY_REALM
-            : authscope.getRealm();
+
+    String newScheme = Strings.CS.equals(authscope.getSchemeName(), ANY_SCHEME) ? ANY_SCHEME
+      : authscope.getSchemeName();
+    String newHost = Strings.CS.equals(authscope.getHost(), ANY_HOST) ? ANY_HOST
+      : authscope.getHost();
+    int newPort = authscope.getPort() == ANY_PORT ? ANY_PORT : authscope.getPort();
+    String newRealm = Strings.CS.equals(authscope.getRealm(), ANY_REALM) ? ANY_REALM
+      : authscope.getRealm();
 
     return new MatchInfo(newScheme, newHost, newPort, newRealm);
   }
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index 967257e62..12a635b5b 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -21,13 +21,7 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.servlet.ServletException;
@@ -1173,7 +1167,7 @@ private boolean checkReferer(final HttpServletRequest request, final MapPrinter
       referrer = "http://localhost/";
     }
     try {
-      return allowedReferers.matches(new URI(referrer), HttpMethod.resolve(request.getMethod()));
+      return allowedReferers.matches(new URI(referrer), HttpMethod.valueOf(request.getMethod().toUpperCase(Locale.ROOT)));
     } catch (SocketException
         | UnknownHostException
         | URISyntaxException
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index dbac83626..087adc618 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -111,13 +111,6 @@ public HttpMethod getMethod() {
       return httpRequest.getMethod();
     }
 
-    @Nonnull
-    @Override
-    public String getMethodValue() {
-      final HttpMethod method = httpRequest.getMethod();
-      return method.name();
-    }
-
     @Nonnull
     @Override
     public URI getURI() {

From d947394e2e740e4c5c49d427e7445c90db96ab5a Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 13:48:33 +0100
Subject: [PATCH 37/61] Fixed checkstyle issues

---
 .../http/ErrorResponseClientHttpResponse.java    |  1 -
 .../http/MfClientHttpRequestFactoryImpl.java     |  7 +++++--
 .../print/http/MfCredentialsProvider.java        |  2 +-
 .../org/mapfish/print/http/MfRoutePlanner.java   |  4 +---
 .../mapfish/print/http/MfTLSSocketStrategy.java  |  6 +++++-
 .../org/mapfish/print/http/UserAgentCreator.java |  2 +-
 .../main/java/org/mapfish/print/http/Utils.java  |  5 ++---
 .../print/processor/http/matcher/MatchInfo.java  |  1 -
 .../mapfish/print/servlet/BaseMapServlet.java    |  4 ++--
 .../servlet/BooleanHandleReportLoadResult.java   |  2 +-
 .../print/servlet/HandleReportLoadResult.java    |  2 +-
 .../mapfish/print/servlet/MapPrinterServlet.java | 15 +++++++++++----
 .../servlet/VoidHandleReportLoadResult.java      |  2 +-
 .../fileloader/ServletConfigFileLoader.java      |  2 +-
 .../org/mapfish/print/TestHttpClientFactory.java |  5 +++++
 .../mapfish/print/http/HttpCredentialTest.java   | 16 +++++++++-------
 .../http/matcher/AddressHostMatcherTest.java     | 12 ++++++------
 .../http/matcher/DnsHostMatcherTest.java         |  6 +++---
 .../http/matcher/HostnameMatcherTest.java        |  6 +++---
 .../http/matcher/LocalHostMatcherTest.java       |  6 +++---
 .../print/servlet/MapPrinterServletTest.java     |  4 ++--
 21 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index 9eb30ab35..37e85c438 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.util.StreamUtils;
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 736f16783..6610bef3f 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -21,9 +21,12 @@
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.core5.http.*;
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpEntityContainer;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 861673a44..3edecb2e4 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -23,7 +23,7 @@ public final class MfCredentialsProvider implements CredentialsProvider {
   private final CredentialsProvider fallback = new SystemDefaultCredentialsProvider();
 
   @Override
-  public Credentials getCredentials(AuthScope authScope, HttpContext context) {
+  public Credentials getCredentials(final AuthScope authScope, final HttpContext context) {
 
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config != null) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index d926c29f0..7598c812c 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -7,10 +7,8 @@
 import java.net.UnknownHostException;
 import java.util.List;
 import org.apache.hc.client5.http.impl.routing.DefaultRoutePlanner;
-import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.mapfish.print.config.Configuration;
@@ -31,7 +29,7 @@ public MfRoutePlanner() {
   }
 
   @Override
-  protected HttpHost determineProxy(HttpHost target, HttpContext context) throws HttpException {
+  protected HttpHost determineProxy(final HttpHost target, final HttpContext context) throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
     if (config == null) {
       return null;
diff --git a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
index 5be4447bc..f54b3de3d 100644
--- a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
+++ b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
@@ -14,7 +14,11 @@ public final class MfTLSSocketStrategy implements TlsSocketStrategy {
   private final TlsSocketStrategy defaultStrategy = DefaultClientTlsStrategy.createDefault();
 
   @Override
-  public SSLSocket upgrade(Socket socket, String target, int port, Object attachment, HttpContext context) throws IOException {
+  public SSLSocket upgrade(final Socket socket,
+                           final String target,
+                           final int port,
+                           final Object attachment,
+                           final HttpContext context) throws IOException {
     return getSocketStrategy().upgrade(socket, target, port, attachment, context);
   }
 
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index 9633bc162..16dd0a164 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -41,7 +41,7 @@ public static String getUserAgent() {
     return String.format("%s/%s %s", AGENT_NAME, mfpRelease, httpClientUserAgent);
   }
 
-  public static String getUserAgent(String name, String pkg, Class<?> cls) {
+  public static String getUserAgent(final String name, final String pkg, final Class<?> cls) {
     var vi = VersionInfo.loadVersionInfo(pkg, cls.getClassLoader());
     String release = vi != null ? vi.getRelease() : "UNAVAILABLE";
     String javaVersion = System.getProperty("java.version");
diff --git a/core/src/main/java/org/mapfish/print/http/Utils.java b/core/src/main/java/org/mapfish/print/http/Utils.java
index 9ed7df29e..50b19a27a 100644
--- a/core/src/main/java/org/mapfish/print/http/Utils.java
+++ b/core/src/main/java/org/mapfish/print/http/Utils.java
@@ -5,21 +5,20 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /** Network utils class. */
 public final class Utils {
   private Utils() {}
 
   private static final List<String> AUTH_HEADERS =
-      Arrays.asList(new String[] {"cookie", "set-cookie", "authorization", "x-csrf-token"});
+      Arrays.asList("cookie", "set-cookie", "authorization", "x-csrf-token");
 
   /**
    * Get a list of printable (auth header will be hidden) headers 'header=value'.
    *
    * @param headers The headers
    */
-  public static List<String> getPrintableHeadersList(HttpHeaders headers) {
+  public static List<String> getPrintableHeadersList(final HttpHeaders headers) {
     final List<String> result = new ArrayList<>();
     for (String header : headers.headerNames()) {
       List<String> value = headers.get(header);
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index b8db087a4..f5696be13 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -3,7 +3,6 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Strings;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
index 1675be4b0..e835f518e 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
@@ -2,8 +2,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.PrintException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
index 3007ae866..2b15ffbb7 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
index 7b864b64d..eadca958b 100644
--- a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
@@ -8,7 +8,7 @@
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.slf4j.Logger;
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index 12a635b5b..c0dbc0a37 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -21,12 +21,19 @@
 import java.net.URLDecoder;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jasperreports.engine.fonts.FontFamily;
 import net.sf.jasperreports.extensions.ExtensionsEnvironment;
 import org.apache.commons.io.FilenameUtils;
diff --git a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
index bba96e3c9..47abe82c9 100644
--- a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
index ae51d4ab2..bc67539f5 100644
--- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
+++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
@@ -4,7 +4,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.Iterator;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** A plugin that loads the config resources from urls starting with prefix: {@value #PREFIX}://. */
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index 087adc618..9119c352b 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -117,6 +117,11 @@ public URI getURI() {
       return httpRequest.getURI();
     }
 
+    @Override
+    public Map<String, Object> getAttributes() {
+      return Map.of();
+    }
+
     @Nonnull
     @Override
     public HttpHeaders getHeaders() {
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index ccd4e2f2e..b05488860 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -18,6 +18,7 @@
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
 import org.mapfish.print.processor.http.matcher.DnsHostMatcher;
+import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -85,25 +86,26 @@ public void testToCredentials() throws Exception {
 
     authscope =
         new AuthScope(
-            AuthScope.ANY_HOST, AuthScope.ANY_PORT, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME);
+            MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
         new AuthScope(
-            AuthScope.ANY_HOST,
+          MatchInfo.ANY_SCHEME,
+          MatchInfo.ANY_HOST,
             HttpProxyTest.HTTPS_PROXY_PORT,
-            AuthScope.ANY_REALM,
-            AuthScope.ANY_SCHEME);
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME);
+    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
-        new AuthScope("google.com", AuthScope.ANY_PORT, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME);
+        new AuthScope(MatchInfo.ANY_SCHEME, "google.com", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
     assertNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http");
+    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http");
     assertNotNull(credential.toCredentials(authscope));
   }
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index b5f7ec604..523c76e27 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -20,15 +20,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setMask("255.255.255.0");
     addressHostMatcher.setIp("127.0.0.0");
@@ -42,15 +42,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setPort(8080);
     assertMatch(addressHostMatcher, true, new URI("http://127.0.0.1:8080"), HttpMethod.GET);
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index 8f022940f..b6166b52a 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -30,15 +30,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("localhost", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     dnsHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index 9a8d31e83..bb9cdbe2f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -39,15 +39,15 @@ public void testNoSubdomain() throws Exception {
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("localhost", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertFalse(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     hostnameHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 74d917627..4980b1789 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -47,15 +47,15 @@ public void testAccepts() throws Exception {
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(AuthScope.ANY_HOST, 80, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", AuthScope.ANY_PORT, AuthScope.ANY_REALM, "http"))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope("127.0.0.1", 80, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME))));
+                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
 
     assertMatch(localHostMatcher, false, new URI("http://www.camptocamp.com/"), HttpMethod.GET);
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
index f478aa6d2..6dc7261e6 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
@@ -27,8 +27,8 @@
 import javax.mail.Multipart;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMultipart;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;

From 992b5b872ce758c5d2c0907b6607570dc5a8d861 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 16:23:23 +0100
Subject: [PATCH 38/61] OpenRewrite migration from junit4 to junit6

---
 build.gradle                                  |   2 +-
 core/build.gradle                             |   1 +
 .../mapfish/print/cli/CliServletContext.java  |  42 ++-----
 .../print/config/WorkingDirectories.java      |   2 +-
 .../resources/mapfish-spring-hibernate.xml    |   4 +-
 .../print/AbstractMapfishSpringTest.java      |  49 ++++----
 .../org/mapfish/print/StatsUtilsTest.java     |   4 +-
 .../java/org/mapfish/print/URIUtilsTest.java  |   6 +-
 .../attribute/AbstractAttributeTest.java      |  12 +-
 ...eredReflectiveAttributeValidationTest.java |  17 +--
 .../print/attribute/BooleanAttributeTest.java |   6 +-
 .../attribute/DataSourceAttributeTest.java    |   6 +-
 .../JsonDatasourceAttributeTest.java          |   6 +-
 .../attribute/ReflectiveAttributeTest.java    |  29 +++--
 .../attribute/ScalebarAttributeTest.java      |  44 ++++---
 .../attribute/StringArrayAttributeTest.java   |   4 +-
 .../print/attribute/StringAttributeTest.java  |  35 +++---
 .../print/attribute/StyleAttributeTest.java   |  11 +-
 .../attribute/map/BBoxMapBoundsTest.java      |   4 +-
 .../map/CenterScaleMapBoundsTest.java         |   6 +-
 .../map/GenericMapAttributeTest.java          |  16 ++-
 .../print/attribute/map/MapAttributeTest.java |  49 ++++----
 .../map/OverviewMapAttributeTest.java         |  10 +-
 .../map/ScaleAdjustmentAccuracyTest.java      |   4 +-
 .../print/attribute/map/ZoomLevelsTest.java   |   6 +-
 .../java/org/mapfish/print/cli/MainTest.java  |   6 +-
 .../AttributeWithConfigurationInjection.java  |   2 +-
 .../config/AttributeWithSpringInjection.java  |   2 +-
 ...oryAllConfigObjectMustBePrototypeTest.java |  25 ++--
 .../config/ConfigurationFactoryTest.java      |  36 +++---
 .../print/config/ConfigurationTest.java       |  18 +--
 .../print/config/CustomFontLoaderTest.java    |   4 +-
 .../ProcessorWithConfigurationInjection.java  |   2 +-
 .../config/ProcessorWithSpringInjection.java  |   2 +-
 .../print/config/WorkingDirectoriesTest.java  |   6 +-
 .../access/AccessAssertionPersisterTest.java  |   6 +-
 .../access/AlwaysAllowAssertionTest.java      |   2 +-
 .../config/access/AndAccessAssertionTest.java |  39 +++---
 .../access/RoleAccessAssertionTest.java       | 107 +++++++++-------
 ...igFileResolvingHttpRequestFactoryTest.java |  20 +--
 .../http/ConfigFileResolvingRequestTest.java  |   6 +-
 .../print/http/HttpConfigurationTest.java     |   6 +-
 .../print/http/HttpCredentialTest.java        |  14 +--
 .../org/mapfish/print/http/HttpProxyTest.java |  14 +--
 .../MfClientHttpRequestFactoryImplTest.java   |  12 +-
 .../mapfish/print/map/DistanceUnitTest.java   |   7 +-
 .../java/org/mapfish/print/map/ScaleTest.java |   4 +-
 .../map/geotools/FeaturesParserTest.java      |  10 +-
 .../print/map/geotools/GeoJsonLayerTest.java  | 117 +++++++++---------
 .../GeotiffLayerFactoryPluginTest.java        |  58 +++++----
 .../map/geotools/grid/GridUtilsTest.java      |   4 +-
 .../geotools/grid/LineGridStrategyTest.java   |   6 +-
 .../geotools/grid/PointGridStrategyTest.java  |  18 +--
 .../image/AbstractSingleImageLayerTest.java   |   8 +-
 .../print/map/image/wms/WmsUtilitiesTest.java |   7 +-
 .../map/style/FileSLDParserPluginTest.java    |   6 +-
 .../map/style/ParserPluginUtilsTest.java      |   6 +-
 .../map/style/URLSLDParserPluginTest.java     |   6 +-
 .../print/map/style/json/ColorParserTest.java |   4 +-
 .../style/json/JsonStyleParserHelperTest.java |  34 +++--
 .../json/MapfishJsonFileResolverTest.java     |   6 +-
 .../json/MapfishJsonStyleVersion2Test.java    |   4 +-
 .../json/MapfishStyleParserPluginTest.java    |   8 +-
 .../map/tiled/AbstractWMXLayerParamsTest.java |   6 +-
 .../map/tiled/SingleTileLoaderTaskTest.java   |   6 +-
 .../map/tiled/osm/OsmLayerParamTest.java      |   6 +-
 .../print/map/tiled/osm/OsmLayerTest.java     |   9 +-
 .../map/tiled/wmts/WMTSLayerParamTest.java    |   6 +-
 .../print/map/tiled/wmts/WMTSLayerTest.java   |  26 ++--
 .../metrics/JobQueueHealthCheckTest.java      |  11 +-
 .../UnhealthyCountersHealthCheckTest.java     |   6 +-
 .../AbstractJasperReportOutputFormatTest.java |  14 +--
 .../output/JRPdfExporterWeakHashMapTest.java  |  10 +-
 ...JasperReportOutputFormatSimpleMapTest.java |  46 +++----
 .../JasperReportPDFOutputFormatTest.java      |   6 +-
 .../JasperReportSvgOutputFormatTest.java      |   6 +-
 .../org/mapfish/print/output/ValuesTest.java  |  95 +++++++-------
 .../print/parser/MapfishParserTest.java       | 103 ++++++++-------
 .../processor/AbstractProcessorTest.java      |   6 +-
 .../PdfConfigurationProcessorTest.java        |  61 ++++-----
 .../ProcessorDependencyGraphFactoryTest.java  |  67 +++++-----
 .../ProcessorDependencyGraphTest.java         |  36 +++---
 .../processor/ProcessorGraphNodeTest.java     |  35 +++---
 .../processor/SetStyleProcessorTest.java      |  11 +-
 .../http/AbstractHttpProcessorTest.java       |   4 +-
 .../http/AddHeadersProcessorTest.java         |   4 +-
 ...ClientHttpRequestFactoryProcessorTest.java |   4 +-
 .../http/ForwardHeadersProcessorTest.java     |   6 +-
 .../http/MapUriBug228ProcessorTest.java       |  12 +-
 .../processor/http/MapUriProcessorTest.java   |   2 +-
 .../http/RestrictUrisProcessorTest.java       |  37 +++---
 .../http/UseHttpForHttpsProcessorTest.java    |   2 +-
 .../http/matcher/AcceptAllMatcherTest.java    |   2 +-
 .../http/matcher/AddressHostMatcherTest.java  |   4 +-
 .../http/matcher/DnsHostMatcherTest.java      |   4 +-
 .../http/matcher/HostnameMatcherTest.java     |   6 +-
 .../http/matcher/LocalHostMatcherTest.java    |   4 +-
 .../http/matcher/MatcherTestUtils.java        |   2 +-
 .../jasper/DataSourceProcessorTest.java       |   6 +-
 .../jasper/DateFormatProcessorTest.java       |   4 +-
 .../jasper/HttpImageResolverTest.java         |   7 +-
 .../print/processor/jasper/IconTaskTest.java  |   4 +-
 .../processor/jasper/LegendProcessorTest.java |   6 +-
 .../processor/jasper/MapSubReportTest.java    |  13 +-
 ...rgeDataSourceProcessorIntegrationTest.java |   8 +-
 .../jasper/MergeDataSourceProcessorTest.java  |   8 +-
 .../processor/jasper/TableProcessorTest.java  |   4 +-
 .../map/AddBackgroundLayersTest.java          |   4 +-
 .../processor/map/AddOverlayLayersTest.java   |   4 +-
 ...reateMapPagesFailOnErrorProcessorTest.java |  18 +--
 ...MapPagesForceFailOnErrorProcessorTest.java |  22 ++--
 .../map/CreateMapPagesProcessorTest.java      |   8 +-
 ...ateMapPagesProcessorZoomToFeatureTest.java |   8 +-
 .../CreateMapProcessorAoiForBoundsTest.java   |   4 +-
 .../map/CreateMapProcessorAoiTest.java        |   6 +-
 ...rGeoJsonZoomToExtentFlexibleScaleTest.java |   4 +-
 ...CenterGeoJsonZoomToExtentMinScaleTest.java |   4 +-
 ...rocessorCenterGeoJsonZoomToExtentTest.java |   4 +-
 ...teMapProcessorCenterGeoJsonZoomToTest.java |   4 +-
 ...ProcessorCenterGeojsonEmptyCollection.java |   4 +-
 ...rocessorCenterGeojsonJsonStyleHighDpi.java |   4 +-
 ...eMapProcessorCenterGeojsonJsonStyleV1.java |   4 +-
 ...cessorCenterWMSRotationSmallTilesTest.java |   4 +-
 ...cessorFixedScaleAndCenterWMTSRestTest.java |   4 +-
 ...orFixedScaleAndCenterWMTSRotationTest.java |   4 +-
 ...pProcessorFixedScaleAndCenterWMTSTest.java |   4 +-
 ...MapProcessorFixedScaleBBoxGeoJsonTest.java |   4 +-
 ...ScaleCenterGridFixedNumlinesPointTest.java |   4 +-
 ...FixedScaleCenterGridFixedNumlinesTest.java |   4 +-
 ...dScaleCenterGridFixedSpacingPointTest.java |   4 +-
 ...cessorFixedScaleCenterGridSpacingTest.java |   4 +-
 ...apProcessorFixedScaleCenterOsmDpiTest.java |   4 +-
 ...cessorFixedScaleCenterOsmRotationTest.java |   4 +-
 ...teMapProcessorFixedScaleCenterOsmTest.java |   4 +-
 ...ssorFlexibleScaleAndCenterGeoTiffTest.java |   4 +-
 ...ProcessorFlexibleScaleBBoxGeoJsonTest.java |   4 +-
 ...eMapProcessorFlexibleScaleBBoxGmlTest.java |   4 +-
 ...cessorFlexibleScaleCenterTiledWmsTest.java |   4 +-
 ...cessorFlexibleScaleCenterWms1_0_0Test.java |  40 +++---
 ...orFlexibleScaleCenterWms1_0_0_DPITest.java |  40 +++---
 ...xibleScaleCenterWms1_0_0_DPI_SVG_Test.java |  40 +++---
 ...dFixedNumlinesLinesNoRotateLabelsTest.java |   4 +-
 ...ridFixedNumlinesPointAltLabelProjTest.java |   4 +-
 ...cessorGridFixedNumlinesPointCRS84Test.java |   4 +-
 ...ssorGridFixedNumlinesPointRotatedTest.java |   4 +-
 .../map/CreateMapProcessorImageLayerTest.java |   4 +-
 .../CreateMapProcessorLabelGeoJsonTest.java   |   4 +-
 ...rocessorLineVsPolygonStyleGeoJsonTest.java |   4 +-
 .../CreateMapProcessorOpacityWMTSTest.java    |   4 +-
 .../map/CreateMapProcessorRenderTypeTest.java |   6 +-
 ...orScaleBBoxNativeRotationWms1_3_0Test.java |  36 +++---
 .../map/CreateMapProcessorWmtsBufferTest.java |   4 +-
 .../map/CreateNorthArrowProcessorSvgTest.java |   2 +-
 .../map/CreateNorthArrowProcessorTest.java    |   6 +-
 ...reateOverviewMapProcessorCustomBounds.java |   4 +-
 ...teOverviewMapProcessorCustomLayerTest.java |   4 +-
 .../CreateOverviewMapProcessorRotateTest.java |   4 +-
 .../CreateOverviewMapProcessorStyleTest.java  |   4 +-
 .../map/CreateOverviewMapProcessorTest.java   |   4 +-
 .../processor/map/MapfishMapContextTest.java  |   8 +-
 .../processor/map/NorthArrowGraphicTest.java  |   6 +-
 .../map/SetFeaturesProcessorTest.java         |   4 +-
 .../map/SetTiledWmsProcessorTest.java         |   4 +-
 .../map/SetWmsCustomParamProcessorTest.java   |  38 +++---
 ...leBarProcessorFixedScaleCenterOsmTest.java |   6 +-
 .../map/scalebar/ScalebarDrawerTest.java      |   4 +-
 .../map/scalebar/ScalebarGraphicTest.java     |  19 ++-
 .../MapPrinterServletSecurityTest.java        |  56 +++++----
 .../print/servlet/MapPrinterServletTest.java  | 108 ++++++++++------
 .../fileloader/AbstractConfigLoaderTest.java  |  23 ++--
 .../ClasspathConfigFileLoaderTest.java        |  67 +++++-----
 .../fileloader/FileConfigFileLoaderTest.java  |  43 ++++---
 .../ServletConfigFileLoaderTest.java          |  41 +++---
 .../print/servlet/job/ClusteringTaskTest.java |  15 ++-
 .../job/PostResultToRegistryTaskTest.java     |   6 +-
 .../servlet/registry/BasicRegistryTest.java   |   4 +-
 .../print/test/util/ImageSimilarityTest.java  |   8 +-
 .../print/url/data/TestDataUrlConnection.java |   4 +-
 .../mapfish/print/url/data/TestHandler.java   |   4 +-
 .../print/wrapper/yaml/PYamlArrayTest.java    |   6 +-
 .../print/wrapper/yaml/PYamlObjectTest.java   |   6 +-
 .../resources/mapfish-spring-hibernate.xml    |   4 +-
 docs/build.gradle                             |   3 +
 examples/build.gradle                         |   4 +-
 .../java/org/mapfish/print/ExamplesTest.java  |  16 +--
 .../org/mapfish/print/MetricsApiTest.java     |   7 +-
 .../java/org/mapfish/print/PrintApiTest.java  |  34 ++---
 gradle.properties                             |   1 +
 188 files changed, 1371 insertions(+), 1312 deletions(-)

diff --git a/build.gradle b/build.gradle
index 79efd174c..81a689a59 100644
--- a/build.gradle
+++ b/build.gradle
@@ -92,7 +92,7 @@ tasks.register('docs') {
 
 
 rewrite {
-    activeRecipe("org.openrewrite.java.spring.framework.UpgradeSpringFramework_7_0")
+    activeRecipe("org.openrewrite.java.testing.junit5.JUnit4to5Migration")
     setExportDatatables(true)
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index 33895399a..8663907c3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,6 +91,7 @@ test {
         junitXml.getRequired().set(true)
         html.getRequired().set(true)
     }
+    useJUnitPlatform()
 }
 
 build {
diff --git a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
index 02707104e..38ccc0917 100644
--- a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
+++ b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
@@ -6,15 +6,15 @@
 import java.util.EventListener;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
 
 /**
  * An essentially non-functional servlet context that is used by the CLI application to satisfy the
@@ -81,31 +81,9 @@ public RequestDispatcher getNamedDispatcher(final String name) {
     return null;
   }
 
-  @Override
-  @Deprecated
-  public Servlet getServlet(final String name) {
-    return null;
-  }
-
-  @Override
-  @Deprecated
-  public Enumeration<Servlet> getServlets() {
-    return null;
-  }
-
-  @Override
-  @Deprecated
-  public Enumeration<String> getServletNames() {
-    return null;
-  }
-
   @Override
   public void log(final String msg) {}
 
-  @Override
-  @Deprecated
-  public void log(final Exception exception, final String msg) {}
-
   @Override
   public void log(final String message, final Throwable throwable) {}
 
@@ -292,7 +270,7 @@ public int getSessionTimeout() {
   }
 
   @Override
-  public javax.servlet.ServletRegistration.Dynamic addJspFile(final String p1, final String p2) {
+  public jakarta.servlet.ServletRegistration.Dynamic addJspFile(final String p1, final String p2) {
     return null;
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
index ff001e3f8..15a001739 100644
--- a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
+++ b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
@@ -7,7 +7,7 @@
 import java.util.Date;
 import java.util.Objects;
 import javax.annotation.PostConstruct;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;
diff --git a/core/src/main/resources/mapfish-spring-hibernate.xml b/core/src/main/resources/mapfish-spring-hibernate.xml
index 7d1f8b8ef..77c884d33 100644
--- a/core/src/main/resources/mapfish-spring-hibernate.xml
+++ b/core/src/main/resources/mapfish-spring-hibernate.xml
@@ -6,7 +6,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-    <bean id="mfSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+    <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
         <property name="annotatedClasses">
             <list>
@@ -28,7 +28,7 @@
         </property>
     </bean>
 
-    <bean id="transactionManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+    <bean id="transactionManager" class="org.springframework.orm.jpa.hibernate.HibernateTransactionManager">
         <property name="sessionFactory" ref="mfSessionFactory"/>
     </bean>
     <tx:annotation-driven transaction-manager="transactionManager"/>
diff --git a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
index ba0ca5789..ac1c80871 100644
--- a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
+++ b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
@@ -14,7 +14,8 @@
 import java.util.regex.Pattern;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.referencing.CRS;
-import org.junit.runner.RunWith;
+// JUnit 5 Imports
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.attribute.map.CenterScaleMapBounds;
 import org.mapfish.print.attribute.map.MapfishMapContext;
 import org.mapfish.print.config.WorkingDirectories;
@@ -25,32 +26,32 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Class that loads the normal spring application context from the spring config file. Subclasses
  * can use Autowired to get dependencies from the application context.
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
-    locations = {
-      AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
-      AbstractMapfishSpringTest.TEST_SPRING_XML,
-      AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
-    })
+  locations = {
+    AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
+    AbstractMapfishSpringTest.TEST_SPRING_XML,
+    AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
+  })
 public abstract class AbstractMapfishSpringTest {
   public static final String DEFAULT_SPRING_XML =
-      "classpath:mapfish-spring-application-context.xml";
+    "classpath:mapfish-spring-application-context.xml";
   public static final String TEST_SPRING_XML =
-      "classpath:test-http-request-factory-application-context.xml";
+    "classpath:test-http-request-factory-application-context.xml";
   public static final String TEST_SPRING_FONT_XML =
-      "classpath:test-mapfish-spring-custom-fonts.xml";
+    "classpath:test-mapfish-spring-custom-fonts.xml";
   // The maximum number of times to retry fetching a resource used in tests
   public static final int HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY = 2;
   // The interval between retries used in tests
   public static final int HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS = 1;
   protected static final Processor.ExecutionContext CONTEXT =
-      new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
+    new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
   static final Pattern IMPORT_PATTERN = Pattern.compile("@@importFile\\((\\S+)\\)@@");
 
   @Autowired private WorkingDirectories workingDirectories;
@@ -66,7 +67,7 @@ public static File getFile(Class<?> testClass, String fileName) {
     final URL resource = testClass.getResource(fileName);
     if (resource == null) {
       throw new AssertionError(
-          "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
+        "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
     }
 
     return new File(resource.getFile());
@@ -86,7 +87,7 @@ public static PJsonObject parseJSONObjectFromString(String jsonString) {
   }
 
   public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fileName)
-      throws IOException {
+    throws IOException {
     final File file = getFile(testClass, fileName);
     String jsonString = Files.readString(file.toPath(), Constants.DEFAULT_CHARSET);
     Matcher matcher = IMPORT_PATTERN.matcher(jsonString);
@@ -104,7 +105,7 @@ public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fil
   public static MapfishMapContext createTestMapContext() {
     try {
       final CenterScaleMapBounds bounds =
-          new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
+        new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
       return new MapfishMapContext(bounds, new Dimension(500, 500), 0, 72, true, true);
     } catch (FactoryException e) {
       throw new RuntimeException(e);
@@ -186,13 +187,13 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     }
 
     String platformVersionName =
-        "expectedSimpleImage"
-            + classifier
-            + "-"
-            + normalizedOSName()
-            + "-jdk"
-            + javaVersion
-            + ".png";
+      "expectedSimpleImage"
+        + classifier
+        + "-"
+        + normalizedOSName()
+        + "-jdk"
+        + javaVersion
+        + ".png";
     String platformName = "expectedSimpleImage" + classifier + "-" + normalizedOSName() + ".png";
     String defaultName = "expectedSimpleImage" + classifier + ".png";
 
@@ -202,8 +203,8 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     //        ImageIO.write(actualImage, "png", new File(TMP, baseDir + "/" + defaultName));
 
     return OptionalUtils.or(
-            () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
-        .orElse(defaultName);
+        () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
+      .orElse(defaultName);
   }
 
   private Optional<String> findImage(final String baseDir, final String fileName) {
diff --git a/core/src/test/java/org/mapfish/print/StatsUtilsTest.java b/core/src/test/java/org/mapfish/print/StatsUtilsTest.java
index ec99a57b0..d0a537259 100644
--- a/core/src/test/java/org/mapfish/print/StatsUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/StatsUtilsTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StatsUtilsTest {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/URIUtilsTest.java b/core/src/test/java/org/mapfish/print/URIUtilsTest.java
index 7fe7aa6f0..4719dfc48 100644
--- a/core/src/test/java/org/mapfish/print/URIUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/URIUtilsTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.LinkedListMultimap;
@@ -10,7 +8,7 @@
 import java.net.URI;
 import java.util.HashSet;
 import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class URIUtilsTest {
 
diff --git a/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java
index fd28a9981..7fd42c231 100644
--- a/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/AbstractAttributeTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_TYPE;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_NAME;
 
@@ -10,7 +10,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
 import org.mockito.Mockito;
@@ -34,10 +34,10 @@ public void testPrintClientConfig() {
     Template template = Mockito.mock(Template.class);
     JSONObject capabilities = getClientConfig(attribute, template);
     assertTrue(
-        "Missing " + JSON_NAME + " in: \n" + capabilities.toString(2), capabilities.has(JSON_NAME));
+        capabilities.has(JSON_NAME), "Missing " + JSON_NAME + " in: \n" + capabilities.toString(2));
     assertTrue(
-        "Missing " + JSON_ATTRIBUTE_TYPE + " in: \n" + capabilities.toString(2),
-        capabilities.has(JSON_ATTRIBUTE_TYPE));
+        capabilities.has(JSON_ATTRIBUTE_TYPE),
+        "Missing " + JSON_ATTRIBUTE_TYPE + " in: \n" + capabilities.toString(2));
   }
 
   @Test
@@ -46,7 +46,7 @@ public void testValidate() {
     Configuration configuration = new Configuration();
     createAttribute().validate(errors, configuration);
 
-    assertTrue(errors.toString(), errors.isEmpty());
+    assertTrue(errors.isEmpty(), errors.toString());
   }
 
   protected abstract Attribute createAttribute();
diff --git a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
index d1cf95a7b..6fc2383f2 100644
--- a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.StringWriter;
 import java.util.HashMap;
@@ -9,7 +8,7 @@
 import java.util.Map;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
@@ -21,11 +20,15 @@ public class AllRegisteredReflectiveAttributeValidationTest extends AbstractMapf
 
   @Autowired List<Attribute> allAttributes;
 
-  @Test(expected = Test.None.class /* no exception expected */)
+  @Test
   public void testAllAttributesHaveLegalValues() {
-    for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
-      attribute.init();
-    }
+    assertDoesNotThrow(() -> {
+      for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
+        attribute.init();
+      }
+
+      // no exception... good
+    });
 
     // no exception... good
   }
diff --git a/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java
index 980df06fa..7edd3363b 100644
--- a/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/BooleanAttributeTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java
index 18a0d2d60..aee17f7d8 100644
--- a/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/DataSourceAttributeTest.java
@@ -1,11 +1,9 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java
index fae960a3e..def3aef07 100644
--- a/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/JsonDatasourceAttributeTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -9,7 +9,7 @@
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.design.JRDesignField;
 import net.sf.jasperreports.json.data.JsonDataSource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
index 7c8ae62fa..f3c974deb 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
@@ -1,9 +1,11 @@
 package org.mapfish.print.attribute;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.List;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
@@ -11,29 +13,34 @@
 import org.mapfish.print.wrapper.json.PJsonObject;
 
 public class ReflectiveAttributeTest {
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testPJsonObjIllegal() {
-    new TestReflectiveAtt(PJsonObjParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(PJsonObjParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testPJsonArrayIllegal() {
-    new TestReflectiveAtt(PJsonArrayParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(PJsonArrayParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testJsonObjIllegal() {
-    new TestReflectiveAtt(JsonObjParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(JsonObjParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testJsonArrayIllegal() {
-    new TestReflectiveAtt(JsonArrayParamIllegal.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(JsonArrayParamIllegal.class).init());
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testEmpty() {
-    new TestReflectiveAtt(Empty.class).init();
+    assertThrows(AssertionFailedException.class, () ->
+      new TestReflectiveAtt(Empty.class).init());
   }
 
   private static class TestReflectiveAtt extends ReflectiveAttribute<Object> {
diff --git a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
index 7ee45f79f..f52e6d39a 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.Dimension;
 import java.io.File;
@@ -9,7 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.ScalebarAttribute.ScalebarAttributeValues;
@@ -42,35 +41,44 @@ public void testCreateValue() {
     assertEquals(new Dimension(300, 120), values.getSize());
   }
 
-  @Test(expected = Test.None.class /* no exception expected */)
+  @Test
   public void testPostConstruct() {
-    ScalebarAttributeValues values = getValues();
-    values.postConstruct();
+    assertDoesNotThrow(() -> {
+      ScalebarAttributeValues values = getValues();
+      values.postConstruct();
+      // passes.. ok
+    });
     // passes.. ok
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testPostConstructInvalidColor() {
-    ScalebarAttributeValues values = getValues();
+    assertThrows(IllegalArgumentException.class, () -> {
+      ScalebarAttributeValues values = getValues();
 
-    values.backgroundColor = "sun-yellow";
-    values.postConstruct();
+      values.backgroundColor = "sun-yellow";
+      values.postConstruct();
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testPostConstructInvalidUnit() {
-    ScalebarAttributeValues values = getValues();
+    assertThrows(IllegalArgumentException.class, () -> {
+      ScalebarAttributeValues values = getValues();
 
-    values.unit = "light-years";
-    values.postConstruct();
+      values.unit = "light-years";
+      values.postConstruct();
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testPostConstructInvalidIntervals() {
-    ScalebarAttributeValues values = getValues();
+    assertThrows(IllegalArgumentException.class, () -> {
+      ScalebarAttributeValues values = getValues();
 
-    values.intervals = 0;
-    values.postConstruct();
+      values.intervals = 0;
+      values.postConstruct();
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java
index fc59e6ce9..bf50fcfb5 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StringArrayAttributeTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.simple.JSONArray;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
index feb9f762f..791e5c3c8 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
@@ -1,11 +1,12 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -44,22 +45,24 @@ public void testParsableByValues() throws Exception {
     assertEquals("a short text", values.getString("field2"));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testParsableByValuesError() throws Exception {
-    final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-    PJsonObject requestData = loadJsonRequestDataError();
+    assertThrows(IllegalArgumentException.class, () -> {
+      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+      PJsonObject requestData = loadJsonRequestDataError();
 
-    Template template = config.getTemplate("main");
-    new Values(
-        new HashMap<>(),
-        requestData,
-        template,
-        config.getDirectory(),
-        httpClientFactory,
-        config.getDirectory(),
-        HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-        HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-        new AtomicBoolean(false));
+      Template template = config.getTemplate("main");
+      new Values(
+          new HashMap<>(),
+          requestData,
+          template,
+          config.getDirectory(),
+          httpClientFactory,
+          config.getDirectory(),
+          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+          new AtomicBoolean(false));
+    });
   }
 
   private PJsonObject loadJsonRequestData() throws IOException {
diff --git a/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java
index ebec0cf1b..471af6c3b 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StyleAttributeTest.java
@@ -1,13 +1,12 @@
 package org.mapfish.print.attribute;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -18,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class StyleAttributeTest extends AbstractMapfishSpringTest {
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private TestHttpClientFactory clientHttpRequestFactory;
 
@@ -35,7 +34,7 @@ public void testAttributesFromJson() throws Exception {
             new HashMap<>(),
             pJsonObject,
             template,
-            this.folder.getRoot(),
+            this.folder,
             this.clientHttpRequestFactory,
             new File("."),
             HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java b/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java
index b434a6893..1326a4feb 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/BBoxMapBoundsTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute.map;
 
 import static org.geotools.referencing.crs.DefaultGeographicCRS.WGS84;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 import static org.mapfish.print.attribute.map.CenterScaleMapBoundsTest.CH1903;
 
@@ -10,7 +10,7 @@
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BBoxMapBoundsTest {
   public static final CoordinateReferenceSystem SPHERICAL_MERCATOR;
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java b/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java
index fb937911d..9dfa3ace0 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/CenterScaleMapBoundsTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.awt.Rectangle;
 import org.geotools.api.referencing.FactoryException;
@@ -9,7 +9,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Test bounds implementation. */
 public class CenterScaleMapBoundsTest {
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java
index 7f4693965..c8f9686fa 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/GenericMapAttributeTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_DEFAULT;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_EMBEDDED_TYPE;
 import static org.mapfish.print.attribute.ReflectiveAttribute.JSON_ATTRIBUTE_IS_ARRAY;
@@ -16,7 +14,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.ReflectiveAttribute;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.parser.MapfishParser;
@@ -46,10 +44,10 @@ public void testPrintClientConfig() {
 
     assertEquals(mapAttName, json.getString(ReflectiveAttribute.JSON_NAME));
     assertTrue(json.has(JSON_CLIENT_PARAMS));
-    assertTrue(json.toString(2), json.has(JSON_CLIENT_INFO));
+    assertTrue(json.has(JSON_CLIENT_INFO), json.toString(2));
 
     final JSONObject required = json.getJSONObject(JSON_CLIENT_PARAMS);
-    assertEquals(required.toString(2), 16, required.length());
+    assertEquals(16, required.length(), required.toString(2));
 
     assertElem(required, "requiredElem", "int", null, false);
     assertElem(required, "pArray", "array", null, false);
@@ -121,9 +119,9 @@ private void assertElem(
     final JSONObject elem = required.getJSONObject(elemName);
     assertEquals(type, elem.getString(JSON_ATTRIBUTE_TYPE));
     if (defaultVal != null) {
-      assertEquals(required.toString(2), defaultVal, elem.get(JSON_ATTRIBUTE_DEFAULT).toString());
+      assertEquals(defaultVal, elem.get(JSON_ATTRIBUTE_DEFAULT).toString(), required.toString(2));
     } else {
-      assertFalse(required.toString(2), elem.has(JSON_ATTRIBUTE_DEFAULT));
+      assertFalse(elem.has(JSON_ATTRIBUTE_DEFAULT), required.toString(2));
     }
     if (isArray) {
       assertTrue(elem.getBoolean(JSON_ATTRIBUTE_IS_ARRAY));
@@ -146,7 +144,7 @@ private void assertEmbedded(JSONObject required, boolean hasDefault, String attN
         embedded.get(JSON_ATTRIBUTE_TYPE));
     final JSONObject typeDescriptor = embedded.getJSONObject(JSON_ATTRIBUTE_EMBEDDED_TYPE);
     assertTrue(typeDescriptor.has("embeddedElem"));
-    assertEquals(typeDescriptor.toString(2), 1, typeDescriptor.length());
+    assertEquals(1, typeDescriptor.length(), typeDescriptor.toString(2));
     assertElem(typeDescriptor, "embeddedElem", "boolean", null, false);
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
index 694c0162d..6f20799ec 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
@@ -1,11 +1,6 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.processor.map.CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR;
 import static org.mapfish.print.processor.map.CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.loadJsonRequestData;
 
@@ -17,8 +12,8 @@
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.ReflectiveAttribute;
@@ -37,30 +32,32 @@ public class MapAttributeTest extends AbstractMapfishSpringTest {
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private TestHttpClientFactory httpRequestFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.configurationFactory.setDoValidation(false);
   }
 
   @SuppressWarnings("unchecked")
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testMaxDpi() throws Exception {
-    final File configFile =
-        getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
-    final Configuration config = configurationFactory.getConfig(configFile);
-    final Template template = config.getTemplate("main");
-
-    final PJsonObject pJsonObject = loadJsonRequestData();
-    final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
-    final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
-    map.remove("dpi");
-    map.accumulate("dpi", 1000);
-
-    final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
-        (ReflectiveAttribute<MapAttribute.MapAttributeValues>) template.getAttributes().get("map");
-
-    final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
-    MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final File configFile =
+          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
+      final Configuration config = configurationFactory.getConfig(configFile);
+      final Template template = config.getTemplate("main");
+
+      final PJsonObject pJsonObject = loadJsonRequestData();
+      final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
+      final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
+      map.remove("dpi");
+      map.accumulate("dpi", 1000);
+
+      final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
+          (ReflectiveAttribute<MapAttribute.MapAttributeValues>) template.getAttributes().get("map");
+
+      final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
+      MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java
index a95c3131f..701c6c139 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/OverviewMapAttributeTest.java
@@ -1,16 +1,14 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -25,7 +23,7 @@ public class OverviewMapAttributeTest extends AbstractMapfishSpringTest {
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private TestHttpClientFactory httpRequestFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.configurationFactory.setDoValidation(false);
   }
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java b/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java
index 68872a701..f68a789f2 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/ScaleAdjustmentAccuracyTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.CLOSEST_HIGHER_SCALE_ON_TIE;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.CLOSEST_LOWER_SCALE_ON_TIE;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.HIGHER_SCALE;
 import static org.mapfish.print.attribute.map.ZoomLevelSnapStrategy.LOWER_SCALE;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.map.DistanceUnit;
 import org.mapfish.print.map.Scale;
 
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java b/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java
index 358bf3921..d8cd1e1ca 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/ZoomLevelsTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.attribute.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.map.DistanceUnit;
 
 public class ZoomLevelsTest {
diff --git a/core/src/test/java/org/mapfish/print/cli/MainTest.java b/core/src/test/java/org/mapfish/print/cli/MainTest.java
index 3c5a81346..4f1843e35 100644
--- a/core/src/test/java/org/mapfish/print/cli/MainTest.java
+++ b/core/src/test/java/org/mapfish/print/cli/MainTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.cli;
 
 import java.io.File;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.test.util.ImageSimilarity;
 
@@ -12,7 +12,7 @@ public class MainTest {
   private File configFile;
   private File v3ApiRequestFile;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     this.outputFile = File.createTempFile("main-test", ".png");
     this.configFile = getFile("config.yaml");
diff --git a/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java
index c933237a5..e4c29472b 100644
--- a/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/AttributeWithConfigurationInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import org.mapfish.print.attribute.PrimitiveAttribute;
 
diff --git a/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java
index f22cd5621..e6c06d7ce 100644
--- a/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/AttributeWithSpringInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.codahale.metrics.MetricRegistry;
 import org.mapfish.print.attribute.PrimitiveAttribute;
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
index c2fe48268..7bd6aa253 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
@@ -1,9 +1,10 @@
 package org.mapfish.print.config;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mapfish.print.AbstractMapfishSpringTest.DEFAULT_SPRING_XML;
 
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -14,16 +15,18 @@ public class ConfigurationFactoryAllConfigObjectMustBePrototypeTest {
   public static final String TEST_SPRING_XML =
       "classpath:org/mapfish/print/config/config-test-no-prototype-application-context.xml";
 
-  @Test(expected = BeanCreationException.class)
+  @Test
   public void testAll() throws Exception {
-    ClassPathXmlApplicationContext applicationContext =
-        new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
-    ConfigurationFactory configurationFactory =
-        applicationContext.getBean(ConfigurationFactory.class);
-    File configFile =
-        AbstractMapfishSpringTest.getFile(
-            ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
-            "configRequiringSpringInjection.yaml");
-    configurationFactory.getConfig(configFile);
+    assertThrows(BeanCreationException.class, () -> {
+      ClassPathXmlApplicationContext applicationContext =
+          new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
+      ConfigurationFactory configurationFactory =
+          applicationContext.getBean(ConfigurationFactory.class);
+      File configFile =
+          AbstractMapfishSpringTest.getFile(
+              ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
+              "configRequiringSpringInjection.yaml");
+      configurationFactory.getConfig(configFile);
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
index ff6eec131..b12d104e7 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.util.concurrent.Callable;
@@ -10,8 +8,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.Attribute;
 import org.mapfish.print.processor.Processor;
@@ -27,7 +25,7 @@ public class ConfigurationFactoryTest extends AbstractMapfishSpringTest {
       "classpath:org/mapfish/print/config/config-test-application-context.xml";
   @Autowired private ConfigurationFactory configurationFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     this.configurationFactory.setDoValidation(false);
   }
@@ -51,7 +49,7 @@ public void testSpringInjection() throws Exception {
     assertEquals(1, template.getProcessorGraph().getAllProcessors().size());
     assertEquals(1, template.getProcessorGraph().getRoots().size());
     Processor<?, ?> processor = template.getProcessorGraph().getRoots().getFirst().getProcessor();
-    assertTrue(processor.toString(), processor instanceof ProcessorWithSpringInjection);
+    assertTrue(processor instanceof ProcessorWithSpringInjection, processor.toString());
     ((ProcessorWithSpringInjection) processor).assertInjected();
   }
 
@@ -91,8 +89,8 @@ public void testParallelConfigLoading() throws Exception {
     boolean thread1Result = thread1Futur.get();
     boolean thread2Result = thread2Futur.get();
 
-    assertTrue("thread 1 configuration loading was not OK", thread1Result);
-    assertTrue("thread 2 configuration loading was not OK", thread2Result);
+    assertTrue(thread1Result, "thread 1 configuration loading was not OK");
+    assertTrue(thread2Result, "thread 2 configuration loading was not OK");
 
     executor.shutdown();
   }
@@ -120,17 +118,21 @@ public void testConfigurationInjection() throws Exception {
     ((ProcessorWithConfigurationInjection) processor).assertInjected();
   }
 
-  @Test(expected = ConstructorException.class)
+  @Test
   public void testConfigurationAttributeMustImplementAttribute() throws Exception {
-    File configFile =
-        getFile(ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
-    configurationFactory.getConfig(configFile);
+    assertThrows(ConstructorException.class, () -> {
+      File configFile =
+          getFile(ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
+      configurationFactory.getConfig(configFile);
+    });
   }
 
-  @Test(expected = ConstructorException.class)
+  @Test
   public void testConfigurationProcessorMustImplementProcessor() throws Exception {
-    File configFile =
-        getFile(ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
-    configurationFactory.getConfig(configFile);
+    assertThrows(ConstructorException.class, () -> {
+      File configFile =
+          getFile(ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
+      configurationFactory.getConfig(configFile);
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
index 33518ea39..093cc5d9f 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
@@ -1,12 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.StringWriter;
 import java.util.Arrays;
@@ -27,8 +21,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mockito.Mockito;
@@ -42,7 +36,7 @@
 /** Tests for {@link org.mapfish.print.config.Configuration} class. */
 public class ConfigurationTest {
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
@@ -334,7 +328,7 @@ private void assertStyleType(Class<?> expectedSymbolizerType, Style style) {
     final Rule rule = featureTypeStyle.rules().getFirst();
     final Class<? extends Symbolizer> symbClass = rule.symbolizers().getFirst().getClass();
     assertTrue(
-        "Expected: " + expectedSymbolizerType.getName() + " but was: " + symbClass,
-        expectedSymbolizerType.isAssignableFrom(symbClass));
+        expectedSymbolizerType.isAssignableFrom(symbClass),
+        "Expected: " + expectedSymbolizerType.getName() + " but was: " + symbClass);
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java b/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java
index dda70c41e..e485df00a 100644
--- a/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/config/CustomFontLoaderTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
@@ -8,7 +8,7 @@
 import java.util.Map;
 import net.sf.jasperreports.engine.JasperPrint;
 import org.apache.commons.lang3.ArrayUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.output.AbstractJasperReportOutputFormat;
 import org.mapfish.print.output.OutputFormat;
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
index 55f43f9be..9e4439be4 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 import javax.annotation.Nullable;
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
index ff5a545d6..2faf7f115 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.List;
diff --git a/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java b/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java
index 3dbc64bf6..5aef1ebd2 100644
--- a/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java
+++ b/core/src/test/java/org/mapfish/print/config/WorkingDirectoriesTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.config;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java b/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java
index 36b8e8632..2c26ed73d 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AccessAssertionPersisterTest.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.config.access;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.List;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java
index 04f8d5385..50635bc90 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AlwaysAllowAssertionTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.config.access;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AlwaysAllowAssertionTest {
 
diff --git a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
index d073c8ef4..238bbfb00 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
@@ -1,10 +1,11 @@
 package org.mapfish.print.config.access;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Collections;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -15,30 +16,34 @@ public class AndAccessAssertionTest extends AbstractMapfishSpringTest {
 
   @Autowired ApplicationContext applicationContext;
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
 
-  @Test(expected = AssertionError.class)
+  @Test
   public void testSetPredicates() {
+    assertThrows(AssertionError.class, () -> {
 
-    final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-    andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
-    andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
+      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
+      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
+      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
+    });
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testAssertAccessNotAllowed() {
-    final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-    AccessAssertion pred1 =
-        new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
-    AccessAssertion pred2 =
-        new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
-    andAssertion.setPredicates(pred1, pred2);
+    assertThrows(AccessDeniedException.class, () -> {
+      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
+      AccessAssertion pred1 =
+          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
+      AccessAssertion pred2 =
+          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
+      andAssertion.setPredicates(pred1, pred2);
 
-    AccessAssertionTestUtil.setCreds("ROLE_USER");
-    andAssertion.assertAccess("", this);
+      AccessAssertionTestUtil.setCreds("ROLE_USER");
+      andAssertion.assertAccess("", this);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
index d2403ba6b..294a83e04 100644
--- a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.config.access;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mapfish.print.config.access.AccessAssertionTestUtil.setCreds;
 
 import java.util.ArrayList;
@@ -8,8 +9,8 @@
 import java.util.HashSet;
 import java.util.List;
 import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.SetsUtils;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
@@ -17,33 +18,39 @@
 
 public class RoleAccessAssertionTest {
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
 
-  @Test(expected = AssertionError.class)
+  @Test
   public void testSetRequiredRoles() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    assertThrows(AssertionError.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    });
   }
 
-  @Test(expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
   public void testAssertAccessNoCredentials() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
 
-    assertion.assertAccess("", this);
+      assertion.assertAccess("", this);
+    });
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testAssertAccessWrongCreds() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+    assertThrows(AccessDeniedException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
 
-    setCreds("ROLE_USER2");
-    assertion.assertAccess("", this);
+      setCreds("ROLE_USER2");
+      assertion.assertAccess("", this);
+    });
   }
 
   @Test
@@ -73,23 +80,27 @@ public void testAssertAccessOneOf() {
     assertion.assertAccess("", this);
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testAssertAccessOneOfFailed() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
+    assertThrows(AccessDeniedException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
 
-    setCreds("ROLE_OTHER");
-    assertion.assertAccess("", this);
+      setCreds("ROLE_OTHER");
+      assertion.assertAccess("", this);
+    });
   }
 
-  @Test(expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
   public void testAssertNoRolesNoCreds() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(new HashSet<>());
-
-    assertion.assertAccess("", this);
-    setCreds("ROLE_OTHER", "ROLE_USER2");
-    assertion.assertAccess("", this);
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(new HashSet<>());
+
+      assertion.assertAccess("", this);
+      setCreds("ROLE_OTHER", "ROLE_USER2");
+      assertion.assertAccess("", this);
+    });
   }
 
   @Test
@@ -104,27 +115,31 @@ public void testAssertNoRolesSomeCreds() {
     assertion.assertAccess("", this);
   }
 
-  @Test(expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
   public void testMarshalUnmarshalNoAuth() {
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    final JSONObject marshalData = assertion.marshal();
-
-    RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-    newAssertion.unmarshal(marshalData);
-    newAssertion.assertAccess("", this);
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+      final JSONObject marshalData = assertion.marshal();
+
+      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+      newAssertion.unmarshal(marshalData);
+      newAssertion.assertAccess("", this);
+    });
   }
 
-  @Test(expected = AccessDeniedException.class)
+  @Test
   public void testMarshalUnmarshalNotPermitted() {
-    setCreds("ROLE_OTHER");
-    final RoleAccessAssertion assertion = new RoleAccessAssertion();
-    assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    final JSONObject marshalData = assertion.marshal();
-
-    RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-    newAssertion.unmarshal(marshalData);
-    newAssertion.assertAccess("", this);
+    assertThrows(AccessDeniedException.class, () -> {
+      setCreds("ROLE_OTHER");
+      final RoleAccessAssertion assertion = new RoleAccessAssertion();
+      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+      final JSONObject marshalData = assertion.marshal();
+
+      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+      newAssertion.unmarshal(marshalData);
+      newAssertion.assertAccess("", this);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
index bb99cd18b..7daaf50c6 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,8 +9,8 @@
 import java.nio.file.Files;
 import java.util.HashMap;
 import org.apache.commons.io.IOUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.IllegalFileAccessException;
@@ -41,7 +41,7 @@ public class ConfigFileResolvingHttpRequestFactoryTest extends AbstractMapfishSp
 
   private ConfigFileResolvingHttpRequestFactory resolvingFactory;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     requestFactory.registerHandler(input -> true, createFileHandler(URI::getPath));
 
@@ -147,12 +147,14 @@ public void testCreateRequestRelativeFileToConfig() throws Exception {
     assertEquals(expected, actual);
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testCreateRequestIllegalFile() throws Exception {
-    final URI uri = logbackXml.toURI();
-    final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI uri = logbackXml.toURI();
+      final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
 
-    request.execute();
+      request.execute();
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
index cff48acf3..9ba1f2711 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -9,7 +9,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.PrintException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java b/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java
index 7e23bdb34..f8f841117 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpConfigurationTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index b05488860..db091347c 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.sun.net.httpserver.HttpsServer;
 import java.util.ArrayList;
@@ -10,9 +8,9 @@
 import java.util.List;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
@@ -38,12 +36,12 @@ public class HttpCredentialTest {
   @Autowired ConfigurationFactory configurationFactory;
   @Autowired private MfClientHttpRequestFactoryImpl requestFactory;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     httpsServer = HttpProxyTest.createHttpsServer(HTTPS_PROXY_PORT);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     httpsServer.stop(0);
   }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index 03531ff38..f4e6ce304 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.AbstractMapfishSpringTest.HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS;
 import static org.mapfish.print.AbstractMapfishSpringTest.HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY;
 
@@ -29,9 +29,9 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManagerFactory;
 import org.apache.commons.io.IOUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
@@ -66,7 +66,7 @@ public class HttpProxyTest {
   @Autowired ConfigurationFactory configurationFactory;
   @Autowired private MfClientHttpRequestFactoryImpl requestFactory;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     proxyServer = HttpServer.create(new InetSocketAddress(LOCALHOST, PROXY_PORT), 0);
     proxyServer.start();
@@ -77,7 +77,7 @@ public static void setUp() throws Exception {
     httpsServer = createHttpsServer(HTTPS_PROXY_PORT);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     proxyServer.stop(0);
     targetServer.stop(0);
@@ -121,7 +121,7 @@ static void assertCorrectResponse(
     final ClientHttpResponse response = request.execute();
 
     final String message = IOUtils.toString(response.getBody(), Constants.DEFAULT_ENCODING);
-    assertEquals(message, HttpStatus.OK, response.getStatusCode());
+    assertEquals(HttpStatus.OK, response.getStatusCode(), message);
 
     assertEquals(expected, message);
   }
diff --git a/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java b/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java
index dc90f3407..85f9d19e1 100644
--- a/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java
+++ b/core/src/test/java/org/mapfish/print/http/MfClientHttpRequestFactoryImplTest.java
@@ -1,14 +1,14 @@
 package org.mapfish.print.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpServer;
 import java.net.InetSocketAddress;
 import java.net.URI;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpResponse;
 
@@ -16,14 +16,14 @@ public class MfClientHttpRequestFactoryImplTest {
   private static final int TARGET_PORT = 33212;
   private static HttpServer targetServer;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() throws Exception {
     targetServer =
         HttpServer.create(new InetSocketAddress(HttpProxyTest.LOCALHOST, TARGET_PORT), 0);
     targetServer.start();
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     targetServer.stop(0);
   }
diff --git a/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java b/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java
index 0a9664a3f..a3d88562e 100644
--- a/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java
+++ b/core/src/test/java/org/mapfish/print/map/DistanceUnitTest.java
@@ -1,11 +1,8 @@
 package org.mapfish.print.map;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DistanceUnitTest {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/ScaleTest.java b/core/src/test/java/org/mapfish/print/map/ScaleTest.java
index 838c22ae6..e3b997211 100644
--- a/core/src/test/java/org/mapfish/print/map/ScaleTest.java
+++ b/core/src/test/java/org/mapfish/print/map/ScaleTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 
 public class ScaleTest {
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java b/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java
index 51d5f4d0e..bb85bf208 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/FeaturesParserTest.java
@@ -1,10 +1,6 @@
 package org.mapfish.print.map.geotools;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
@@ -18,7 +14,7 @@
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.crs.DefaultEngineeringCRS;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.TestHttpClientFactory;
@@ -232,7 +228,7 @@ public void testTreatStringAsGeoJson() throws Exception {
             java.nio.file.Files.readString(geojsonExample.toPath(), Constants.DEFAULT_CHARSET);
         final SimpleFeatureCollection simpleFeatureCollection =
             featuresParser.treatStringAsGeoJson(geojson);
-        assertEquals(geojsonExample.getName(), numFeatures, simpleFeatureCollection.size());
+        assertEquals(numFeatures, simpleFeatureCollection.size(), geojsonExample.getName());
       } catch (RuntimeException t) {
         throw new RuntimeException(
             "Exception raised when processing: " + geojsonExample.getName() + "\n" + t.getMessage(),
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
index 197f45d81..0af9af867 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.map.geotools;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.processor.map.CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR;
 
 import java.io.File;
@@ -11,7 +10,7 @@
 import org.geotools.api.data.Query;
 import org.geotools.map.FeatureLayer;
 import org.geotools.map.Layer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.TestHttpClientFactory;
@@ -69,66 +68,72 @@ public void testGeoJsonEmbedded() throws Exception {
     assertEquals(RenderType.SVG, layer.getRenderType());
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    final File file =
-        getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-    final PJsonObject requestData =
-        parseJSONObjectFromString(
-            "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
-
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-    configuration.setFileLoaderManager(this.fileLoaderManager);
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-    MapfishParserTest.populateLayerParam(requestData, param, "type");
-    geojsonLayerParser
-        .parse(template, param)
-        .getLayers(
-            httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final File file =
+          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+      final PJsonObject requestData =
+          parseJSONObjectFromString(
+              "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
+
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+      configuration.setFileLoaderManager(this.fileLoaderManager);
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+      MapfishParserTest.populateLayerParam(requestData, param, "type");
+      geojsonLayerParser
+          .parse(template, param)
+          .getLayers(
+              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-    configuration.setFileLoaderManager(this.fileLoaderManager);
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-    param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
-    geojsonLayerParser
-        .parse(template, param)
-        .getLayers(
-            httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+      configuration.setFileLoaderManager(this.fileLoaderManager);
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+      param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
+      geojsonLayerParser
+          .parse(template, param)
+          .getLayers(
+              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    });
   }
 
-  @Test(expected = Exception.class)
+  @Test
   public void testGeoNotUrlNotGeoJson() {
-    final File file =
-        getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-    final PJsonObject requestData =
-        parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
-
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(file);
-    configuration.setFileLoaderManager(this.fileLoaderManager);
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-    MapfishParserTest.populateLayerParam(requestData, param, "type");
-    geojsonLayerParser
-        .parse(template, param)
-        .getLayers(
-            httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    assertThrows(Exception.class, () -> {
+      final File file =
+          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+      final PJsonObject requestData =
+          parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
+
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(file);
+      configuration.setFileLoaderManager(this.fileLoaderManager);
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+      MapfishParserTest.populateLayerParam(requestData, param, "type");
+      geojsonLayerParser
+          .parse(template, param)
+          .getLayers(
+              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
index 1e42e4f4c..c82f9df40 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
@@ -1,7 +1,9 @@
 package org.mapfish.print.map.geotools;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.io.File;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.config.Configuration;
@@ -11,34 +13,38 @@
 
 public class GeotiffLayerFactoryPluginTest {
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    final File file =
-        AbstractMapfishSpringTest.getFile(
-            CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
-            CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR + "sampleGeoTiff.tif");
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-    param.url = file.toURI().toURL().toString();
-    new GeotiffLayer.Plugin().parse(template, param);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final File file =
+          AbstractMapfishSpringTest.getFile(
+              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
+              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR + "sampleGeoTiff.tif");
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+      param.url = file.toURI().toURL().toString();
+      new GeotiffLayer.Plugin().parse(template, param);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    final Configuration configuration = new Configuration();
-    configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-    Template template = new Template();
-    template.setConfiguration(configuration);
-
-    GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-    param.url =
-        "file://../" + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR + "/geojson.json";
-    new GeotiffLayer.Plugin().parse(template, param);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final Configuration configuration = new Configuration();
+      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+      Template template = new Template();
+      template.setConfiguration(configuration);
+
+      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+      param.url =
+          "file://../" + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR + "/geojson.json";
+      new GeotiffLayer.Plugin().parse(template, param);
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java b/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java
index 8efdc137f..16da66043 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/grid/GridUtilsTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map.geotools.grid;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import si.uom.NonSI;
 
 public class GridUtilsTest {
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java b/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java
index af1603c33..55658c38b 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/grid/LineGridStrategyTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.awt.Dimension;
 import java.util.HashMap;
@@ -14,7 +14,7 @@
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.map.Layer;
 import org.geotools.referencing.crs.DefaultEngineeringCRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.LineString;
 import org.mapfish.print.TestHttpClientFactory;
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java b/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java
index 043c55eae..adabff503 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/grid/PointGridStrategyTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.awt.Dimension;
 import java.util.Arrays;
@@ -10,7 +10,7 @@
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.referencing.crs.DefaultEngineeringCRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Point;
 import org.mapfish.print.AbstractMapfishSpringTest;
@@ -62,10 +62,10 @@ public void testNumLines() throws Exception {
       while (features.hasNext()) {
         SimpleFeature next = features.next();
         assertTrue(
-            next.getDefaultGeometry().getClass().getName(),
-            next.getDefaultGeometry() instanceof Point);
+            next.getDefaultGeometry() instanceof Point,
+            next.getDefaultGeometry().getClass().getName());
         Coordinate coord = ((Point) next.getDefaultGeometry()).getCoordinate();
-        assertTrue(coord + " is not one of the expected points", expectedPoints.contains(coord));
+        assertTrue(expectedPoints.contains(coord), coord + " is not one of the expected points");
       }
     }
   }
@@ -113,10 +113,10 @@ public void testParseSpacingAndOrigin() throws Exception {
       while (features.hasNext()) {
         SimpleFeature next = features.next();
         assertTrue(
-            next.getDefaultGeometry().getClass().getName(),
-            next.getDefaultGeometry() instanceof Point);
+            next.getDefaultGeometry() instanceof Point,
+            next.getDefaultGeometry().getClass().getName());
         Coordinate coord = ((Point) next.getDefaultGeometry()).getCoordinate();
-        assertTrue(coord + " is not one of the expected points", expectedPoints.contains(coord));
+        assertTrue(expectedPoints.contains(coord), coord + " is not one of the expected points");
       }
       assertEquals(expectedPoints.size(), featureSource.getFeatures().size());
     }
diff --git a/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java b/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java
index a2bcd0b0e..4897a995b 100644
--- a/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/image/AbstractSingleImageLayerTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map.image;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.codahale.metrics.MetricRegistry;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.Constants;
 import org.mapfish.print.attribute.map.MapfishMapContext;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
@@ -30,7 +30,7 @@ public void testFetchImage() throws IOException {
 
     try {
       layer.fetchImage(mockClientHttpRequest, mapContext);
-      Assert.fail("Did not throw exception with unsupported status code");
+      Assertions.fail("Did not throw exception with unsupported status code");
     } catch (RuntimeException e) {
       assertTrue(e.getMessage().contains(String.valueOf(unsupportedStatusCode)));
     }
diff --git a/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java b/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java
index 711f04ead..08ea8768c 100644
--- a/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java
+++ b/core/src/test/java/org/mapfish/print/map/image/wms/WmsUtilitiesTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print.map.image.wms;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.google.common.collect.Multimap;
 import java.awt.Dimension;
@@ -12,7 +9,7 @@
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.URIUtils;
 import org.mapfish.print.map.image.wms.WmsLayerParam.ServerType;
 import org.mapfish.print.wrapper.json.PJsonObject;
diff --git a/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java b/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java
index f2b0afaf2..52bd0f838 100644
--- a/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/FileSLDParserPluginTest.java
@@ -1,15 +1,13 @@
 package org.mapfish.print.map.style;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Optional;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.Assert;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.AbstractMapfishSpringTest;
diff --git a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
index 8cac6572b..36be930ec 100644
--- a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.map.style;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -14,7 +12,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpRequest;
diff --git a/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java b/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java
index 0c7352141..ce8ceccf5 100644
--- a/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/URLSLDParserPluginTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.map.style;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Optional;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java b/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java
index 53bbdad49..e94fb7785 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/ColorParserTest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Color;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ColorParserTest {
 
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java b/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java
index 08eda89b4..efaaaaa52 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/JsonStyleParserHelperTest.java
@@ -1,10 +1,6 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.map.style.json.MapfishStyleParserPluginTest.REQUEST_DATA_STYLE_JSON_V1_STYLE_JSON;
 
 import java.io.File;
@@ -38,8 +34,8 @@
 import org.geotools.xml.styling.SLDTransformer;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.Constants;
 import org.mapfish.print.MapPrinter;
 import org.mapfish.print.TestHttpClientFactory;
@@ -77,7 +73,7 @@ static void assertFill(double fillOpacity, String fillColor, Fill fill) {
     assertEquals(fillOpacity, valueOf(fill.getOpacity()));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     Configuration configuration = new Configuration();
     final File file =
@@ -561,10 +557,10 @@ public void testSomeDefaultPointSymbolizer() {
     Mark mark = (Mark) graphic.graphicalSymbols().getFirst();
     Stroke stroke = mark.getStroke();
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         new float[] {5f, 4f},
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
   }
 
   @Test
@@ -593,10 +589,10 @@ public void testSomeDefaultLineSymbolizer() {
 
     final Stroke stroke = lineSymbolizer.getStroke();
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         new float[] {5f, 4f},
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
   }
 
   @Test
@@ -626,10 +622,10 @@ public void testSomeDefaultPolygonSymbolizer() {
 
     final Stroke stroke = polygonSymbolizer.getStroke();
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         new float[] {5f, 4f},
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
 
     assertNotNull(polygonSymbolizer.getFill());
   }
@@ -682,7 +678,7 @@ public void testGetGraphicFormatDetect() {
         styleJson.getInternalObj().put(JsonStyleParserHelper.JSON_GRAPHIC_FORMAT, mimeType);
         final String graphicFormat =
             helper.getGraphicFormat("http://somefile.com/file.jpeg", styleJson);
-        assertTrue(graphicFormat + " is not supported", strings.contains(graphicFormat));
+        assertTrue(strings.contains(graphicFormat), graphicFormat + " is not supported");
       }
     }
   }
@@ -698,10 +694,10 @@ public void testGetGraphicFormatDetect2() {
           continue;
         }
         final String gf1 = helper.getGraphicFormat("data:" + mimeType + ",blabla", styleJson);
-        assertTrue(gf1 + " is not supported", strings.contains(gf1));
+        assertTrue(strings.contains(gf1), gf1 + " is not supported");
         final String gf2 =
             helper.getGraphicFormat("data:" + mimeType + ";base64,blabla", styleJson);
-        assertTrue(gf2 + " is not supported", strings.contains(gf2));
+        assertTrue(strings.contains(gf2), gf2 + " is not supported");
       }
     }
   }
@@ -815,9 +811,9 @@ private void assertDashStyle(String dashStyle, float[] expectedDashArray) throws
     final Stroke stroke = helper.createStroke(pStyle, false);
     assertNotNull(stroke);
     assertArrayEquals(
-        Arrays.toString(stroke.getDashArray()),
         expectedDashArray,
         stroke.getDashArray(),
-        FLOAT_DELTA);
+        FLOAT_DELTA,
+        Arrays.toString(stroke.getDashArray()));
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java
index b95f734c7..ee7f15017 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonFileResolverTest.java
@@ -1,14 +1,14 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Optional;
 import org.geotools.api.style.Style;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java
index 93ead6f04..0bff86b83 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2Test.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MapfishJsonStyleVersion2Test {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java b/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java
index 0e647fa58..f12357588 100644
--- a/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/json/MapfishStyleParserPluginTest.java
@@ -1,10 +1,6 @@
 package org.mapfish.print.map.style.json;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.AbstractMapfishSpringTest.parseJSONObjectFromFile;
 import static org.mapfish.print.map.style.json.JsonStyleParserHelperTest.valueOf;
 
@@ -37,7 +33,7 @@
 import org.geotools.filter.text.ecql.ECQL;
 import org.geotools.styling.AbstractStyleVisitor;
 import org.geotools.xml.styling.SLDTransformer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryCollection;
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java b/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java
index 3b8fff633..304f94a3e 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/AbstractWMXLayerParamsTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.Multimap;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 
 /** Test param methods. */
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
index f07d3ab50..dc2483cef 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.map.tiled;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -16,7 +14,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.Processor;
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java
index d79f9dec2..592a9e49e 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerParamTest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.tiled.osm;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OsmLayerParamTest {
 
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java
index 2fb8f9da5..49f9651bf 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/osm/OsmLayerTest.java
@@ -1,14 +1,15 @@
 package org.mapfish.print.map.tiled.osm;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.codahale.metrics.MetricRegistry;
 import java.awt.Rectangle;
 import java.util.concurrent.ForkJoinPool;
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.map.MapBounds;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.map.Scale;
@@ -20,7 +21,7 @@
 public class OsmLayerTest {
   @Mock private StyleSupplier<GridCoverage2D> styleSupplier;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     MockitoAnnotations.openMocks(this);
   }
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java
index a4c8e9a71..80b75f67b 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerParamTest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.tiled.wmts;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class WMTSLayerParamTest {
 
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java
index 71db3d624..8f8eae25d 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/wmts/WMTSLayerTest.java
@@ -1,13 +1,11 @@
 package org.mapfish.print.map.tiled.wmts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.Rectangle;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.map.CenterScaleMapBounds;
 import org.mapfish.print.attribute.map.MapBounds;
 import org.mapfish.print.config.Configuration;
@@ -34,17 +32,17 @@ public void testTileBoundsCalculation() throws Exception {
     ReferencedEnvelope tileBounds = tileInformation.getTileBounds();
 
     assertEquals(420000, tileBounds.getMinX(), 0.00001);
-    assertFalse("" + tileBounds.getMinX(), Double.isInfinite(tileBounds.getMinX()));
-    assertFalse("" + tileBounds.getMinX(), Double.isNaN(tileBounds.getMinX()));
-    assertTrue("" + tileBounds.getMinY(), tileBounds.getMinY() < 350000);
-    assertFalse("" + tileBounds.getMinY(), Double.isInfinite(tileBounds.getMinY()));
-    assertFalse("" + tileBounds.getMinY(), Double.isNaN(tileBounds.getMinY()));
-    assertTrue("" + tileBounds.getMaxX(), tileBounds.getMaxX() > 420000);
-    assertFalse("" + tileBounds.getMaxX(), Double.isInfinite(tileBounds.getMaxX()));
-    assertFalse("" + tileBounds.getMaxX(), Double.isNaN(tileBounds.getMaxX()));
+    assertFalse(Double.isInfinite(tileBounds.getMinX()), "" + tileBounds.getMinX());
+    assertFalse(Double.isNaN(tileBounds.getMinX()), "" + tileBounds.getMinX());
+    assertTrue(tileBounds.getMinY() < 350000, "" + tileBounds.getMinY());
+    assertFalse(Double.isInfinite(tileBounds.getMinY()), "" + tileBounds.getMinY());
+    assertFalse(Double.isNaN(tileBounds.getMinY()), "" + tileBounds.getMinY());
+    assertTrue(tileBounds.getMaxX() > 420000, "" + tileBounds.getMaxX());
+    assertFalse(Double.isInfinite(tileBounds.getMaxX()), "" + tileBounds.getMaxX());
+    assertFalse(Double.isNaN(tileBounds.getMaxX()), "" + tileBounds.getMaxX());
     assertEquals(350000, tileBounds.getMaxY(), 0.00001);
-    assertFalse("" + tileBounds.getMaxY(), Double.isInfinite(tileBounds.getMaxY()));
-    assertFalse("" + tileBounds.getMaxY(), Double.isNaN(tileBounds.getMaxY()));
+    assertFalse(Double.isInfinite(tileBounds.getMaxY()), "" + tileBounds.getMaxY());
+    assertFalse(Double.isNaN(tileBounds.getMaxY()), "" + tileBounds.getMaxY());
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
index d638bc865..0662ff45c 100644
--- a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
+++ b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
@@ -8,8 +8,8 @@
 
 import com.codahale.metrics.health.HealthCheck;
 import java.util.Date;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.servlet.job.JobQueue;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
@@ -26,7 +26,7 @@ public class JobQueueHealthCheckTest extends AbstractMapfishSpringTest {
 
   @Autowired @InjectMocks private JobQueueHealthCheck jobQueueHealthCheck;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     // Initialize mocks created above
     MockitoAnnotations.openMocks(this);
@@ -50,10 +50,9 @@ public void testCheck_Failed_NoPrintJobs() {
     RuntimeException rte =
         assertThrowsExactly(
             RuntimeException.class,
-            () -> {
+            () ->
               // WHEN
-              jobQueueHealthCheck.check();
-            });
+              jobQueueHealthCheck.check());
 
     assertEquals(
         "None of the print job queued was processed by this server, in the last (seconds): 300",
diff --git a/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java b/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java
index 2f78f517a..86944f3ca 100644
--- a/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java
+++ b/core/src/test/java/org/mapfish/print/metrics/UnhealthyCountersHealthCheckTest.java
@@ -9,8 +9,8 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.health.HealthCheck;
 import java.util.TreeSet;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -22,7 +22,7 @@ public class UnhealthyCountersHealthCheckTest extends AbstractMapfishSpringTest
 
   @Autowired @InjectMocks private UnhealthyCountersHealthCheck unhealthyCountersHealthCheck;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     // Initialize mocks created above
     MockitoAnnotations.openMocks(this);
diff --git a/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java
index e752ed4b7..5a076fd98 100644
--- a/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/AbstractJasperReportOutputFormatTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.ExtraPropertyException;
@@ -54,7 +54,7 @@ public void testParameterValidation_WrongType() throws Exception {
       fail("Expected a " + AssertionFailedException.class);
     } catch (AssertionFailedException e) {
       assertTrue(
-          e.getMessage(), e.getMessage().contains("does not match the class of the actual object"));
+          e.getMessage().contains("does not match the class of the actual object"), e.getMessage());
     }
   }
 
@@ -78,8 +78,8 @@ public void testParameterValidation_MissingParameter() throws Exception {
       fail("Expected a " + ExtraPropertyException.class);
     } catch (ExtraPropertyException e) {
       assertTrue(
-          e.getMessage(),
-          e.getMessage().contains("Extra properties found in the request attributes"));
+          e.getMessage().contains("Extra properties found in the request attributes"),
+          e.getMessage());
     }
   }
 
@@ -104,7 +104,7 @@ public void testFieldValidation_WrongType() throws Exception {
       fail("Expected a " + AssertionFailedException.class);
     } catch (AssertionFailedException e) {
       assertTrue(
-          e.getMessage(), e.getMessage().contains("does not match the class of the actual object"));
+          e.getMessage().contains("does not match the class of the actual object"), e.getMessage());
     }
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java b/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java
index 41409b374..a760465f0 100644
--- a/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JRPdfExporterWeakHashMapTest.java
@@ -4,8 +4,8 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -46,10 +46,10 @@ public void testMultiImagesVsOneImage() throws Exception {
     int imageSizeInThePdfByte = oneImagePdfSizeByte - noImagePdfSizeByte;
     // If multiImagesPdfSizeByte is smaller that oneImagePdfSizeByte + imageSizeInThePdf whereas it
     // contains the images 8 times, it means the image is stored by reference in this PDF.
-    Assert.assertTrue(
+    Assertions.assertTrue(
+        oneImagePdfSizeByte + imageSizeInThePdfByte > multiImagesPdfSizeByte,
         "multiImagesPdfSizeByte should not be higher than pdf oneImagePdfSizeByte +"
-            + " imageSizeInThePdf ",
-        oneImagePdfSizeByte + imageSizeInThePdfByte > multiImagesPdfSizeByte);
+            + " imageSizeInThePdf ");
   }
 
   public int generatedPdfAndGetSize(final String configName) throws Exception {
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
index 2b04c1646..d5e754814 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
@@ -1,12 +1,14 @@
 package org.mapfish.print.output;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 import net.sf.jasperreports.engine.JasperPrint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -48,28 +50,30 @@ public void testPrint() throws Exception {
     new ImageSimilarity(getFile(BASE_DIR + "expectedReport.png")).assertSimilarity(print, 0, 0);
   }
 
-  @Test(expected = Test.None.class /* no exception expected */)
+  @Test
   public void testAllOutputFormats() throws Exception {
-    final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-    final PJsonObject requestData = loadJsonRequestData();
+    assertDoesNotThrow(() -> {
+      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+      final PJsonObject requestData = loadJsonRequestData();
 
-    for (OutputFormat format : this.outputFormat.values()) {
-      if ("bmp".equals(format.getFileSuffix())
-          || "jpeg".equals(format.getFileSuffix())
-          || "jpg".equals(format.getFileSuffix())) {
-        // BMP and JPEG do not support transparency
-        continue;
-      }
-      final OutputStream outputStream = new ByteArrayOutputStream();
-      format.print(
-          new HashMap<>(),
-          requestData,
-          config,
-          getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
-          getTaskDirectory(),
-          outputStream);
-      // no error?  its a pass
+      for (OutputFormat format : this.outputFormat.values()) {
+        if ("bmp".equals(format.getFileSuffix())
+            || "jpeg".equals(format.getFileSuffix())
+            || "jpg".equals(format.getFileSuffix())) {
+          // BMP and JPEG do not support transparency
+          continue;
+        }
+        final OutputStream outputStream = new ByteArrayOutputStream();
+        format.print(
+            new HashMap<>(),
+            requestData,
+            config,
+            getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
+            getTaskDirectory(),
+            outputStream);
+        // no error?  its a pass
 
-    }
+      }
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java
index 57eae2438..b7905b534 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportPDFOutputFormatTest.java
@@ -1,15 +1,13 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
index 3eb96a021..4711da218 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportSvgOutputFormatTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
@@ -8,7 +8,7 @@
 import java.io.FileWriter;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -47,6 +47,6 @@ public void testPrint() throws Exception {
     writer.close();
 
     String expected = getFileContent(BASE_DIR + "expectedReport.svg");
-    assertEquals(actual.toString(), expected, outputStream.toString(Constants.DEFAULT_CHARSET));
+    assertEquals(expected, outputStream.toString(Constants.DEFAULT_CHARSET), actual.toString());
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/ValuesTest.java b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
index ab369acea..c71e39a40 100644
--- a/core/src/test/java/org/mapfish/print/output/ValuesTest.java
+++ b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
@@ -1,7 +1,6 @@
 package org.mapfish.print.output;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.util.HashMap;
@@ -9,7 +8,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.DataSourceAttribute;
@@ -71,27 +70,29 @@ public void testNoDefaults() throws Exception {
     assertEquals("requestId", table.columns[0]);
   }
 
-  @Test(expected = ObjectMissingException.class)
+  @Test
   public void testNoDefaults_Error_OnMissing_Attribute() throws Exception {
-    configurationFactory.setDoValidation(false);
-    final JSONObject obj = new JSONObject();
-    PJsonObject requestData = new PJsonObject(obj, "");
-    final JSONObject atts = new JSONObject();
-    obj.put("attributes", atts);
-    final Configuration config =
-        configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-    Template template = config.getTemplates().values().iterator().next();
-    new Values(
-        new HashMap<>(),
-        requestData,
-        template,
-        new File("tmp"),
-        this.httpRequestFactory,
-        new File("."),
-        HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-        HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-        new AtomicBoolean(false));
+    assertThrows(ObjectMissingException.class, () -> {
+      configurationFactory.setDoValidation(false);
+      final JSONObject obj = new JSONObject();
+      PJsonObject requestData = new PJsonObject(obj, "");
+      final JSONObject atts = new JSONObject();
+      obj.put("attributes", atts);
+      final Configuration config =
+          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+      Template template = config.getTemplates().values().iterator().next();
+      new Values(
+          new HashMap<>(),
+          requestData,
+          template,
+          new File("tmp"),
+          this.httpRequestFactory,
+          new File("."),
+          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+          new AtomicBoolean(false));
+    });
   }
 
   @Test
@@ -135,13 +136,14 @@ public void testDefaults() throws Exception {
     assertEquals("id", table.columns[0]);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testExpectObjectGetArray() throws Exception {
+    assertThrows(IllegalArgumentException.class, () -> {
 
-    PJsonObject requestData =
-        parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
-    String badLegendConf =
-        """
+      PJsonObject requestData =
+          parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
+      String badLegendConf =
+          """
         [{
             "name": "",
             "classes": [{
@@ -152,23 +154,24 @@ public void testExpectObjectGetArray() throws Exception {
             }]
         }]
         """;
-    requestData
-        .getInternalObj()
-        .getJSONObject("attributes")
-        .put("legend", new JSONArray(badLegendConf));
-    final Configuration config =
-        configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-    Template template = config.getTemplates().values().iterator().next();
-    new Values(
-        new HashMap<>(),
-        requestData,
-        template,
-        new File("tmp"),
-        this.httpRequestFactory,
-        new File("."),
-        HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-        HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-        new AtomicBoolean(false));
+      requestData
+          .getInternalObj()
+          .getJSONObject("attributes")
+          .put("legend", new JSONArray(badLegendConf));
+      final Configuration config =
+          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+      Template template = config.getTemplates().values().iterator().next();
+      new Values(
+          new HashMap<>(),
+          requestData,
+          template,
+          new File("tmp"),
+          this.httpRequestFactory,
+          new File("."),
+          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+          new AtomicBoolean(false));
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
index 1a79f2ee5..482832d85 100644
--- a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
+++ b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
@@ -1,11 +1,6 @@
 package org.mapfish.print.parser;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.AbstractMapfishSpringTest.parseJSONObjectFromFile;
 
 import java.io.IOException;
@@ -14,7 +9,7 @@
 import java.util.regex.Pattern;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.locationtech.jts.util.AssertionFailedException;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.ExtraPropertyException;
@@ -94,28 +89,34 @@ public void testChoice() {
     assertEquals(2, p.choiceC, 0.0000000001);
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testBothOneOfChoices() {
-    TestChoiceClass p = new TestChoiceClass();
-    PJsonObject json =
-        AbstractMapfishSpringTest.parseJSONObjectFromString("{\"choiceA\":1,\"choiceB\":2.0}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestChoiceClass p = new TestChoiceClass();
+      PJsonObject json =
+          AbstractMapfishSpringTest.parseJSONObjectFromString("{\"choiceA\":1,\"choiceB\":2.0}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testBothOneOfChoicesAndCanSatisfyOneOf() {
-    TestChoiceClass p = new TestChoiceClass();
-    PJsonObject json =
-        AbstractMapfishSpringTest.parseJSONObjectFromString(
-            "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestChoiceClass p = new TestChoiceClass();
+      PJsonObject json =
+          AbstractMapfishSpringTest.parseJSONObjectFromString(
+              "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testMissingOneOfChoices() {
-    TestChoiceClass p = new TestChoiceClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestChoiceClass p = new TestChoiceClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
   @Test
@@ -149,18 +150,22 @@ public void testOnlyRequirementDefinedNotDependant() {
     assertNull(p.c);
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testMissingBothRequirements() {
-    TestRequireClass p = new TestRequireClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestRequireClass p = new TestRequireClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = AssertionFailedException.class)
+  @Test
   public void testMissingOneOfTwoRequirements() {
-    TestRequireClass p = new TestRequireClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(AssertionFailedException.class, () -> {
+      TestRequireClass p = new TestRequireClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
   @Test
@@ -171,22 +176,26 @@ public void testFinalPublic() {
     assertEquals(100, p.i.intValue());
   }
 
-  @Test(expected = ExtraPropertyException.class)
+  @Test
   public void testFinalFieldMustNotBeInJson() {
-    TestFinalClass p = new TestFinalClass();
-    PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-    MapfishParser.parse(true, json, p);
+    assertThrows(ExtraPropertyException.class, () -> {
+      TestFinalClass p = new TestFinalClass();
+      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+      MapfishParser.parse(true, json, p);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testEnumIllegalVal() {
-    TestEnumParam p = new TestEnumParam();
+    assertThrows(IllegalArgumentException.class, () -> {
+      TestEnumParam p = new TestEnumParam();
 
-    final PJsonObject json =
-        AbstractMapfishSpringTest.parseJSONObjectFromString(
-            "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
+      final PJsonObject json =
+          AbstractMapfishSpringTest.parseJSONObjectFromString(
+              "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
 
-    MapfishParser.parse(true, json, p, "toIgnore");
+      MapfishParser.parse(true, json, p, "toIgnore");
+    });
   }
 
   @Test
@@ -289,10 +298,11 @@ public void testPopulateLayerParam_TooManyParams() throws IOException {
     }
   }
 
-  @Test(expected = ExtraPropertyException.class)
+  @Test
   public void testDoesntMap() {
-    String legendAtts =
-        """
+    assertThrows(ExtraPropertyException.class, () -> {
+      String legendAtts =
+          """
         {
             "extra": "",
             "classes": [{
@@ -303,9 +313,10 @@ public void testDoesntMap() {
             }]
         }
         """;
-    PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
-    LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
-    MapfishParser.parse(true, requestData, param);
+      PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
+      LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
+      MapfishParser.parse(true, requestData, param);
+    });
   }
 
   enum TestEnum {
diff --git a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
index b45f44641..56a1f2bb2 100644
--- a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 
 public class AbstractProcessorTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
index 4ec29d6f8..a0c67bf5e 100644
--- a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,7 +9,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.PDFConfig;
 import org.mapfish.print.output.Values;
@@ -118,36 +119,40 @@ public void testKeywords() {
     assertEquals("6,7", in.pdfConfig.getKeywordsAsString());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testExec_WrongFieldName() {
-    Map<String, Object> attributeMap = new HashMap<>();
-    final String titleKey = "titleAtt";
-    final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-    in.values = new Values();
-    in.pdfConfig = new PDFConfig();
-
-    attributeMap.put("title", titleKey + ".xxx");
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    in.values.put(titleKey, new CustomTitleAtt());
-    pdfConfigurationProcessor.execute(in, null);
+    assertThrows(IllegalArgumentException.class, () -> {
+      Map<String, Object> attributeMap = new HashMap<>();
+      final String titleKey = "titleAtt";
+      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+      in.values = new Values();
+      in.pdfConfig = new PDFConfig();
+
+      attributeMap.put("title", titleKey + ".xxx");
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      in.values.put(titleKey, new CustomTitleAtt());
+      pdfConfigurationProcessor.execute(in, null);
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testExec_NullValue() {
-    Map<String, Object> attributeMap = new HashMap<>();
-    final String titleKey = "titleAtt";
-    final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-    in.values = new Values();
-    in.pdfConfig = new PDFConfig();
-
-    attributeMap.put("title", titleKey + ".value");
-    pdfConfigurationProcessor.setUpdates(attributeMap);
-    in.values.put(titleKey, new CustomTitleAtt());
-    pdfConfigurationProcessor.execute(in, null);
+    assertThrows(IllegalArgumentException.class, () -> {
+      Map<String, Object> attributeMap = new HashMap<>();
+      final String titleKey = "titleAtt";
+      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+      in.values = new Values();
+      in.pdfConfig = new PDFConfig();
+
+      attributeMap.put("title", titleKey + ".value");
+      pdfConfigurationProcessor.setUpdates(attributeMap);
+      in.values.put(titleKey, new CustomTitleAtt());
+      pdfConfigurationProcessor.execute(in, null);
+    });
   }
 
   private void assertNumErrors(Map<String, Object> attributeMap, int expectedNumErrors) {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
index 91615c418..8f071a583 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.util.ArrayList;
@@ -14,9 +11,9 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
@@ -130,12 +127,12 @@ public TableInput createInputParameter() {
   @Autowired private ProcessorDependencyGraphFactory processorDependencyGraphFactory;
   private ForkJoinPool forkJoinPool;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     forkJoinPool = new ForkJoinPool(1);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     forkJoinPool.shutdownNow();
   }
@@ -153,7 +150,7 @@ public void testSimpleBuild() {
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 5, execution.testOrderExecution.size());
+    assertEquals(5, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
   }
@@ -173,7 +170,7 @@ public void testSimpleBuild_ExternalDependency_NoInput() {
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 5, execution.testOrderExecution.size());
+    assertEquals(5, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
     assertHasOrdering(execution, RootNoOutput, RootMapOut);
@@ -195,7 +192,7 @@ public void testSimpleBuild_ExternalDependency_SameInput() {
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 6, execution.testOrderExecution.size());
+    assertEquals(6, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, StyleNeedsMap, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
   }
@@ -239,7 +236,7 @@ public void testSimpleBuild_ExternalDependency_SameInputWithDifferentName() {
     values.put("map2", "ov-map");
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 9, execution.testOrderExecution.size());
+    assertEquals(9, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
     assertHasOrdering(execution, StyleNeedsMap, NeedsMap);
@@ -291,7 +288,7 @@ public void testSimpleBuild_ExternalDependency_SameInputTwoMaps() {
     values.put("map2", "the 2nd map definition");
     forkJoinPool.invoke(graph.createTask(values));
 
-    assertEquals(execution.testOrderExecution.toString(), 9, execution.testOrderExecution.size());
+    assertEquals(9, execution.testOrderExecution.size(), execution.testOrderExecution.toString());
     assertHasOrdering(execution, RootMapOut, NeedsMap);
     assertHasOrdering(execution, RootTableAndWidthOut, NeedsTable);
     assertHasOrdering(execution, StyleNeedsMap, NeedsMap);
@@ -330,7 +327,7 @@ public void testBuildProcessInputObject() {
         values.getObject(EXECUTION_TRACKER, TestOrderExecution.class);
 
     assertEquals(
-        correctTracker.testOrderExecution.toString(), 5, correctTracker.testOrderExecution.size());
+        5, correctTracker.testOrderExecution.size(), correctTracker.testOrderExecution.toString());
 
     assertHasOrdering(correctTracker, RootMapOut, NeedsMap);
     assertHasOrdering(correctTracker, RootTableAndWidthOut, NeedsTable);
@@ -358,7 +355,7 @@ public void testBuildProcessInputHasValuesAndOtherInput() {
         values.getObject(EXECUTION_TRACKER, TestOrderExecution.class);
 
     assertEquals(
-        correctTracker.testOrderExecution.toString(), 2, correctTracker.testOrderExecution.size());
+        2, correctTracker.testOrderExecution.size(), correctTracker.testOrderExecution.toString());
 
     assertHasOrdering(correctTracker, RootTableAndWidthOut, needsValuesAndMap);
   }
@@ -388,7 +385,7 @@ public void testBuildProcessInputHasValuesAndOtherInput_WithInputMapping() {
         values.getObject(EXECUTION_TRACKER, TestOrderExecution.class);
 
     assertEquals(
-        correctTracker.testOrderExecution.toString(), 2, correctTracker.testOrderExecution.size());
+        2, correctTracker.testOrderExecution.size(), correctTracker.testOrderExecution.toString());
 
     assertHasOrdering(correctTracker, outMapProcessor, needsValuesAndMap);
   }
@@ -397,12 +394,14 @@ public void testBuildProcessInputHasValuesAndOtherInput_WithInputMapping() {
    * This test checks that when there are 2 or more processors that produce the same output there is
    * an exception thrown
    */
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testBuildDependencyAttachesToLastElementProducingTheValue() {
-    final List<TestProcessor<MapInput, Void>> processors =
-        Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final List<TestProcessor<MapInput, Void>> processors =
+          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
 
-    this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+    });
   }
 
   /**
@@ -423,11 +422,13 @@ public void testBuildDebugOutput() {
    * Check that an exception is thrown when one processor provides an output value and another
    * processor expects an input value of the same name, but with a different type.
    */
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testBuildValuesWithSameNameAndDifferentType() {
-    final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
 
-    this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+    });
   }
 
   /**
@@ -449,14 +450,16 @@ public void testBuildWhenOutputsMapToAllOtherInputs() {
    * This test checks that all the outputMapper mappings have an associated property in the output
    * object.
    */
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testExtraOutputMapperMapping() {
-    final List<TestProcessor<MapInput, Void>> processors =
-        Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+    assertThrows(RuntimeException.class, () -> {
+      final List<TestProcessor<MapInput, Void>> processors =
+          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
 
-    ProcessorDependencyGraph graph =
-        this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-    assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
+      ProcessorDependencyGraph graph =
+          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+      assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
+    });
   }
 
   private void assertHasOrdering(TestOrderExecution execution, Processor... processors) {
@@ -478,8 +481,8 @@ private void assertContainsProcessors(
 
     final String comparison = actualProcessorsList + " expected " + Arrays.asList(processors);
 
-    assertEquals(comparison, processors.length, nodes.size());
-    assertTrue(comparison, actualProcessorsList.containsAll(Arrays.asList(processors)));
+    assertEquals(processors.length, nodes.size(), comparison);
+    assertTrue(actualProcessorsList.containsAll(Arrays.asList(processors)), comparison);
   }
 
   private ProcessorGraphNode<?, ?> getNodeForProcessor(
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
index 0f193b054..08ceb8bb2 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
@@ -1,15 +1,13 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.HashMap;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
 
@@ -40,11 +38,11 @@ public void testToString() {
     dep11.addDependency(dep11_2);
     assertEquals("\"?\" -> \"dep11_1\";\n", dep11_1.toString());
     assertTrue(
-        dep11.toString(),
         "\"?\" -> \"dep11\";\n  \"dep11\" -> \"dep11_1\";\n  \"dep11\" -> \"dep11_2\";\n"
                 .equals(dep11.toString())
             || "\"?\" -> \"dep11\";\n  \"dep11\" -> \"dep11_2\";\n  \"dep11\" -> \"dep11_1\";\n"
-                .equals(dep11.toString()));
+                .equals(dep11.toString()),
+        dep11.toString());
     assertEquals("\"?\" -> \"root2\";\n  \"root2\" -> \"dep21\";\n", root2.toString());
   }
 
@@ -71,19 +69,21 @@ public void testCreateTaskAllDependenciesAreSatisfied() {
 
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testCreateTaskAllDependenciesAreMissing() {
-    Values values = new Values();
-    // this is a misconfiguration prop should be pp thus an exception should be thrown below.
-    values.put("prop", "value");
-    values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
-
-    final TestProcessor processor = new TestProcessor("p");
-    processor.getInputMapperBiMap().put("pp", "prop");
-
-    final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
-    graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
-    graph.createTask(values);
+    assertThrows(IllegalArgumentException.class, () -> {
+      Values values = new Values();
+      // this is a misconfiguration prop should be pp thus an exception should be thrown below.
+      values.put("prop", "value");
+      values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
+
+      final TestProcessor processor = new TestProcessor("p");
+      processor.getInputMapperBiMap().put("pp", "prop");
+
+      final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
+      graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
+      graph.createTask(values);
+    });
   }
 
   static class TestIn {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
index 8aa40bc8b..63eb92005 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
@@ -1,14 +1,11 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 import java.util.List;
 import javax.annotation.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
 import org.mapfish.print.parser.HasDefaultValue;
@@ -44,20 +41,22 @@ public void testPopulateInputParameter() {
     assertArrayEquals(daVal, param.da, 0.00001);
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testNullableProperty() {
-
-    Values values = new Values();
-    values.put(iMappingName, intVal);
-    values.put(bMappingName, true);
-    values.put("s", sVal);
-    values.put("ls", lsVal);
-    // NO da value is specified so an exception should be thrown.
-
-    TestProcessor processor = new TestProcessor();
-    processor.getInputMapperBiMap().put(iMappingName, "i");
-    processor.getInputMapperBiMap().put(bMappingName, "b");
-    ProcessorUtils.populateInputParameter(processor, values);
+    assertThrows(RuntimeException.class, () -> {
+
+      Values values = new Values();
+      values.put(iMappingName, intVal);
+      values.put(bMappingName, true);
+      values.put("s", sVal);
+      values.put("ls", lsVal);
+      // NO da value is specified so an exception should be thrown.
+
+      TestProcessor processor = new TestProcessor();
+      processor.getInputMapperBiMap().put(iMappingName, "i");
+      processor.getInputMapperBiMap().put(bMappingName, "b");
+      ProcessorUtils.populateInputParameter(processor, values);
+    });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java
index 3577caef9..93319e818 100644
--- a/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/SetStyleProcessorTest.java
@@ -1,15 +1,14 @@
 package org.mapfish.print.processor;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.MapAttribute;
@@ -26,7 +25,7 @@
 public class SetStyleProcessorTest extends AbstractMapfishSpringTest {
   public static final String BASE_DIR = "setstyle/";
 
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
   @Autowired private ConfigurationFactory configurationFactory;
   @Autowired private ForkJoinPool forkJoinPool;
   @Autowired private TestHttpClientFactory httpClientFactory;
@@ -44,7 +43,7 @@ public void testAssignStyleBasic() throws Exception {
             new HashMap<>(),
             requestData,
             template,
-            this.folder.getRoot(),
+            this.folder,
             this.httpClientFactory,
             new File("."),
             HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
index 340826485..eb60953fc 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.net.URI;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import javax.annotation.Nullable;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
index f5b84224e..a9f6a1b4a 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URI;
 import javax.annotation.Nullable;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
index 3f2b7e71e..208d8db5b 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.net.URI;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
index a0169148d..c83fbc2ad 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import java.net.URI;
@@ -9,7 +9,7 @@
 import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.HttpRequestHeadersAttribute;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java
index bf681e2c4..64df39f55 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriBug228ProcessorTest.java
@@ -1,14 +1,14 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.NorthArrowAttribute;
 import org.mapfish.print.attribute.map.MapAttribute;
@@ -30,7 +30,7 @@
           + "-context.xml"
     })
 public class MapUriBug228ProcessorTest extends AbstractMapfishSpringTest {
-  @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @TempDir public File temporaryFolder;
   @Autowired ConfigurationFactory configurationFactory;
   @Autowired MfClientHttpRequestFactoryImpl httpClientFactory;
   @Autowired ForkJoinPool forkJoinPool;
@@ -63,7 +63,7 @@ public void bug228FixMapUri() throws Exception {
     values.put(
         Values.CLIENT_HTTP_REQUEST_FACTORY_KEY,
         new MfClientHttpRequestFactoryProvider(requestFactory));
-    values.put(Values.TASK_DIRECTORY_KEY, temporaryFolder.getRoot());
+    values.put(Values.TASK_DIRECTORY_KEY, temporaryFolder);
     values.put(Values.VALUES_KEY, values);
     values.put(Values.TEMPLATE_KEY, template);
     values.put(MDC_CONTEXT_KEY, new HashMap<>());
diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
index c4f1249e5..d66ec6da8 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URI;
 import javax.annotation.Nullable;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
index 41e550edc..815182a5f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
@@ -1,13 +1,14 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.mapfish.print.processor.http.matcher.AcceptAllMatcher;
@@ -21,7 +22,7 @@
 public class RestrictUrisProcessorTest {
   static final TestHttpClientFactory requestFactory = new TestHttpClientFactory();
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     requestFactory.registerHandler(
         input -> true,
@@ -43,13 +44,15 @@ public void testCreateFactoryWrapperLegalRequest() throws Exception {
     factoryWrapper.createRequest(new URI("http://localhost:8080/geoserver/wms"), HttpMethod.GET);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testCreateFactoryWrapperIllegalRequest() throws Exception {
-    final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
-    ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-    final ClientHttpRequestFactory factoryWrapper =
-        restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-    factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
+      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+      final ClientHttpRequestFactory factoryWrapper =
+          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+      factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
+    });
   }
 
   @Test
@@ -61,13 +64,15 @@ public void testRejectWithLegalRequest() throws Exception {
     factoryWrapper.createRequest(new URI("http://localhost/q"), HttpMethod.GET);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testRejectWithIllegalRequest() throws Exception {
-    final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
-    ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-    final ClientHttpRequestFactory factoryWrapper =
-        restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-    factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
+      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+      final ClientHttpRequestFactory factoryWrapper =
+          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+      factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
+    });
   }
 
   private RestrictUrisProcessor createLocalhostOnly() {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
index 936176fbc..dde34ba27 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java
index b6c4cd182..d2316e785 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AcceptAllMatcherTest.java
@@ -3,7 +3,7 @@
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class AcceptAllMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index 523c76e27..7fa82089e 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class AddressHostMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index b6166b52a..ba68c69cc 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class DnsHostMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index bb9cdbe2f..7f1abc87b 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.URI;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 /** Test for {@link HostnameMatcher} */
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 4980b1789..85ff93117 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.processor.http.matcher.MatcherTestUtils.assertMatch;
 
 import java.net.InetAddress;
@@ -10,7 +10,7 @@
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 
 public class LocalHostMatcherTest {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java
index 945b3ddd8..a775d222e 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/MatcherTestUtils.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.http.matcher;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.MalformedURLException;
 import java.net.SocketException;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java
index f0cfb5115..6e62095ec 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/DataSourceProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.sf.jasperreports.engine.JasperPrint;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.DataSourceAttribute;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java
index e47d6b3c4..773cfcfa6 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/DateFormatProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.TimeZone;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java
index a8a5eda73..638d5c171 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/HttpImageResolverTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -15,7 +12,7 @@
 import java.net.URI;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java
index 3475206f0..382b4e0db 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/IconTaskTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -15,7 +15,7 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.Processor;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java
index 2ed0ed686..b780e133d 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/LegendProcessorTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -16,7 +14,7 @@
 import net.sf.jasperreports.engine.data.JRTableModelDataSource;
 import net.sf.jasperreports.engine.design.JRDesignField;
 import org.json.simple.JSONArray;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java
index 64d6d6e49..cbdd913dc 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/MapSubReportTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Dimension;
 import java.io.File;
@@ -11,13 +11,12 @@
 import net.sf.jasperreports.engine.design.JRDesignImage;
 import net.sf.jasperreports.engine.design.JasperDesign;
 import net.sf.jasperreports.engine.util.JRLoader;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class MapSubReportTest {
 
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
 
   @Test
   public void testCompile() throws Exception {
@@ -49,10 +48,10 @@ public void testCompile() throws Exception {
     assertEquals(
         "\"" + layer3SVG.getPath().replace('\\', '/') + "\"", image3.getExpression().getText());
 
-    File compiledReportFile = folder.newFile();
+    File compiledReportFile = File.createTempFile("junit", null, folder);
     subReport.compile(compiledReportFile);
 
     JasperReport jasperReport = (JasperReport) JRLoader.loadObject(compiledReportFile);
-    assertEquals("report can be loaded from compiled file", "map", jasperReport.getName());
+    assertEquals("map", jasperReport.getName(), "report can be loaded from compiled file");
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java
index 777fa2207..c91f6d7d0 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorIntegrationTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.Collections2;
@@ -11,7 +11,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -39,9 +39,9 @@ public void testCreateDependencies() throws Exception {
     final List<ProcessorGraphNode<?, ?>> roots = processorGraph.getRoots();
     assertEquals(0, Collections2.filter(roots, FIND_MERGE_PROCESSOR::test).size());
     assertEquals(
-        processorGraph.toString(),
         3,
-        count(processorGraph.toString(), " -> \"MergeDataSourceProcessor"));
+        count(processorGraph.toString(), " -> \"MergeDataSourceProcessor"),
+        processorGraph.toString());
 
     MergeDataSourceProcessor mergeDataSourceProcessor = null;
     List<ProcessorGraphNode<?, ?>> allNodes = new ArrayList<>();
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java
index e6f2c6844..16fd6b2b5 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessorTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.processor.jasper.MergeDataSourceProcessor.In;
 import static org.mapfish.print.processor.jasper.MergeDataSourceProcessor.Out;
 import static org.mapfish.print.processor.jasper.MergeDataSourceProcessor.Source;
@@ -17,7 +15,7 @@
 import java.util.Map;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
 import net.sf.jasperreports.engine.design.JRDesignField;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.output.Values;
 
 public class MergeDataSourceProcessorTest {
@@ -54,7 +52,7 @@ public void testExec() throws Exception {
     List<Throwable> errors = new ArrayList<>();
     processor.validate(errors, null);
 
-    assertEquals(errors.toString(), 0, errors.size());
+    assertEquals(0, errors.size(), errors.toString());
 
     In in = new In();
     in.values = values;
diff --git a/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java
index 0caeb99a9..fc1cd5bd3 100644
--- a/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/jasper/TableProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.jasper;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java b/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java
index 891fc0205..17aaf3326 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/AddBackgroundLayersTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.batik.transcoder.TranscoderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java b/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java
index 959f55448..42b781fb4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/AddOverlayLayersTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.batik.transcoder.TranscoderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
index 261aa4975..1dd7b7743 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
@@ -7,9 +7,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -41,7 +41,7 @@ private static PJsonObject loadJsonRequestData() throws IOException {
 
   private static final AtomicInteger wmsRequestsNb = new AtomicInteger(0);
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final String host = "paging_processor_fail_on_error_test";
     requestFactory.registerHandler(
@@ -89,15 +89,15 @@ private void testPrint(
     try {
       format.getJasperPrint(
           new HashMap<>(), requestData, config, config.getDirectory(), getTaskDirectory());
-      Assert.fail("Generation was not canceled");
+      Assertions.fail("Generation was not canceled");
     } catch (Exception e) {
-      Assert.assertTrue(e instanceof ExecutionException);
+      Assertions.assertTrue(e instanceof ExecutionException);
     } finally {
-      Assert.assertTrue(
+      Assertions.assertTrue(
+          wmsRequestsNb.get() < maxWmsRequestsNumber,
           String.format(
               "Number of WMS requests (%d) during print generation should be less than %d",
-              wmsRequestsNb.get(), maxWmsRequestsNumber),
-          wmsRequestsNb.get() < maxWmsRequestsNumber);
+              wmsRequestsNb.get(), maxWmsRequestsNumber));
     }
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java
index 10e68bccc..a88a00acd 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesForceFailOnErrorProcessorTest.java
@@ -8,8 +8,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.PrintException;
@@ -105,25 +105,25 @@ private void testPrint(
       format.getJasperPrint(
           new HashMap<>(), requestData, config, config.getDirectory(), getTaskDirectory());
       if (shouldFail) {
-        Assert.fail("Generation was not canceled");
+        Assertions.fail("Generation was not canceled");
       }
     } catch (Exception e) {
       if (!shouldFail) {
-        Assert.fail("Generation was canceled");
+        Assertions.fail("Generation was canceled");
       }
       // WMS interrupt cause is CancellationException or RuntimeException
       // WMTS interrupt cause is PrintException
-      Assert.assertTrue(
-          String.format(
-              "Exception cause should be CancellationException or PrintException with message that"
-                  + " contains 'Failed to compute Coverage Task' or RuntimeException with message"
-                  + " that contains 'Request Timeout' but was %s, exception : %s",
-              e.getCause(), e),
+      Assertions.assertTrue(
           e.getCause() instanceof CancellationException
               || (e.getCause() instanceof PrintException
                   && e.getMessage().contains("Failed to compute Coverage Task"))
               || (e.getCause() instanceof RuntimeException
-                  && e.getMessage().contains("Request Timeout")));
+                  && e.getMessage().contains("Request Timeout")),
+          String.format(
+              "Exception cause should be CancellationException or PrintException with message that"
+                  + " contains 'Failed to compute Coverage Task' or RuntimeException with message"
+                  + " that contains 'Request Timeout' but was %s, exception : %s",
+              e.getCause(), e));
     }
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java
index fbcd1645b..bae912300 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -11,8 +11,8 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -41,7 +41,7 @@ private static PJsonObject loadJsonRequestData() throws IOException {
         CreateMapPagesProcessorTest.class, BASE_DIR + "requestData.json");
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final String host = "paging_processor_test";
     requestFactory.registerHandler(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java
index 5b4b1f5cc..6b721b030 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesProcessorZoomToFeatureTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.io.Files;
 import java.awt.image.BufferedImage;
@@ -9,8 +9,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import net.sf.jasperreports.engine.JasperPrint;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -32,7 +32,7 @@ public class CreateMapPagesProcessorZoomToFeatureTest extends AbstractMapfishSpr
   @Autowired private TestHttpClientFactory requestFactory;
   @Autowired private Map<String, OutputFormat> outputFormat;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     final String host = "paging_processor_zoom_to_features_test";
     requestFactory.registerHandler(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java
index 1c2da1efc..e78229c98 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiForBoundsTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
index 95700edd3..560d38af6 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.CLIP;
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.RENDER;
 
@@ -20,7 +20,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.AreaOfInterest;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java
index 2fe29bb93..7dfe0fc02 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentFlexibleScaleTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java
index 48e00915c..835bfc473 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentMinScaleTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java
index 301af9050..cf843fbc1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToExtentTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java
index 26777f6b6..0aed0d78c 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeoJsonZoomToTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java
index c860f55b8..7315519d6 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonEmptyCollection.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java
index 81de5ee3d..887842d3a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleHighDpi.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java
index 38e9f5f54..7d40ad0aa 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterGeojsonJsonStyleV1.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java
index 9139b7b2c..cb21aac60 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorCenterWMSRotationSmallTilesTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -10,7 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java
index c122d0cd3..1e095489b 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRestTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.Constants.PDF_DPI;
 
 import java.io.File;
@@ -13,7 +13,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.MapfishMapContext;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java
index 641618343..2ab7c2a99 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSRotationTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java
index 50aca629f..21a02bc33 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleAndCenterWMTSTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java
index 3c2be4152..7afc9c8be 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleBBoxGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java
index 306eda0a4..77f5f7ad8 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesPointTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java
index fef19fac6..692f166bc 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedNumlinesTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java
index 1e3dfad04..10d764441 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridFixedSpacingPointTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java
index cd5f50080..851a182c7 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterGridSpacingTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java
index 2d46654d2..d7a7f546a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmDpiTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.attribute.map.MapfishMapContext;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java
index 086386e2d..b7f1bdbe8 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmRotationTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java
index f16ed92d4..7f621790a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFixedScaleCenterOsmTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java
index 1503e46f6..f8f3200fb 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java
index 99d4dc528..fbdb4e513 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java
index 92e6605dd..00be2257f 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleBBoxGmlTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java
index bf815558b..c3a63226d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterTiledWmsTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java
index ad6b73abf..be4e5a633 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0Test.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -14,7 +14,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -60,28 +60,28 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1", uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("MERGEABLEP1 != 3", uppercaseParams.containsEntry("MERGEABLEP1", "3"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1");
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsEntry("MERGEABLEP1", "3"), "MERGEABLEP1 != 3");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
 
               return "/map-data/tiger-ny.png";
             }));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java
index 2ffb7e323..b7b28d88d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPITest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -14,7 +14,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -61,28 +61,28 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1", uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("MERGEABLEP1 != 3", uppercaseParams.containsEntry("MERGEABLEP1", "3"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1");
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsEntry("MERGEABLEP1", "3"), "MERGEABLEP1 != 3");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
 
               return "/map-data/tiger-ny.png";
             }));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java
index 206f3d659..1dbfd564c 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorFlexibleScaleCenterWms1_0_0_DPI_SVG_Test.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -14,7 +14,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -62,28 +62,28 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1", uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("MERGEABLEP1 != 3", uppercaseParams.containsEntry("MERGEABLEP1", "3"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1");
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsEntry("MERGEABLEP1", "3"), "MERGEABLEP1 != 3");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
 
               return "/map-data/tiger-ny.png";
             }));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java
index 509f225ab..de73cf71a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesLinesNoRotateLabelsTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java
index 3803c0a43..660b24b2c 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointAltLabelProjTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java
index 1184499e1..3db74b16f 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointCRS84Test.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java
index 585abe325..3d8aaf29e 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorGridFixedNumlinesPointRotatedTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java
index 4a9725f51..da47a26ba 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorImageLayerTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,7 +8,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java
index 58649f6ff..cb011a7b8 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLabelGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -14,7 +14,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.imageio.ImageIO;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java
index f9fbbafe3..494140721 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorLineVsPolygonStyleGeoJsonTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java
index 6676cd815..b13fe6c4a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorOpacityWMTSTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.awt.image.BufferedImage;
@@ -12,7 +12,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java
index 81b9adb48..9588b44f4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorRenderTypeTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java
index 403644489..1cf5633f1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorScaleBBoxNativeRotationWms1_3_0Test.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -13,7 +13,7 @@
 import java.util.Map;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -57,27 +57,27 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/PNG: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/PNG: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != GETMAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "GETMAP"));
+                  uppercaseParams.containsEntry("REQUEST", "GETMAP"),
+                  "REQUEST != GETMAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.3.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.3.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.3.0"),
+                  "VERSION != 1.3.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TOPP:STATES: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TOPP:STATES"));
-              assertTrue("ANGLE != 90", uppercaseParams.containsEntry("ANGLE", "90.0"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
+                  uppercaseParams.containsEntry("LAYERS", "TOPP:STATES"),
+                  "LAYERS != TOPP:STATES: " + uppercaseParams.get("LAYERS"));
+              assertTrue(uppercaseParams.containsEntry("ANGLE", "90.0"), "ANGLE != 90");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
               assertTrue(
-                  "mapSize is not rotated (width)", uppercaseParams.containsEntry("WIDTH", "780"));
+                  uppercaseParams.containsEntry("WIDTH", "780"), "mapSize is not rotated (width)");
               assertTrue(
-                  "mapSize is not rotated (height)",
-                  uppercaseParams.containsEntry("HEIGHT", "330"));
+                  uppercaseParams.containsEntry("HEIGHT", "330"),
+                  "mapSize is not rotated (height)");
               return "/map-data/states-native-rotation.png";
             }));
     final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java
index aa1cefd3f..0c888545d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.google.common.collect.Multimap;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java
index 7ef69bd42..84811362a 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorSvgTest.java
@@ -6,7 +6,7 @@
 import java.util.HashMap;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java
index 39cca6d64..d5b3a7bb1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateNorthArrowProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.HashMap;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java
index 88a0e24cd..75af87266 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomBounds.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java
index a7eb75cd1..c9f47cdd4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorCustomLayerTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java
index 65538196a..d33898f56 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorRotateTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -11,7 +11,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java
index fcc8bfa96..35ae0f17d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorStyleTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java
index 9a4de0112..f2c1698c7 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateOverviewMapProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,7 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java b/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java
index 5158b8eb2..e3c9cbe14 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/MapfishMapContextTest.java
@@ -2,9 +2,7 @@
 
 import static java.lang.Math.PI;
 import static org.geotools.referencing.crs.DefaultGeographicCRS.WGS84;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.Constants.PDF_DPI;
 
 import java.awt.Dimension;
@@ -16,7 +14,7 @@
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.attribute.map.BBoxMapBounds;
 import org.mapfish.print.attribute.map.CenterScaleMapBounds;
 import org.mapfish.print.attribute.map.MapAttribute;
@@ -50,7 +48,7 @@ private void assertRoundedScale(double actualScaleDenominator, double roundedSca
   @Test
   public void testGetRotation() {
     MapfishMapContext transformer = new MapfishMapContext(null, null, PI / 2, PDF_DPI, null, true);
-    assertEquals("converted to radians", PI / 2, transformer.getRotation(), 1e-9);
+    assertEquals(PI / 2, transformer.getRotation(), 1e-9, "converted to radians");
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java b/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java
index 47758b48b..10a6d0c10 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/NorthArrowGraphicTest.java
@@ -6,8 +6,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.HashMap;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
@@ -27,7 +27,7 @@ public class NorthArrowGraphicTest extends AbstractMapfishSpringTest {
 
   private Color bgColor;
 
-  @Before
+  @BeforeEach
   public void setUp() throws IOException {
     Configuration config = this.configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
     this.requestFactoryWrapper =
diff --git a/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java
index 5f7ab78db..3bb49168d 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/SetFeaturesProcessorTest.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,7 +9,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java
index 63b0956f1..75d3fbd32 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/SetTiledWmsProcessorTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SetTiledWmsProcessorTest {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java
index 50aab6241..39381e48b 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/SetWmsCustomParamProcessorTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -13,7 +13,7 @@
 import java.util.Map;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.URIUtils;
@@ -60,27 +60,27 @@ public void testExecute() throws Exception {
               }
 
               assertTrue(
-                  "SERVICE != WMS: " + uppercaseParams.get("WMS"),
-                  uppercaseParams.containsEntry("SERVICE", "WMS"));
+                  uppercaseParams.containsEntry("SERVICE", "WMS"),
+                  "SERVICE != WMS: " + uppercaseParams.get("WMS"));
               assertTrue(
-                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"),
-                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"));
+                  uppercaseParams.containsEntry("FORMAT", "IMAGE/PNG"),
+                  "FORMAT != IMAGE/TIFF: " + uppercaseParams.get("FORMAT"));
               assertTrue(
-                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"),
-                  uppercaseParams.containsEntry("REQUEST", "MAP"));
+                  uppercaseParams.containsEntry("REQUEST", "MAP"),
+                  "REQUEST != MAP: " + uppercaseParams.get("REQUEST"));
               assertTrue(
-                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"),
-                  uppercaseParams.containsEntry("VERSION", "1.0.0"));
+                  uppercaseParams.containsEntry("VERSION", "1.0.0"),
+                  "VERSION != 1.0.0: " + uppercaseParams.get("VERSION"));
               assertTrue(
-                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"),
-                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"));
+                  uppercaseParams.containsEntry("LAYERS", "TIGER-NY"),
+                  "LAYERS != TIGER-NY: " + uppercaseParams.get("LAYERS"));
               assertTrue(
-                  "STYLES != LINE: " + uppercaseParams.get("STYLES"),
-                  uppercaseParams.containsEntry("STYLES", "LINE"));
-              assertTrue("CUSTOMP1 != 1: " + uri, uppercaseParams.containsEntry("CUSTOMP1", "1"));
-              assertTrue("CUSTOMP2 != 2", uppercaseParams.containsEntry("CUSTOMP2", "2"));
-              assertTrue("BBOX is missing", uppercaseParams.containsKey("BBOX"));
-              assertTrue("EXCEPTIONS is missing", uppercaseParams.containsKey("EXCEPTIONS"));
+                  uppercaseParams.containsEntry("STYLES", "LINE"),
+                  "STYLES != LINE: " + uppercaseParams.get("STYLES"));
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP1", "1"), "CUSTOMP1 != 1: " + uri);
+              assertTrue(uppercaseParams.containsEntry("CUSTOMP2", "2"), "CUSTOMP2 != 2");
+              assertTrue(uppercaseParams.containsKey("BBOX"), "BBOX is missing");
+              assertTrue(uppercaseParams.containsKey("EXCEPTIONS"), "EXCEPTIONS is missing");
               return "/map-data/tiger-ny.png";
             }));
     requestFactory.registerHandler(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java b/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java
index 9c1b93bc9..a0e5c20f6 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/scalebar/CreateScaleBarProcessorFixedScaleCenterOsmTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.processor.map.scalebar;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -12,7 +10,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.TestHttpClientFactory;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java
index 652e89d63..732af64c1 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarDrawerTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.map.scalebar;
 
 import static java.awt.image.BufferedImage.TYPE_4BYTE_ABGR;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.awt.Dimension;
 import java.awt.Font;
@@ -12,7 +12,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.ScalebarAttribute;
 import org.mapfish.print.attribute.ScalebarAttribute.ScalebarAttributeValues;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java
index 39057c8df..3062f31a4 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/scalebar/ScalebarGraphicTest.java
@@ -1,15 +1,14 @@
 package org.mapfish.print.processor.map.scalebar;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.awt.Dimension;
 import java.io.File;
 import java.net.URI;
 import org.geotools.referencing.CRS;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.attribute.ScalebarAttribute;
 import org.mapfish.print.attribute.ScalebarAttribute.ScalebarAttributeValues;
@@ -25,10 +24,10 @@ public class ScalebarGraphicTest {
 
   private final double TOLERANCE = 0.000000001;
 
-  @Rule public TemporaryFolder folder = new TemporaryFolder();
+  @TempDir public File folder;
   private Template template;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     Configuration configuration = new Configuration();
     this.template = new Template();
@@ -126,7 +125,7 @@ public void testRender() throws Exception {
     scalebarParams.renderAsSvg = false;
 
     ScalebarGraphic scalebar = new ScalebarGraphic();
-    URI file = scalebar.render(mapParams, scalebarParams, folder.getRoot(), this.template);
+    URI file = scalebar.render(mapParams, scalebarParams, folder, this.template);
     new ImageSimilarity(getFile("expected-scalebar-graphic.png"))
         .assertSimilarity(new File(file), 0);
   }
@@ -146,7 +145,7 @@ public void testRenderDoubleDpi() throws Exception {
     scalebarParams.renderAsSvg = false;
 
     ScalebarGraphic scalebar = new ScalebarGraphic();
-    URI file = scalebar.render(mapParams, scalebarParams, folder.getRoot(), this.template);
+    URI file = scalebar.render(mapParams, scalebarParams, folder, this.template);
     new ImageSimilarity(getFile("expected-scalebar-graphic-dpi.png"))
         .assertSimilarity(new File(file), 0);
   }
@@ -167,7 +166,7 @@ public void testRenderSvg() throws Exception {
     scalebarParams.font = "Liberation Sans";
 
     ScalebarGraphic scalebar = new ScalebarGraphic();
-    URI file = scalebar.render(mapParams, scalebarParams, folder.getRoot(), this.template);
+    URI file = scalebar.render(mapParams, scalebarParams, folder, this.template);
     new ImageSimilarity(getFile("expected-scalebar-graphic-svg.png"))
         .assertSimilarity(file, 300, 40, 0);
   }
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
index c6d76b837..2687eeab3 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
@@ -1,17 +1,17 @@
 package org.mapfish.print.servlet;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.access.AccessAssertionTestUtil;
 import org.mapfish.print.test.util.ImageSimilarity;
@@ -34,12 +34,13 @@ public class MapPrinterServletSecurityTest extends AbstractMapfishSpringTest {
   @Autowired private MapPrinterServlet servlet;
   @Autowired private ServletMapPrinterFactory printerFactory;
 
-  @After
+  @AfterEach
   public void tearDown() {
     SecurityContextHolder.clearContext();
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_Success() throws Exception {
     AccessAssertionTestUtil.setCreds("ROLE_USER", "ROLE_EDITOR");
     setUpConfigFiles();
@@ -56,34 +57,41 @@ public void testCreateReportAndGet_Success() throws Exception {
     assertCorrectResponse(servletCreateResponse);
   }
 
-  @Test(timeout = 60000, expected = AccessDeniedException.class)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_InsufficientPrivileges() throws Exception {
-    AccessAssertionTestUtil.setCreds("ROLE_USER");
-    setUpConfigFiles();
+    assertThrows(AccessDeniedException.class, () -> {
+      AccessAssertionTestUtil.setCreds("ROLE_USER");
+      setUpConfigFiles();
 
-    final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-    final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-    String requestData = loadRequestDataAsString();
+      String requestData = loadRequestDataAsString();
 
-    this.servlet.createReportAndGetNoAppId(
-        "png", requestData, false, servletCreateRequest, servletCreateResponse);
+      this.servlet.createReportAndGetNoAppId(
+          "png", requestData, false, servletCreateRequest, servletCreateResponse);
+    });
   }
 
-  @Test(timeout = 60000, expected = AuthenticationCredentialsNotFoundException.class)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_NoCredentials() throws Exception {
-    setUpConfigFiles();
+    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
+      setUpConfigFiles();
 
-    final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-    final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-    String requestData = loadRequestDataAsString();
+      String requestData = loadRequestDataAsString();
 
-    this.servlet.createReportAndGetNoAppId(
-        "png", requestData, false, servletCreateRequest, servletCreateResponse);
+      this.servlet.createReportAndGetNoAppId(
+          "png", requestData, false, servletCreateRequest, servletCreateResponse);
+    });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_RequestAllowed_OtherGetDenied() throws Exception {
     AccessAssertionTestUtil.setCreds("ROLE_USER", "ROLE_EDITOR");
     setUpConfigFiles();
@@ -110,7 +118,7 @@ public void testCreateReportAndGet_RequestAllowed_OtherGetDenied() throws Except
       String contentAsString = servletStatusResponse.getContentAsString();
 
       final PJsonObject statusJson = parseJSONObjectFromString(contentAsString);
-      assertTrue(statusJson.toString(), statusJson.has(MapPrinterServlet.JSON_DONE));
+      assertTrue(statusJson.has(MapPrinterServlet.JSON_DONE), statusJson.toString());
 
       done = statusJson.getBool(MapPrinterServlet.JSON_DONE);
       if (!done) {
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
index 6dc7261e6..4379f61d4 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
@@ -1,11 +1,6 @@
 package org.mapfish.print.servlet;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mapfish.print.servlet.ServletMapPrinterFactory.DEFAULT_CONFIGURATION_FILE_KEY;
 
 import de.saly.javamail.mock2.MailboxFolder;
@@ -19,6 +14,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import javax.mail.Address;
@@ -32,7 +28,8 @@
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.SetsUtils;
@@ -120,7 +117,8 @@ public void testExampleRequest_referrerNOK() throws Exception {
     assertEquals(HttpStatus.FORBIDDEN.value(), getExampleResponseImplicit.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_NoAppId() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -135,7 +133,8 @@ public void testCreateReport_Success_NoAppId() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_EncodedSpec() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -151,7 +150,8 @@ public void testCreateReport_Success_EncodedSpec() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_FormPostEncodedSpec() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -167,7 +167,8 @@ public void testCreateReport_Success_FormPostEncodedSpec() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_explicitAppId() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -187,7 +188,8 @@ public void testCreateReport_Success_explicitAppId() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_FormPosting() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -202,7 +204,8 @@ public void testCreateReport_FormPosting() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_2Requests_Success_NoAppId() throws Exception {
     doCreateAndPollAndGetReport(
         (@Nullable MockHttpServletRequest servletCreateRequest) -> {
@@ -222,7 +225,8 @@ public void testCreateReport_2Requests_Success_NoAppId() throws Exception {
         });
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_ForwardHttpRequests() throws Exception {
     final String geotiffURL = "http://server.com/sampleGeoTiff.tif";
@@ -277,7 +281,8 @@ public MockClientHttpRequest handleRequest(URI uri, HttpMethod httpMethod) {
         new Object[] {"default"}, request.getHeaders().get("X-Application-ID").toArray());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Email() throws Exception {
     setUpConfigFiles();
     MockMailbox.resetAll();
@@ -322,7 +327,8 @@ public void testCreateReport_Email() throws Exception {
         .assertSimilarity(IOUtils.toByteArray(content), 0);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Email_S3() throws Exception {
     setUpConfigFiles();
     MockMailbox.resetAll();
@@ -409,7 +415,7 @@ private String doCreateAndPollAndGetReport(
       String contentAsString = servletStatusResponse.getContentAsString();
 
       final PJsonObject statusJson = parseJSONObjectFromString(contentAsString);
-      assertTrue(statusJson.toString(), statusJson.has(MapPrinterServlet.JSON_DONE));
+      assertTrue(statusJson.has(MapPrinterServlet.JSON_DONE), statusJson.toString());
 
       downloadURL = createResponseJson.getString(MapPrinterServlet.JSON_DOWNLOAD_LINK);
       assertEquals("/print/report/" + ref, downloadURL);
@@ -421,13 +427,13 @@ private String doCreateAndPollAndGetReport(
 
       timeElapsed = statusJson.getInt(MapPrinterServlet.JSON_ELAPSED_TIME);
       assertTrue(
+          lastTimeElapsed
+              <= timeElapsed
+                  + allowDeltaBetweenCompletedJobStatusRegisteredStatsAndInstantaneousElapsedTime,
           "lastTimeElapsed: "
               + lastTimeElapsed
               + " is not less or equal to timeElapsed: "
-              + timeElapsed,
-          lastTimeElapsed
-              <= timeElapsed
-                  + allowDeltaBetweenCompletedJobStatusRegisteredStatsAndInstantaneousElapsedTime);
+              + timeElapsed);
 
       lastTimeElapsed = timeElapsed;
 
@@ -451,7 +457,8 @@ private void addHeaders(MockHttpServletRequest servletStatusRequest) {
     servletStatusRequest.addHeader("Referrer", "http://localhost:8080/print/");
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Failure() throws Exception {
     setUpConfigFiles();
 
@@ -476,7 +483,8 @@ public void testCreateReport_Failure() throws Exception {
     waitForFailure(ref);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_FailureInvalidUrl() throws Exception {
     setUpConfigFiles();
 
@@ -530,7 +538,8 @@ private void waitForFailure(String ref)
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel() throws Exception {
     setUpConfigFiles();
 
@@ -561,7 +570,8 @@ public void testCancel() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel_Sleep() throws Exception {
     setUpConfigFiles();
 
@@ -595,7 +605,8 @@ public void testCancel_Sleep() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel_FinishedJob() throws Exception {
     // start a job and wait until it is finished
     String ref =
@@ -628,7 +639,8 @@ public void testCancel_FinishedJob() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancel_WrongRef() throws Exception {
     setUpConfigFiles();
 
@@ -637,7 +649,8 @@ public void testCancel_WrongRef() throws Exception {
     assertEquals(HttpStatus.NOT_FOUND.value(), servletCancelResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCancelSpecificAppId() throws Exception {
     setUpConfigFiles();
 
@@ -668,7 +681,8 @@ public void testCancelSpecificAppId() throws Exception {
     assertEquals("canceled", statusJson.getString(MapPrinterServlet.JSON_STATUS));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_Timeout() throws Exception {
     jobManager.setTimeout(1);
@@ -698,7 +712,8 @@ public void testCreateReport_Timeout() throws Exception {
     testCreateReport_Success_explicitAppId();
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_AbandonedTimeout() throws Exception {
     jobManager.setAbandonedTimeout(1);
@@ -735,7 +750,8 @@ public void testCreateReport_AbandonedTimeout() throws Exception {
    * Check that a job is not canceled, when status requests are made. Test case for:
    * https://github.com/mapfish/mapfish-print/issues/404
    */
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_NotAbandonedTimeout() throws Exception {
     jobManager.setAbandonedTimeout(1);
@@ -806,7 +822,8 @@ private void waitForNotCanceled(String ref)
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Failure_InvalidFormat() throws Exception {
     setUpConfigFiles();
 
@@ -828,7 +845,8 @@ public void testCreateReport_Failure_InvalidFormat() throws Exception {
     waitForFailure(ref);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_Success() throws Exception {
     setUpConfigFiles();
 
@@ -844,7 +862,8 @@ public void testCreateReportAndGet_Success() throws Exception {
     assertCorrectResponse(servletCreateResponse);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_OutputName() throws Exception {
     setUpConfigFiles();
 
@@ -882,7 +901,8 @@ private String getFormEncodedRequestData() throws IOException {
     return "spec=" + URLEncoder.encode(loadRequestDataAsString(), Constants.DEFAULT_ENCODING);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReportAndGet_Timeout() throws Exception {
     jobManager.setTimeout(1);
@@ -898,7 +918,8 @@ public void testCreateReportAndGet_Timeout() throws Exception {
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), servletCreateResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_Failure() throws Exception {
     setUpConfigFiles();
 
@@ -915,7 +936,8 @@ public void testCreateReportAndGet_Failure() throws Exception {
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), servletCreateResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_FormPost() throws Exception {
     setUpConfigFiles();
 
@@ -941,7 +963,8 @@ private void assertArrayContains(PJsonArray formats, String format) {
     throw new AssertionError(format + " does is not one of the elements in: " + formats);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testGetStatus_InvalidRef() throws Exception {
     setUpConfigFiles();
 
@@ -954,7 +977,8 @@ public void testGetStatus_InvalidRef() throws Exception {
     assertEquals(HttpStatus.NOT_FOUND.value(), servletStatusResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testGetReport_InvalidRef() throws Exception {
     setUpConfigFiles();
 
@@ -1092,7 +1116,8 @@ public void testListAppIds() throws Exception {
     assertTrue(expected.contains(appIdsJson.getString(1)));
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testCreateReport_ExceedsMaxNumberOfWaitingJobs() throws Exception {
     jobManager.setMaxNumberOfWaitingJobs(2);
@@ -1117,7 +1142,8 @@ public void testCreateReport_ExceedsMaxNumberOfWaitingJobs() throws Exception {
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR.value(), servletCreateResponse.getStatus());
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   @DirtiesContext
   public void testGetStatus_WaitingRunning() throws Exception {
     jobManager.setMaxNumberOfRunningPrintJobs(1);
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java
index 06d25179d..c86b14b7d 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/AbstractConfigLoaderTest.java
@@ -1,17 +1,14 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URI;
 import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.config.Configuration;
@@ -23,7 +20,7 @@ public abstract class AbstractConfigLoaderTest extends AbstractMapfishSpringTest
 
   @Autowired protected WorkingDirectories workingDirectories;
 
-  @After
+  @AfterEach
   public void tearDown() {
     final File[] children = this.workingDirectories.getWorking().listFiles();
     assertNotNull(children);
@@ -70,15 +67,15 @@ protected void assertAccessible(File baseWorkingDir) throws IOException {
       testFile.getParentFile().mkdirs();
       new FileOutputStream(testFile).close();
       assertTrue(
-          testFile.getAbsolutePath() + " is not accessible",
-          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.getAbsolutePath()));
+          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.getAbsolutePath()),
+          testFile.getAbsolutePath() + " is not accessible");
       assertTrue(
-          testFile.getAbsoluteFile().toURI().toString() + " is not accessible",
           getLoader()
-              .isAccessible(CONFIG_FILE.toURI(), testFile.getAbsoluteFile().toURI().toString()));
+              .isAccessible(CONFIG_FILE.toURI(), testFile.getAbsoluteFile().toURI().toString()),
+          testFile.getAbsoluteFile().toURI().toString() + " is not accessible");
       assertTrue(
-          testFile.toURI().toString() + " is not accessible",
-          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.toURI().toString()));
+          getLoader().isAccessible(CONFIG_FILE.toURI(), testFile.toURI().toString()),
+          testFile.toURI().toString() + " is not accessible");
     } finally {
       testFile.delete();
     }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
index 23292f9a1..70d3c2da2 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
@@ -1,16 +1,13 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -101,47 +98,57 @@ public void testLoadFileChildResource() throws Exception {
             configFileUri, "classpath://org/mapfish/print/servlet/fileloader/" + resourceFileName));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
+    assertThrows(IllegalArgumentException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
 
-    this.loader.loadFile(
-        configFileUri, "classpath://test-http-request-factory-application-context.xml");
+      this.loader.loadFile(
+          configFileUri, "classpath://test-http-request-factory-application-context.xml");
+    });
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testLoadFileChildResource_NotClasspathURI() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
-    final String resourceFileName = "resourceFile.txt";
+    assertThrows(IllegalArgumentException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
+      final String resourceFileName = "resourceFile.txt";
 
-    final String uri = getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
-    this.loader.loadFile(configFileUri, uri);
+      final String uri = getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
+      this.loader.loadFile(configFileUri, uri);
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
-    final String resourceFileName = "resourceFile.txt";
-
-    final File file =
-        new File(
-            getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(), "doesNotExist");
-    this.loader.loadFile(configFileUri, file.getPath());
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
+      final String resourceFileName = "resourceFile.txt";
+
+      final File file =
+          new File(
+              getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(), "doesNotExist");
+      this.loader.loadFile(configFileUri, file.getPath());
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist2() throws Exception {
-    final URI configFileUri = new URI(configFileUriString);
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI(configFileUriString);
 
-    this.loader.loadFile(configFileUri, "doesNotExist");
+      this.loader.loadFile(configFileUri, "doesNotExist");
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_ConfigFileDoesNotExist() throws Exception {
-    final URI configFileUri = new URI("classpath://xyz.yaml");
-    final String resourceFileName = "resourceFile.txt";
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI("classpath://xyz.yaml");
+      final String resourceFileName = "resourceFile.txt";
 
-    this.loader.loadFile(
-        configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
+      this.loader.loadFile(
+          configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
index 6f2806e59..d71772b31 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
@@ -1,15 +1,12 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.IllegalFileAccessException;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -39,7 +36,7 @@ public void testLastModified() {
 
   @Test
   public void testAccessible() throws Exception {
-    assertTrue(CONFIG_FILE.toURI().toString(), loader.isAccessible(CONFIG_FILE.toURI()));
+    assertTrue(loader.isAccessible(CONFIG_FILE.toURI()), CONFIG_FILE.toURI().toString());
     assertFalse(loader.isAccessible(new URI(CONFIG_FILE.toURI() + "xzy")));
   }
 
@@ -55,14 +52,16 @@ public void testLoadFile() throws Exception {
     assertArrayEquals(Files.readAllBytes(CONFIG_FILE.toPath()), loaded);
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileMissingFile() throws Exception {
-    this.loader.loadFile(new URI("file:/c:/doesnotexist"));
+    assertThrows(NoSuchElementException.class, () ->
+      this.loader.loadFile(new URI("file:/c:/doesnotexist")));
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLastModifiedMissingFile() throws Exception {
-    this.loader.lastModified(new URI("file:/c:/doesnotexist"));
+    assertThrows(NoSuchElementException.class, () ->
+      this.loader.lastModified(new URI("file:/c:/doesnotexist")));
   }
 
   @Test
@@ -112,20 +111,24 @@ public void testLoadFileChildResource() throws Exception {
             configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).getPath()));
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    final URI configFileUri = CONFIG_FILE.toURI();
-
-    this.loader.loadFile(
-        configFileUri,
-        getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-            .getAbsolutePath());
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI configFileUri = CONFIG_FILE.toURI();
+
+      this.loader.loadFile(
+          configFileUri,
+          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
+              .getAbsolutePath());
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    final URI configFileUri = CONFIG_FILE.toURI();
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = CONFIG_FILE.toURI();
 
-    this.loader.loadFile(configFileUri, "doesNotExist");
+      this.loader.loadFile(configFileUri, "doesNotExist");
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
index 69a4186e3..689c63f58 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
@@ -1,16 +1,13 @@
 package org.mapfish.print.servlet.fileloader;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
 import java.net.URI;
 import java.nio.file.Files;
 import java.util.NoSuchElementException;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.IllegalFileAccessException;
 import org.mapfish.print.servlet.MapPrinterServletTest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,28 +109,34 @@ public void testLoadFileChildResource() throws Exception {
             configFileUri, "servlet:///org/mapfish/print/servlet/fileloader/" + resourceFileName));
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
-
-    this.loader.loadFile(
-        configFileUri,
-        getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-            .getAbsolutePath());
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+
+      this.loader.loadFile(
+          configFileUri,
+          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
+              .getAbsolutePath());
+    });
   }
 
-  @Test(expected = IllegalFileAccessException.class)
+  @Test
   public void testLoadFileChildResource_NotInConfigDir_ServletURI() throws Exception {
-    final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+    assertThrows(IllegalFileAccessException.class, () -> {
+      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
 
-    this.loader.loadFile(
-        configFileUri, "servlet:///test-http-request-factory-application-context.xml");
+      this.loader.loadFile(
+          configFileUri, "servlet:///test-http-request-factory-application-context.xml");
+    });
   }
 
-  @Test(expected = NoSuchElementException.class)
+  @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+    assertThrows(NoSuchElementException.class, () -> {
+      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
 
-    this.loader.loadFile(configFileUri, "doesNotExist");
+      this.loader.loadFile(configFileUri, "doesNotExist");
+    });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
index 0300254bb..efc96be3e 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
@@ -1,11 +1,13 @@
 package org.mapfish.print.servlet.job;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.access.AlwaysAllowAssertion;
@@ -30,14 +32,15 @@ public class ClusteringTaskTest extends AbstractMapfishSpringTest {
   TestJobManager jobMan2;
   @Autowired private ApplicationContext context;
 
-  @Before
+  @BeforeEach
   public void setup() {
     context.getBean(ThreadPoolJobManager.class).shutdown();
     jobMan1 = new TestJobManager("uno");
     jobMan2 = new TestJobManager("duo");
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testRun() throws Exception {
     LOGGER.error("Starting jobs");
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
index 1b9c95393..c6cde2bad 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.servlet.job;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java b/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java
index 6024a9ea9..2a681c0d0 100644
--- a/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/registry/BasicRegistryTest.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet.registry;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java b/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java
index bb62a7616..5376fb5a7 100644
--- a/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java
+++ b/core/src/test/java/org/mapfish/print/test/util/ImageSimilarityTest.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.test.util;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.imageio.ImageIO;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
 
 public class ImageSimilarityTest extends AbstractMapfishSpringTest {
@@ -13,7 +13,7 @@ public class ImageSimilarityTest extends AbstractMapfishSpringTest {
   @Test
   public void testNotRegenerateImage() {
     assertFalse(
-        "This flag should not be committed as true", ImageSimilarity.REGENERATE_EXPECTED_IMAGES);
+        ImageSimilarity.REGENERATE_EXPECTED_IMAGES, "This flag should not be committed as true");
   }
 
   /** Test that we get a distance in images with small differences. */
diff --git a/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java b/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java
index 6f9076695..cbba7f190 100644
--- a/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java
+++ b/core/src/test/java/org/mapfish/print/url/data/TestDataUrlConnection.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.url.data;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestDataUrlConnection {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/url/data/TestHandler.java b/core/src/test/java/org/mapfish/print/url/data/TestHandler.java
index 69c0fe027..111368520 100644
--- a/core/src/test/java/org/mapfish/print/url/data/TestHandler.java
+++ b/core/src/test/java/org/mapfish/print/url/data/TestHandler.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.url.data;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -9,7 +9,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestHandler {
   @Test
diff --git a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java
index 216a7936e..51b164ba0 100644
--- a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java
+++ b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlArrayTest.java
@@ -1,8 +1,6 @@
 package org.mapfish.print.wrapper.yaml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -10,7 +8,7 @@
 import java.util.Map;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.wrapper.json.PJsonArray;
 
 public class PYamlArrayTest {
diff --git a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java
index 54ec6642a..7feba18a1 100644
--- a/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java
+++ b/core/src/test/java/org/mapfish/print/wrapper/yaml/PYamlObjectTest.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.wrapper.yaml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mapfish.print.wrapper.json.PJsonArray;
 import org.mapfish.print.wrapper.json.PJsonObject;
 
diff --git a/core/src/test/resources/mapfish-spring-hibernate.xml b/core/src/test/resources/mapfish-spring-hibernate.xml
index 860b7149e..e1b82d348 100644
--- a/core/src/test/resources/mapfish-spring-hibernate.xml
+++ b/core/src/test/resources/mapfish-spring-hibernate.xml
@@ -6,7 +6,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
 
-    <bean id="mfSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+    <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
         <property name="annotatedClasses">
             <list>
@@ -28,7 +28,7 @@
         </property>
     </bean>
 
-    <bean id="transactionManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+    <bean id="transactionManager" class="org.springframework.orm.jpa.hibernate.HibernateTransactionManager">
         <property name="sessionFactory" ref="mfSessionFactory"/>
     </bean>
     <tx:annotation-driven transaction-manager="transactionManager"/>
diff --git a/docs/build.gradle b/docs/build.gradle
index 5d1146138..91e979784 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -71,3 +71,6 @@ tasks.register('buildDocs', JavaExec) {
 build {
     dependsOn buildDocs
 }
+tasks.withType(Test).configureEach {
+    useJUnitPlatform()
+}
diff --git a/examples/build.gradle b/examples/build.gradle
index 5eb716a0d..d2817ea62 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -42,7 +42,9 @@ tasks.register('geoserver' , Exec) {
 // prevent that the tests target can be directly called. the integration tests
 // must be run with `./gradlew examples:geoserver` to make sure the
 // server is running
-test {}
+test {
+    useJUnitPlatform()
+}
 test.onlyIf { false }
 
 tasks.register('integrationTest', Test) {
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index a27dc7f5b..6813e3aa1 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -1,7 +1,7 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
@@ -29,9 +29,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.BeforeClass;
-import org.junit.Test;
 import org.junit.internal.TextListener;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunListener;
@@ -109,7 +109,7 @@ public class ExamplesTest {
 
   @Autowired MapPrinter mapPrinter;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     final LoggerContext loggerContext = getLoggerContext();
     statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
@@ -195,12 +195,12 @@ public void testExampleDirectoryNames() {
     }
 
     assertEquals(
+        0,
+        errors.length(),
         String.format(
             "All example directory names must match the pattern: '%s'.  "
                 + "The following fail that test: %s",
-            namePattern, errors),
-        0,
-        errors.length());
+            namePattern, errors));
   }
 
   @Test
diff --git a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
index cce7d5d2c..a0ee14f16 100644
--- a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
@@ -1,14 +1,11 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/examples/src/test/java/org/mapfish/print/PrintApiTest.java b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
index cca5c7621..f3ddabd24 100644
--- a/examples/src/test/java/org/mapfish/print/PrintApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
@@ -1,9 +1,6 @@
 package org.mapfish.print;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -11,11 +8,13 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.mapfish.print.servlet.MapPrinterServlet;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -206,13 +205,15 @@ public void testCreateReport_RequestTooLarge() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_App() throws Exception {
     final String printSpec = getPrintSpec("examples/geoext/requestData.json");
     testCreateReport("geoext" + MapPrinterServlet.REPORT_URL + ".pdf", printSpec);
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_NoApp() throws Exception {
     final String printSpec = getDefaultAppDefaultRequestSample();
     testCreateReport(MapPrinterServlet.REPORT_URL + ".pdf", printSpec);
@@ -308,7 +309,8 @@ private void testCreateReport(String requestPath, String printSpec) throws Excep
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_InvalidFormat() throws Exception {
     ClientHttpRequest request =
         getPrintRequest("geoext" + MapPrinterServlet.REPORT_URL + ".docx", HttpMethod.POST);
@@ -338,7 +340,8 @@ public void testCreateReport_InvalidFormat() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReport_Success_App_PNG() throws Exception {
     ClientHttpRequest request =
         getPrintRequest("geoext" + MapPrinterServlet.REPORT_URL + ".png", HttpMethod.POST);
@@ -364,7 +367,8 @@ public void testCreateReport_Success_App_PNG() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test
+  @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateAndGetReport_Success_App() throws Exception {
     ClientHttpRequest request =
         getPrintRequest("geoext" + MapPrinterServlet.CREATE_AND_GET_URL + ".pdf", HttpMethod.POST);
@@ -500,7 +504,7 @@ public void testCors() throws Exception {
     ClientHttpRequest request = getPrintRequest(MapPrinterServlet.LIST_APPS_URL, HttpMethod.GET);
     try (ClientHttpResponse response = request.execute()) {
       assertEquals(HttpStatus.OK, response.getStatusCode());
-      assertFalse(response.getHeaders().containsKey("Access-Control-Allow-Origin"));
+      assertFalse(response.getHeaders().containsHeader("Access-Control-Allow-Origin"));
     }
 
     request = getPrintRequest(MapPrinterServlet.LIST_APPS_URL, HttpMethod.GET);
@@ -517,8 +521,8 @@ public void testCors() throws Exception {
     try (ClientHttpResponse response = request.execute()) {
       assertEquals(HttpStatus.OK, response.getStatusCode());
       assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
-      assertTrue(response.getHeaders().containsKey("Access-Control-Max-Age"));
-      assertTrue(response.getHeaders().containsKey("Access-Control-Allow-Methods"));
+      assertTrue(response.getHeaders().containsHeader("Access-Control-Max-Age"));
+      assertTrue(response.getHeaders().containsHeader("Access-Control-Allow-Methods"));
       assertEquals("X-Toto", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
     }
   }
@@ -536,7 +540,7 @@ private JSONArray execCapabilitiesRequestWithAut(int expectedNumberOfLayouts, St
       String responseAsText = getBodyAsText(response);
       JSONObject infoResult = new JSONObject(responseAsText);
       final JSONArray layouts = infoResult.getJSONArray("layouts");
-      assertEquals("In " + responseAsText, expectedNumberOfLayouts, layouts.length());
+      assertEquals(expectedNumberOfLayouts, layouts.length(), "In " + responseAsText);
       return layouts;
     }
   }
@@ -550,7 +554,7 @@ private void execCreateRequestWithAuth(
     setPrintSpec(printSpec, request);
     addAuthHeader(request, credentials);
     try (ClientHttpResponse response = request.execute()) {
-      assertEquals(response.getStatusText(), expectedStatus, response.getStatusCode());
+      assertEquals(expectedStatus, response.getStatusCode(), response.getStatusText());
     }
   }
 
diff --git a/gradle.properties b/gradle.properties
index b0c02d5b1..ae88ddde6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,3 +2,4 @@ enablePublishing=false
 group=org.mapfish.print
 version=1.0.0
 org.gradle.caching=true
+org.gradle.jvmargs=-Xmx6G -Xms4G

From 0d12e471f4dd5589b63f77c6c0b461be7042c2c3 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 5 Dec 2025 18:00:33 +0100
Subject: [PATCH 39/61] Fixed SingleTileLoaderTaskTest

---
 build.gradle                                  | 11 -----
 core/build.gradle                             |  1 +
 .../java/org/mapfish/print/ImageInit.java     |  2 +-
 .../java/org/mapfish/print/MapPrinter.java    |  2 +-
 .../java/org/mapfish/print/VersionInfo.java   |  4 +-
 .../mapfish/print/attribute/Attribute.java    |  2 +-
 .../print/attribute/DataSourceAttribute.java  |  4 +-
 .../attribute/JsonDatasourceAttribute.java    |  2 +-
 .../print/attribute/PrimitiveAttribute.java   |  2 +-
 .../print/attribute/ReflectiveAttribute.java  |  4 +-
 .../print/attribute/map/AreaOfInterest.java   |  2 +-
 .../print/attribute/map/MapAttribute.java     |  2 +-
 .../attribute/map/MapfishMapContext.java      |  4 +-
 .../mapfish/print/config/Configuration.java   |  6 +--
 .../print/config/ConfigurationFactory.java    |  2 +-
 .../org/mapfish/print/config/SmtpConfig.java  |  4 +-
 .../org/mapfish/print/config/Template.java    |  2 +-
 .../print/config/WorkingDirectories.java      |  4 +-
 .../config/access/AndAccessAssertion.java     |  2 +-
 .../config/access/RoleAccessAssertion.java    |  2 +-
 ...ConfigFileResolvingHttpRequestFactory.java |  2 +-
 .../http/ConfigFileResolvingRequest.java      |  2 +-
 .../http/ErrorResponseClientHttpResponse.java |  2 +-
 .../mapfish/print/http/HttpCredential.java    |  2 +-
 .../print/http/HttpRequestFetcher.java        |  4 +-
 .../http/MfClientHttpRequestFactoryImpl.java  | 45 ++++++++++---------
 .../print/map/MapLayerFactoryPlugin.java      |  2 +-
 .../java/org/mapfish/print/map/Scale.java     |  2 +-
 .../geotools/AbstractFeatureSourceLayer.java  |  2 +-
 .../print/map/geotools/CachingUrihandler.java |  2 +-
 .../print/map/geotools/FeatureLayer.java      |  2 +-
 .../map/geotools/FeatureSourceSupplier.java   |  2 +-
 .../print/map/geotools/FeaturesParser.java    |  2 +-
 .../print/map/geotools/GeoJsonLayer.java      |  2 +-
 .../print/map/geotools/GeotiffLayer.java      |  2 +-
 .../mapfish/print/map/geotools/GmlLayer.java  |  2 +-
 .../print/map/geotools/grid/GridLayer.java    |  2 +-
 .../map/geotools/grid/GridLayerPlugin.java    |  2 +-
 .../print/map/geotools/grid/GridUtils.java    |  2 +-
 .../map/geotools/grid/LineGridStrategy.java   |  2 +-
 .../map/image/AbstractSingleImageLayer.java   |  2 +-
 .../mapfish/print/map/image/ImageLayer.java   |  2 +-
 .../mapfish/print/map/image/wms/WmsLayer.java |  2 +-
 .../map/image/wms/WmsLayerFactoryPlugin.java  |  2 +-
 .../print/map/style/SLDParserPlugin.java      |  4 +-
 .../mapfish/print/map/style/StyleParser.java  |  2 +-
 .../print/map/style/StyleParserPlugin.java    |  4 +-
 .../map/style/json/JsonStyleParserHelper.java |  4 +-
 .../style/json/MapfishJsonStyleVersion1.java  |  4 +-
 .../style/json/MapfishJsonStyleVersion2.java  |  4 +-
 .../style/json/MapfishStyleParserPlugin.java  |  4 +-
 .../print/map/tiled/AbstractTiledLayer.java   |  4 +-
 .../mapfish/print/map/tiled/CoverageTask.java |  2 +-
 .../print/map/tiled/TileInformation.java      |  4 +-
 .../print/map/tiled/TilePreparationTask.java  |  2 +-
 .../mapfish/print/map/tiled/osm/OsmLayer.java |  2 +-
 .../map/tiled/osm/OsmLayerParserPlugin.java   |  2 +-
 .../print/map/tiled/wms/TiledWmsLayer.java    |  2 +-
 .../tiled/wms/TiledWmsLayerParserPlugin.java  |  2 +-
 .../print/map/tiled/wmts/WMTSLayer.java       |  4 +-
 .../map/tiled/wmts/WmtsLayerParserPlugin.java |  2 +-
 .../print/metrics/HealthCheckingRegistry.java |  2 +-
 .../print/metrics/JmxMetricsReporter.java     |  4 +-
 .../print/metrics/JvmMetricsConfigurator.java |  2 +-
 .../metrics/LoggingMetricsConfigurator.java   |  2 +-
 .../AbstractJasperReportOutputFormat.java     |  5 +--
 .../print/output/MapExportOutputFormat.java   |  2 +-
 .../output/MapfishPrintRepositoryService.java |  2 +-
 .../mapfish/print/output/OutputFormat.java    |  2 +-
 .../java/org/mapfish/print/output/Values.java |  4 +-
 .../mapfish/print/parser/OneOfTracker.java    |  2 +-
 .../org/mapfish/print/parser/ParserUtils.java |  2 +-
 .../print/processor/AbstractProcessor.java    |  2 +-
 .../print/processor/CustomDependencies.java   |  2 +-
 .../processor/PdfConfigurationProcessor.java  |  2 +-
 .../mapfish/print/processor/Processor.java    |  2 +-
 .../processor/ProcessorDependencyGraph.java   |  2 +-
 .../print/processor/ProcessorGraphNode.java   |  2 +-
 .../print/processor/ProcessorUtils.java       |  4 +-
 ...ractClientHttpRequestFactoryProcessor.java |  2 +-
 ...siteClientHttpRequestFactoryProcessor.java |  2 +-
 .../http/ForwardHeadersProcessor.java         |  2 +-
 .../http/matcher/InetHostMatcher.java         |  2 +-
 .../processor/jasper/DataSourceProcessor.java |  6 +--
 .../processor/jasper/DateFormatProcessor.java |  2 +-
 .../processor/jasper/LegendProcessor.java     |  2 +-
 .../jasper/MergeDataSourceProcessor.java      |  4 +-
 .../map/AddStaticLayersProcessor.java         |  2 +-
 .../map/CreateMapPagesProcessor.java          |  2 +-
 .../processor/map/CreateMapProcessor.java     |  6 +--
 .../print/servlet/MapPrinterServlet.java      | 11 ++---
 .../servlet/ServletMapPrinterFactory.java     |  6 +--
 .../fileloader/ConfigFileLoaderManager.java   |  2 +-
 .../servlet/job/HibernateAccounting.java      |  2 +-
 .../mapfish/print/servlet/job/PrintJob.java   |  4 +-
 .../job/impl/ThreadPoolJobManager.java        |  4 +-
 .../job/impl/hibernate/HibernateJobQueue.java |  4 +-
 .../job/impl/hibernate/PrintJobDao.java       |  4 +-
 .../impl/hibernate/PrintJobStatusExtImpl.java |  2 +-
 .../print/servlet/registry/BasicRegistry.java |  2 +-
 .../mapfish/print/TestHttpClientFactory.java  |  2 +-
 .../print/config/ConfigurationTest.java       |  2 +-
 .../ProcessorWithConfigurationInjection.java  |  2 +-
 .../config/ProcessorWithSpringInjection.java  |  2 +-
 .../map/tiled/SingleTileLoaderTaskTest.java   |  5 +--
 .../processor/AbstractProcessorTest.java      |  2 +-
 .../ProcessorDependencyGraphTest.java         | 30 +++++++------
 .../processor/ProcessorGraphNodeTest.java     | 31 ++++++-------
 .../http/AbstractHttpProcessorTest.java       |  2 +-
 .../http/AddHeadersProcessorTest.java         |  2 +-
 ...ClientHttpRequestFactoryProcessorTest.java |  2 +-
 .../http/ForwardHeadersProcessorTest.java     |  2 +-
 .../processor/http/MapUriProcessorTest.java   |  2 +-
 .../http/UseHttpForHttpsProcessorTest.java    |  2 +-
 .../map/CreateMapProcessorAoiTest.java        |  2 +-
 .../print/servlet/MapPrinterServletTest.java  |  6 +--
 116 files changed, 209 insertions(+), 214 deletions(-)

diff --git a/build.gradle b/build.gradle
index 81a689a59..1bbc1f50e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
 
 plugins {
   id("com.github.spotbugs") version "6.4.8"
-  id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -90,16 +89,6 @@ tasks.register('docs') {
     enabled = false
 }
 
-
-rewrite {
-    activeRecipe("org.openrewrite.java.testing.junit5.JUnit4to5Migration")
-    setExportDatatables(true)
-}
-
 repositories {
     mavenCentral()
 }
-
-dependencies {
-    rewrite("org.openrewrite.recipe:rewrite-spring:6.19.0")
-}
diff --git a/core/build.gradle b/core/build.gradle
index 8663907c3..f047f29a2 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -142,6 +142,7 @@ dependencies {
             'com.vladmihalcea:hibernate-types-52:2.21.1',
             'com.mchange:c3p0:0.11.2',
             'javax.media:jai-core:1.1.3',
+            'jakarta.annotation:jakarta.annotation-api:3.0.0'
     )
     metrics(
             'io.dropwizard.metrics:metrics-core:4.2.37',
diff --git a/core/src/main/java/org/mapfish/print/ImageInit.java b/core/src/main/java/org/mapfish/print/ImageInit.java
index 22dfa9037..a9391dc3a 100644
--- a/core/src/main/java/org/mapfish/print/ImageInit.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/MapPrinter.java b/core/src/main/java/org/mapfish/print/MapPrinter.java
index dc59d8e25..7c63d0228 100644
--- a/core/src/main/java/org/mapfish/print/MapPrinter.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/VersionInfo.java b/core/src/main/java/org/mapfish/print/VersionInfo.java
index 4ebeec81f..c7008d5ab 100644
--- a/core/src/main/java/org/mapfish/print/VersionInfo.java
+++ b/core/src/main/java/org/mapfish/print/VersionInfo.java
@@ -1,13 +1,13 @@
 package org.mapfish.print;
 
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 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;
diff --git a/core/src/main/java/org/mapfish/print/attribute/Attribute.java b/core/src/main/java/org/mapfish/print/attribute/Attribute.java
index 0019429e6..ac7a53b25 100644
--- a/core/src/main/java/org/mapfish/print/attribute/Attribute.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java
index 8cd37f7d2..414034fa3 100644
--- a/core/src/main/java/org/mapfish/print/attribute/DataSourceAttribute.java
+++ b/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;
diff --git a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java
index 89ab76b61..7637f4bbc 100644
--- a/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/JsonDatasourceAttribute.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.attribute;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.annotation.Nonnull;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.json.data.JsonDataSource;
 import org.json.JSONException;
diff --git a/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java b/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java
index e6efd495b..deb0e57aa 100644
--- a/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/PrimitiveAttribute.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.attribute;
 
+import jakarta.annotation.Nonnull;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;
diff --git a/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java b/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java
index 5dc08f2d4..8b81c7a60 100644
--- a/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/ReflectiveAttribute.java
@@ -3,6 +3,8 @@
 import static org.mapfish.print.parser.MapfishParser.stringRepresentation;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.PostConstruct;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
@@ -11,8 +13,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java b/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java
index 908b77a8c..a6ffdca1c 100644
--- a/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java
+++ b/core/src/main/java/org/mapfish/print/attribute/map/AreaOfInterest.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.attribute.map;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.data.simple.SimpleFeatureCollection;
diff --git a/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java b/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java
index ece30c7e0..b0d62b288 100644
--- a/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java
+++ b/core/src/main/java/org/mapfish/print/attribute/map/MapAttribute.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.attribute.map;
 
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.json.JSONArray;
diff --git a/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java b/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java
index 8f49dc173..71fc36ba1 100644
--- a/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java
+++ b/core/src/main/java/org/mapfish/print/attribute/map/MapfishMapContext.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.attribute.map;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.FloatingPointUtil;
 import org.mapfish.print.map.Scale;
diff --git a/core/src/main/java/org/mapfish/print/config/Configuration.java b/core/src/main/java/org/mapfish/print/config/Configuration.java
index c31069f69..3ab337396 100644
--- a/core/src/main/java/org/mapfish/print/config/Configuration.java
+++ b/core/src/main/java/org/mapfish/print/config/Configuration.java
@@ -1,5 +1,8 @@
 package org.mapfish.print.config;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -12,9 +15,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import org.geotools.api.filter.expression.Expression;
 import org.geotools.api.style.FeatureTypeStyle;
 import org.geotools.api.style.Fill;
diff --git a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
index 9cee27330..431f647bd 100644
--- a/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
+++ b/core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.config;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -8,7 +9,6 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core/src/main/java/org/mapfish/print/config/SmtpConfig.java b/core/src/main/java/org/mapfish/print/config/SmtpConfig.java
index 7684b1346..098e4fe5e 100644
--- a/core/src/main/java/org/mapfish/print/config/SmtpConfig.java
+++ b/core/src/main/java/org/mapfish/print/config/SmtpConfig.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.config;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * Email sending configuration.
diff --git a/core/src/main/java/org/mapfish/print/config/Template.java b/core/src/main/java/org/mapfish/print/config/Template.java
index a85e7dd1a..6dc914808 100644
--- a/core/src/main/java/org/mapfish/print/config/Template.java
+++ b/core/src/main/java/org/mapfish/print/config/Template.java
@@ -3,6 +3,7 @@
 import static org.mapfish.print.OptionalUtils.or;
 
 import com.google.common.collect.Sets;
+import jakarta.annotation.Nonnull;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -12,7 +13,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.geotools.api.style.Style;
 import org.json.JSONException;
 import org.json.JSONWriter;
diff --git a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
index 15a001739..9af155e58 100644
--- a/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
+++ b/core/src/main/java/org/mapfish/print/config/WorkingDirectories.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.config;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Date;
 import java.util.Objects;
-import javax.annotation.PostConstruct;
-import jakarta.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;
diff --git a/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java b/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java
index bf9fd3e11..c3fe86fa7 100644
--- a/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java
+++ b/core/src/main/java/org/mapfish/print/config/access/AndAccessAssertion.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.config.access;
 
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nonnull;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java b/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java
index c5607311b..ec61fe8ad 100644
--- a/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java
+++ b/core/src/main/java/org/mapfish/print/config/access/RoleAccessAssertion.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.config.access;
 
 import com.google.common.collect.Collections2;
+import jakarta.annotation.Nullable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import javax.annotation.Nullable;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java
index 737633d62..271ddb6c0 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactory.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import javax.annotation.Nonnull;
 import org.mapfish.print.config.Configuration;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpMethod;
diff --git a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
index 72f766eee..aae9dc958 100644
--- a/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
+++ b/core/src/main/java/org/mapfish/print/http/ConfigFileResolvingRequest.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +15,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index 37e85c438..a6ae2429a 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index cda3bbf32..e8bb16bce 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nullable;
 import java.net.MalformedURLException;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
index 3c72e5849..e8f384704 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -13,8 +15,6 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.io.IOUtils;
 import org.mapfish.print.StatsUtils;
 import org.mapfish.print.processor.Processor;
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 6610bef3f..bd8147d9c 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -1,5 +1,7 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -15,22 +17,20 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpEntityContainer;
 import org.apache.hc.core5.http.io.entity.ByteArrayEntity;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 import org.slf4j.Logger;
@@ -94,18 +94,19 @@ private static CloseableHttpClient createHttpClient(
             .build();
 
     final HttpClientBuilder httpClientBuilder =
-      HttpClients.custom()
-        .disableCookieManagement()
-        .setConnectionManager(PoolingHttpClientConnectionManagerBuilder.create()
-          .setTlsSocketStrategy(new MfTLSSocketStrategy())
-          .setDnsResolver(new RandomizingDnsResolver())
-          .setMaxConnPerRoute(maxConnTotal)
-          .setMaxConnPerRoute(maxConnPerRoute)
-          .build())
-        .setRoutePlanner(new MfRoutePlanner())
-        .setDefaultCredentialsProvider(new MfCredentialsProvider())
-        .setDefaultRequestConfig(requestConfig)
-        .setUserAgent(UserAgentCreator.getUserAgent());
+        HttpClients.custom()
+            .disableCookieManagement()
+            .setConnectionManager(
+                PoolingHttpClientConnectionManagerBuilder.create()
+                    .setTlsSocketStrategy(new MfTLSSocketStrategy())
+                    .setDnsResolver(new RandomizingDnsResolver())
+                    .setMaxConnPerRoute(maxConnTotal)
+                    .setMaxConnPerRoute(maxConnPerRoute)
+                    .build())
+            .setRoutePlanner(new MfRoutePlanner())
+            .setDefaultCredentialsProvider(new MfCredentialsProvider())
+            .setDefaultRequestConfig(requestConfig)
+            .setUserAgent(UserAgentCreator.getUserAgent());
     CloseableHttpClient closeableHttpClient = httpClientBuilder.build();
     LOGGER.debug(
         "Created CloseableHttpClient using connectionRequestTimeout: {} connectTimeout: {}"
@@ -216,7 +217,8 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
       for (Map.Entry<String, List<String>> entry : headers.headerSet()) {
         String headerName = entry.getKey();
         if (!headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.CONTENT_LENGTH)
-            && !headerName.equalsIgnoreCase(org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
+            && !headerName.equalsIgnoreCase(
+                org.apache.hc.core5.http.HttpHeaders.TRANSFER_ENCODING)) {
           for (String headerValue : entry.getValue()) {
             this.request.addHeader(headerName, headerValue);
           }
@@ -224,7 +226,8 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
       }
       if (this.request instanceof HttpEntityContainer entityEnclosingRequest) {
         var bytes = this.outputStream.toByteArray();
-        final HttpEntity requestEntity = new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
+        final HttpEntity requestEntity =
+            new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
         entityEnclosingRequest.setEntity(requestEntity);
       }
 
@@ -299,7 +302,7 @@ public HttpHeaders getHeaders() {
       final HttpHeaders translatedHeaders = new HttpHeaders();
       final Header[] allHeaders = this.response.getHeaders();
       for (Header header : allHeaders) {
-          translatedHeaders.add(header.getName(), header.getValue());
+        translatedHeaders.add(header.getName(), header.getValue());
       }
       return translatedHeaders;
     }
diff --git a/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java b/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java
index f3ae25c4f..42ce8b972 100644
--- a/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/MapLayerFactoryPlugin.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.mapfish.print.attribute.map.MapLayer;
 import org.mapfish.print.config.Template;
 
diff --git a/core/src/main/java/org/mapfish/print/map/Scale.java b/core/src/main/java/org/mapfish/print/map/Scale.java
index ea3137f36..78e050469 100644
--- a/core/src/main/java/org/mapfish/print/map/Scale.java
+++ b/core/src/main/java/org/mapfish/print/map/Scale.java
@@ -2,7 +2,7 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.MathTransform;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java
index 2b2ee847a..c1787f25a 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/AbstractFeatureSourceLayer.java
@@ -2,10 +2,10 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.api.style.Style;
 import org.geotools.data.DataUtilities;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java b/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java
index ece6e1a2d..daf5704a4 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/CachingUrihandler.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -7,7 +8,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Map;
-import javax.annotation.PostConstruct;
 import org.eclipse.emf.common.util.URI;
 import org.geotools.xml.resolver.SchemaCache;
 import org.geotools.xml.resolver.SchemaResolver;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java
index fcffa589f..c94775349 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeatureLayer.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.data.collection.CollectionFeatureSource;
 import org.geotools.data.simple.SimpleFeatureCollection;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java b/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java
index 36df9951c..174ababd3 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeatureSourceSupplier.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.map.geotools;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.mapfish.print.attribute.map.MapfishMapContext;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
index 5ce2466d1..bc316044f 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/FeaturesParser.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.map.geotools;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -10,7 +11,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.apache.commons.io.IOUtils;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.FactoryException;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java
index e926f6e5f..ab47bbc9c 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/GeoJsonLayer.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.data.collection.CollectionFeatureSource;
 import org.geotools.data.simple.SimpleFeatureCollection;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java
index 498e1b1f1..18a383ace 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/GeotiffLayer.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -11,7 +12,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
 import org.apache.commons.io.IOUtils;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geotools.api.style.Style;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java
index fc38c5dc6..b8fb292ed 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/GmlLayer.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.MalformedURLException;
@@ -7,7 +8,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
 import org.eclipse.emf.ecore.resource.URIHandler;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java
index 449bd1f8d..c7bf182a9 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayer.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
@@ -13,7 +14,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.geotools.map.Layer;
 import org.mapfish.print.Constants;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java
index 8c6bb15f7..5dd5f0fa5 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridLayerPlugin.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
+import jakarta.annotation.Nonnull;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.api.data.FeatureSource;
 import org.mapfish.print.OptionalUtils;
 import org.mapfish.print.config.Template;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java
index 5b62379c6..4bc97c785 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridUtils.java
@@ -5,8 +5,8 @@
 import static org.mapfish.print.map.geotools.grid.GridLabel.Side.RIGHT;
 import static org.mapfish.print.map.geotools.grid.GridLabel.Side.TOP;
 
+import jakarta.annotation.Nonnull;
 import java.awt.geom.AffineTransform;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.MathTransform;
diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java
index 51dd7d654..0a54095a6 100644
--- a/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java
+++ b/core/src/main/java/org/mapfish/print/map/geotools/grid/LineGridStrategy.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.map.geotools.grid;
 
+import jakarta.annotation.Nonnull;
 import java.awt.geom.AffineTransform;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
diff --git a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
index 69489e24c..911c4188e 100644
--- a/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/AbstractSingleImageLayer.java
@@ -4,6 +4,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
@@ -13,7 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import javax.imageio.ImageIO;
 import org.apache.commons.io.IOUtils;
 import org.geotools.api.style.Style;
diff --git a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java
index 6aa5cba30..1c3b3d768 100644
--- a/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/ImageLayer.java
@@ -3,6 +3,7 @@
 import static java.awt.image.BufferedImage.TYPE_INT_ARGB_PRE;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
@@ -15,7 +16,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.style.Style;
 import org.geotools.coverage.CoverageFactoryFinder;
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java
index e94e1875b..3326269a8 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayer.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map.image.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.ExecutorService;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.attribute.map.MapfishMapContext;
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java
index 2a1cccbee..2de342977 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsLayerFactoryPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.image.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java
index 2ce1680ff..6477d1278 100644
--- a/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/style/SLDParserPlugin.java
@@ -1,5 +1,7 @@
 package org.mapfish.print.map.style;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URI;
@@ -9,8 +11,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/core/src/main/java/org/mapfish/print/map/style/StyleParser.java b/core/src/main/java/org/mapfish/print/map/style/StyleParser.java
index 36b827a0d..2f54c401e 100644
--- a/core/src/main/java/org/mapfish/print/map/style/StyleParser.java
+++ b/core/src/main/java/org/mapfish/print/map/style/StyleParser.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.map.style;
 
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nonnull;
 import org.geotools.api.style.Style;
 import org.geotools.api.style.StyleFactory;
 import org.geotools.api.style.StyledLayerDescriptor;
diff --git a/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java
index 5c3c9c440..0c6ceeacb 100644
--- a/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/style/StyleParserPlugin.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.map.style;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.api.style.Style;
 import org.mapfish.print.config.Configuration;
 import org.springframework.http.client.ClientHttpRequestFactory;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java b/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java
index a5ef7a12f..4ef633223 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/JsonStyleParserHelper.java
@@ -4,6 +4,8 @@
 import static org.springframework.http.HttpMethod.HEAD;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
@@ -19,8 +21,6 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
 import org.apache.commons.lang3.StringUtils;
 import org.geotools.api.filter.expression.Expression;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java
index 94d65cb81..683aa9173 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion1.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.map.style.json;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.geotools.api.filter.Filter;
 import org.geotools.api.filter.expression.Expression;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java
index 9bb543ec8..e6b36abc4 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishJsonStyleVersion2.java
@@ -1,6 +1,8 @@
 package org.mapfish.print.map.style.json;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -8,8 +10,6 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.api.filter.Filter;
 import org.geotools.api.style.Rule;
 import org.geotools.api.style.Style;
diff --git a/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java b/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java
index 1d895180f..72884630a 100644
--- a/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/style/json/MapfishStyleParserPlugin.java
@@ -2,9 +2,9 @@
 
 import static org.mapfish.print.map.style.json.MapfishJsonStyleVersion1.DEFAULT_GEOM_ATT_NAME;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Optional;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.api.style.Style;
 import org.geotools.styling.StyleBuilder;
 import org.json.JSONObject;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java
index e4c4bed51..8ca1c7571 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/AbstractTiledLayer.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.map.tiled;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Rectangle;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.map.GridCoverageLayer;
 import org.geotools.map.Layer;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
index c57241b4c..1ad8f87dc 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
@@ -2,6 +2,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -10,7 +11,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.Callable;
 import java.util.concurrent.RecursiveTask;
-import javax.annotation.Nonnull;
 import javax.imageio.ImageIO;
 import org.apache.commons.io.IOUtils;
 import org.geotools.coverage.CoverageFactoryFinder;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java b/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java
index 2fec94e09..e50965693 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/TileInformation.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.map.tiled;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.net.URISyntaxException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.locationtech.jts.geom.Coordinate;
 import org.mapfish.print.attribute.map.MapBounds;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java b/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java
index 9598c551f..7532227bb 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/TilePreparationTask.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.tiled;
 
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.geom.AffineTransform;
@@ -7,7 +8,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Callable;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.geotools.api.referencing.operation.MathTransform;
 import org.geotools.api.referencing.operation.TransformException;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java
index 9fa4c3eed..02d4ea2ba 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.map.tiled.osm;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.URIUtils;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java
index f2261c444..f32eaef71 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayerParserPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled.osm;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java
index 34f7076b4..ac88c2d37 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.map.tiled.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java
index 1f3a51279..8daee4965 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayerParserPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled.wms;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java
index 774c56521..b155c8171 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WMTSLayer.java
@@ -4,14 +4,14 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.mapfish.print.attribute.map.MapBounds;
diff --git a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java
index 8209d0bb0..9b5f3dca0 100644
--- a/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java
+++ b/core/src/main/java/org/mapfish/print/map/tiled/wmts/WmtsLayerParserPlugin.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.map.tiled.wmts;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.mapfish.print.config.Template;
 import org.mapfish.print.map.MapLayerFactoryPlugin;
diff --git a/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java b/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java
index ed5ac7b1e..4a43550e7 100644
--- a/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java
+++ b/core/src/main/java/org/mapfish/print/metrics/HealthCheckingRegistry.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.metrics;
 
 import com.codahale.metrics.health.jvm.ThreadDeadlockHealthCheck;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class HealthCheckingRegistry extends com.codahale.metrics.health.HealthCheckRegistry {
diff --git a/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java b/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java
index 6118faff2..c320ea18d 100644
--- a/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java
+++ b/core/src/main/java/org/mapfish/print/metrics/JmxMetricsReporter.java
@@ -2,8 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.jmx.JmxReporter;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** This bean will enable JMX reporting when added to application context. */
diff --git a/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java b/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java
index 673af87a6..37add71ce 100644
--- a/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java
+++ b/core/src/main/java/org/mapfish/print/metrics/JvmMetricsConfigurator.java
@@ -5,7 +5,7 @@
 import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** A bean that will add several gauges and metric sets for tracking the JVM stats. */
diff --git a/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java b/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java
index c38992288..178729b6c 100644
--- a/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java
+++ b/core/src/main/java/org/mapfish/print/metrics/LoggingMetricsConfigurator.java
@@ -4,7 +4,7 @@
 import ch.qos.logback.classic.LoggerContext;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.logback.InstrumentedAppender;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
index 2597ef7e5..ad53cc831 100644
--- a/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
+++ b/core/src/main/java/org/mapfish/print/output/AbstractJasperReportOutputFormat.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.output;
 
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Nonnull;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -21,8 +22,6 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnegative;
-import javax.annotation.Nonnull;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -442,6 +441,6 @@ public record Print(
       @Nonnull JasperReportsContext context,
       @Nonnull JasperPrint print,
       @Nonnull Values values,
-      @Nonnegative double dpi,
+      double dpi,
       @Nonnull Processor.ExecutionContext executionContext) {}
 }
diff --git a/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java b/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java
index 893144bd1..29c7b1672 100644
--- a/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java
+++ b/core/src/main/java/org/mapfish/print/output/MapExportOutputFormat.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.output;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.OutputStream;
@@ -11,7 +12,6 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
 import org.apache.commons.io.IOUtils;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java b/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java
index d4b6a6c2c..87cd09679 100644
--- a/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java
+++ b/core/src/main/java/org/mapfish/print/output/MapfishPrintRepositoryService.java
@@ -1,12 +1,12 @@
 package org.mapfish.print.output;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.annotation.Nonnull;
 import net.sf.jasperreports.engine.DefaultJasperReportsContext;
 import net.sf.jasperreports.engine.JasperReportsContext;
 import net.sf.jasperreports.repo.FileRepositoryService;
diff --git a/core/src/main/java/org/mapfish/print/output/OutputFormat.java b/core/src/main/java/org/mapfish/print/output/OutputFormat.java
index 7c10c87ac..32cafe532 100644
--- a/core/src/main/java/org/mapfish/print/output/OutputFormat.java
+++ b/core/src/main/java/org/mapfish/print/output/OutputFormat.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.output;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.OutputStream;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.Processor;
 import org.mapfish.print.wrapper.json.PJsonObject;
diff --git a/core/src/main/java/org/mapfish/print/output/Values.java b/core/src/main/java/org/mapfish/print/output/Values.java
index 3641c4d92..872f29a83 100644
--- a/core/src/main/java/org/mapfish/print/output/Values.java
+++ b/core/src/main/java/org/mapfish/print/output/Values.java
@@ -2,6 +2,8 @@
 
 import static org.mapfish.print.servlet.MapPrinterServlet.JSON_REQUEST_HEADERS;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,8 +14,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.ExtraPropertyException;
 import org.mapfish.print.attribute.Attribute;
diff --git a/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java b/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java
index 2d3bb37e1..997524a1c 100644
--- a/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java
+++ b/core/src/main/java/org/mapfish/print/parser/OneOfTracker.java
@@ -1,6 +1,7 @@
 package org.mapfish.print.parser;
 
 import com.google.common.collect.Collections2;
+import jakarta.annotation.Nonnull;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,7 +9,6 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
 import org.locationtech.jts.util.Assert;
 
 /** Keeps track of which OneOf groups there are and which ones are satisfied. */
diff --git a/core/src/main/java/org/mapfish/print/parser/ParserUtils.java b/core/src/main/java/org/mapfish/print/parser/ParserUtils.java
index c77c60e3d..dc51d4ae9 100644
--- a/core/src/main/java/org/mapfish/print/parser/ParserUtils.java
+++ b/core/src/main/java/org/mapfish/print/parser/ParserUtils.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.parser;
 
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -8,7 +9,6 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
 
 /** Utility method for getting and setting parameters on Processor Input and Output objects. */
 public final class ParserUtils {
diff --git a/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java b/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java
index 7ba05c773..3e4de0268 100644
--- a/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/AbstractProcessor.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import jakarta.annotation.Nonnull;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -11,7 +12,6 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
-import javax.annotation.Nonnull;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationException;
 import org.mapfish.print.parser.ParserUtils;
diff --git a/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java b/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java
index f31b83694..38104f53f 100644
--- a/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java
+++ b/core/src/main/java/org/mapfish/print/processor/CustomDependencies.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor;
 
+import jakarta.annotation.Nonnull;
 import java.util.Collection;
-import javax.annotation.Nonnull;
 
 /**
  * Classes that implement this interface indicate what she dynamically depends on, for the "values"
diff --git a/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java b/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java
index ad67de019..c13324421 100644
--- a/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/PdfConfigurationProcessor.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.processor;
 
+import jakarta.annotation.Nullable;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -9,7 +10,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationException;
 import org.mapfish.print.config.ConfigurationObject;
diff --git a/core/src/main/java/org/mapfish/print/processor/Processor.java b/core/src/main/java/org/mapfish/print/processor/Processor.java
index ce28a81b7..114acf8d7 100644
--- a/core/src/main/java/org/mapfish/print/processor/Processor.java
+++ b/core/src/main/java/org/mapfish/print/processor/Processor.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.processor;
 
 import com.google.common.collect.BiMap;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.ConfigurationObject;
 
 /**
diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java b/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java
index 817b7243c..c0b01027e 100644
--- a/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java
+++ b/core/src/main/java/org/mapfish/print/processor/ProcessorDependencyGraph.java
@@ -6,6 +6,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import jakarta.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.IdentityHashMap;
@@ -13,7 +14,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.RecursiveTask;
-import javax.annotation.Nonnull;
 import org.mapfish.print.output.Values;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java b/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java
index a13fe11fb..d4b14a3ef 100644
--- a/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java
+++ b/core/src/main/java/org/mapfish/print/processor/ProcessorGraphNode.java
@@ -4,6 +4,7 @@
 import com.codahale.metrics.Timer;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import jakarta.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Objects;
@@ -11,7 +12,6 @@
 import java.util.Set;
 import java.util.concurrent.RecursiveTask;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.output.Values;
diff --git a/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java b/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java
index 55d8eed57..4c2e5918d 100644
--- a/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java
+++ b/core/src/main/java/org/mapfish/print/processor/ProcessorUtils.java
@@ -3,14 +3,14 @@
 import static org.mapfish.print.parser.ParserUtils.getAllAttributes;
 
 import com.google.common.collect.BiMap;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.output.Values;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java
index c265df5c2..188d8aacc 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/AbstractClientHttpRequestFactoryProcessor.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.processor.http;
 
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.http.matcher.URIMatcher;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java
index 1bab0132e..0a1c847e2 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessor.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor.http;
 
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
 import org.mapfish.print.output.Values;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java b/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java
index e46d85fd1..52fb3090a 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/ForwardHeadersProcessor.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.http;
 
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
 import org.mapfish.print.attribute.HttpRequestHeadersAttribute;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.MfClientHttpRequestFactory;
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java
index 15572ac50..252f170bb 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/InetHostMatcher.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.processor.http.matcher;
 
+import jakarta.annotation.Nullable;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.SocketException;
@@ -7,7 +8,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java
index d8478be55..7aadcb503 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/DataSourceProcessor.java
@@ -2,6 +2,9 @@
 
 import static org.mapfish.print.attribute.DataSourceAttribute.DataSourceAttributeValue;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,9 +14,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ForkJoinTask;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JRException;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java
index 1fd7c8b37..71c388ecf 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/DateFormatProcessor.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.processor.jasper;
 
+import jakarta.annotation.Nullable;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
-import javax.annotation.Nullable;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationException;
 import org.mapfish.print.parser.HasDefaultValue;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
index 200435373..62677e4df 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/LegendProcessor.java
@@ -3,6 +3,7 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.Resource;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -20,7 +21,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.Future;
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.data.JRTableModelDataSource;
diff --git a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
index f563f4d67..dae93b4b9 100644
--- a/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/jasper/MergeDataSourceProcessor.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.processor.jasper;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.data.JRMapCollectionDataSource;
diff --git a/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java
index 9955a3626..dfb36c87d 100644
--- a/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/map/AddStaticLayersProcessor.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.processor.map;
 
+import jakarta.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.attribute.map.GenericMapAttribute.GenericMapAttributeValues;
 import org.mapfish.print.attribute.map.StaticLayersAttribute;
 import org.mapfish.print.config.Configuration;
diff --git a/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java
index 53f845742..e4cae4dee 100644
--- a/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/map/CreateMapPagesProcessor.java
@@ -2,13 +2,13 @@
 
 import static org.mapfish.print.Constants.PDF_DPI;
 
+import jakarta.annotation.Nonnull;
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
 import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
diff --git a/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java b/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java
index 2fd560fda..9a704c7ce 100644
--- a/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java
+++ b/core/src/main/java/org/mapfish/print/processor/map/CreateMapProcessor.java
@@ -10,6 +10,9 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.Resource;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -32,9 +35,6 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index c0dbc0a37..d5ba140c8 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -7,6 +7,10 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
 import io.sentry.Sentry;
+import jakarta.annotation.Nonnull;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -30,10 +34,6 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jasperreports.engine.fonts.FontFamily;
 import net.sf.jasperreports.extensions.ExtensionsEnvironment;
 import org.apache.commons.io.FilenameUtils;
@@ -1174,7 +1174,8 @@ private boolean checkReferer(final HttpServletRequest request, final MapPrinter
       referrer = "http://localhost/";
     }
     try {
-      return allowedReferers.matches(new URI(referrer), HttpMethod.valueOf(request.getMethod().toUpperCase(Locale.ROOT)));
+      return allowedReferers.matches(
+          new URI(referrer), HttpMethod.valueOf(request.getMethod().toUpperCase(Locale.ROOT)));
     } catch (SocketException
         | UnknownHostException
         | URISyntaxException
diff --git a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java
index 80ab86f0b..c8802a777 100644
--- a/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java
+++ b/core/src/main/java/org/mapfish/print/servlet/ServletMapPrinterFactory.java
@@ -2,6 +2,9 @@
 
 import static java.nio.file.Files.walk;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -16,9 +19,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import org.apache.commons.lang3.StringUtils;
 import org.locationtech.jts.util.Assert;
 import org.mapfish.print.MapPrinter;
diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java
index 467d6971b..65df55931 100644
--- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java
+++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ConfigFileLoaderManager.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -12,7 +13,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** Processes all {@link ConfigFileLoaderPlugin}s and loads the files. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
index 8c8845d18..22cba9cf9 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.servlet.job;
 
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
index ed3ab575c..4c921e1c6 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -14,8 +16,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.mail.Authenticator;
 import javax.mail.Message;
 import javax.mail.MessagingException;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
index bb785e312..086caa369 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
@@ -2,6 +2,8 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
@@ -21,8 +23,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import org.mapfish.print.ExceptionUtils;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.config.WorkingDirectories;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java
index 84563a279..565ba256a 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/HibernateJobQueue.java
@@ -2,12 +2,12 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;
 import org.mapfish.print.servlet.job.JobQueue;
 import org.mapfish.print.servlet.job.NoSuchReferenceException;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index 2264259f7..da25e85c7 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -1,11 +1,11 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaDelete;
 import javax.persistence.criteria.CriteriaQuery;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
index a8ddc080c..f5a7b3554 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
@@ -1,6 +1,6 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import org.mapfish.print.servlet.job.PrintJobEntry;
diff --git a/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java b/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java
index ceb59ae41..3fadd70c4 100644
--- a/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/registry/BasicRegistry.java
@@ -2,9 +2,9 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import jakarta.annotation.PostConstruct;
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
 import org.json.JSONObject;
 
 /**
diff --git a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
index 9119c352b..5a46fa166 100644
--- a/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
+++ b/core/src/test/java/org/mapfish/print/TestHttpClientFactory.java
@@ -1,12 +1,12 @@
 package org.mapfish.print;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
-import javax.annotation.Nonnull;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.http.ConfigurableRequest;
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
index 093cc5d9f..6727d2591 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationTest.java
@@ -2,13 +2,13 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import jakarta.annotation.Nullable;
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
 import org.geotools.api.style.FeatureTypeStyle;
 import org.geotools.api.style.LineSymbolizer;
 import org.geotools.api.style.PointSymbolizer;
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
index 9e4439be4..dbcf0222a 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithConfigurationInjection.java
@@ -2,8 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.processor.AbstractProcessor;
 
 /** Processor that needs the configuration object injected. */
diff --git a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
index 2faf7f115..e26506c00 100644
--- a/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
+++ b/core/src/test/java/org/mapfish/print/config/ProcessorWithSpringInjection.java
@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
index dc2483cef..0109ab2a2 100644
--- a/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/map/tiled/SingleTileLoaderTaskTest.java
@@ -18,6 +18,7 @@
 import org.mapfish.print.PrintException;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.processor.Processor;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 
@@ -86,9 +87,7 @@ public void testComputeWithUnsupportedStatusCode() throws IOException, URISyntax
 
   private ClientHttpResponse getMockResponse(int rawStatusCode) throws IOException {
     ClientHttpResponse response = mock(ClientHttpResponse.class);
-    when(response.getStatusCode().value()).thenReturn(rawStatusCode);
-    when(response.getStatusCode())
-        .thenThrow(new RuntimeException("Unsupported status code has no HttpStatus"));
+    when(response.getStatusCode()).thenReturn(HttpStatusCode.valueOf(rawStatusCode));
     when(response.getBody()).thenReturn(new ByteArrayInputStream(new byte[0]));
     when(response.getHeaders()).thenReturn(new org.springframework.http.HttpHeaders());
     return response;
diff --git a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
index 56a1f2bb2..1cea245c8 100644
--- a/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/AbstractProcessorTest.java
@@ -3,9 +3,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
index 08ceb8bb2..6ba9480a0 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphTest.java
@@ -4,9 +4,9 @@
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
 import com.codahale.metrics.MetricRegistry;
+import jakarta.annotation.Nullable;
 import java.util.HashMap;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
@@ -71,19 +71,21 @@ public void testCreateTaskAllDependenciesAreSatisfied() {
 
   @Test
   public void testCreateTaskAllDependenciesAreMissing() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      Values values = new Values();
-      // this is a misconfiguration prop should be pp thus an exception should be thrown below.
-      values.put("prop", "value");
-      values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
-
-      final TestProcessor processor = new TestProcessor("p");
-      processor.getInputMapperBiMap().put("pp", "prop");
-
-      final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
-      graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
-      graph.createTask(values);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          Values values = new Values();
+          // this is a misconfiguration prop should be pp thus an exception should be thrown below.
+          values.put("prop", "value");
+          values.put(Values.MDC_CONTEXT_KEY, new HashMap<>());
+
+          final TestProcessor processor = new TestProcessor("p");
+          processor.getInputMapperBiMap().put("pp", "prop");
+
+          final ProcessorDependencyGraph graph = new ProcessorDependencyGraph();
+          graph.addRoot(new ProcessorGraphNode(processor, new MetricRegistry()));
+          graph.createTask(values);
+        });
   }
 
   static class TestIn {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
index 63eb92005..3679f15dc 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorGraphNodeTest.java
@@ -2,9 +2,9 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import jakarta.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.output.Values;
@@ -43,20 +43,21 @@ public void testPopulateInputParameter() {
 
   @Test
   public void testNullableProperty() {
-    assertThrows(RuntimeException.class, () -> {
-
-      Values values = new Values();
-      values.put(iMappingName, intVal);
-      values.put(bMappingName, true);
-      values.put("s", sVal);
-      values.put("ls", lsVal);
-      // NO da value is specified so an exception should be thrown.
-
-      TestProcessor processor = new TestProcessor();
-      processor.getInputMapperBiMap().put(iMappingName, "i");
-      processor.getInputMapperBiMap().put(bMappingName, "b");
-      ProcessorUtils.populateInputParameter(processor, values);
-    });
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          Values values = new Values();
+          values.put(iMappingName, intVal);
+          values.put(bMappingName, true);
+          values.put("s", sVal);
+          values.put("ls", lsVal);
+          // NO da value is specified so an exception should be thrown.
+
+          TestProcessor processor = new TestProcessor();
+          processor.getInputMapperBiMap().put(iMappingName, "i");
+          processor.getInputMapperBiMap().put(bMappingName, "b");
+          ProcessorUtils.populateInputParameter(processor, values);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
index eb60953fc..b601031cb 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AbstractHttpProcessorTest.java
@@ -3,12 +3,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.junit.jupiter.api.Test;
 import org.mapfish.print.AbstractMapfishSpringTest;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
index a9f6a1b4a..4ab96fefe 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/AddHeadersProcessorTest.java
@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
-import javax.annotation.Nullable;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
index 208d8db5b..07159fba8 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/CompositeClientHttpRequestFactoryProcessorTest.java
@@ -4,9 +4,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.HashMap;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mapfish.print.attribute.HttpRequestHeadersAttribute;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
index c83fbc2ad..d14300bb8 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/ForwardHeadersProcessorTest.java
@@ -4,9 +4,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mapfish.print.output.Values.MDC_CONTEXT_KEY;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
 import java.util.HashMap;
-import javax.annotation.Nullable;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
index d66ec6da8..730e1c848 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/MapUriProcessorTest.java
@@ -2,8 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.annotation.Nullable;
 import java.net.URI;
-import javax.annotation.Nullable;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
index dde34ba27..c8a73ede4 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/UseHttpForHttpsProcessorTest.java
@@ -2,10 +2,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.annotation.Nullable;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
index 560d38af6..fa1794fea 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorAoiTest.java
@@ -5,6 +5,7 @@
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.CLIP;
 import static org.mapfish.print.attribute.map.AreaOfInterest.AoiDisplay.RENDER;
 
+import jakarta.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -15,7 +16,6 @@
 import java.util.concurrent.ForkJoinTask;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
 import org.apache.batik.transcoder.TranscoderException;
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
index 4379f61d4..c60006f21 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletTest.java
@@ -5,6 +5,9 @@
 
 import de.saly.javamail.mock2.MailboxFolder;
 import de.saly.javamail.mock2.MockMailbox;
+import jakarta.annotation.Nullable;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -16,15 +19,12 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import javax.annotation.Nullable;
 import javax.mail.Address;
 import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.Multipart;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeMultipart;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;

From 8c88f7d6539195dabb920775a3e3e6b832dd3f16 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 8 Dec 2025 10:03:26 +0100
Subject: [PATCH 40/61] Migrated to Hibernate 6.6 using OpenRewrite

---
 build.gradle                                  |  13 +-
 core/build.gradle                             |   4 +-
 .../servlet/job/HibernateAccountingEntry.java |  26 +-
 .../servlet/job/impl/PrintJobEntryImpl.java   |  11 +-
 .../servlet/job/impl/PrintJobResultImpl.java  |  32 +-
 .../servlet/job/impl/PrintJobStatusImpl.java  |  26 +-
 .../job/impl/ThreadPoolJobManager.java        |   2 +-
 .../hibernate/AccessAssertionUserType.java    |  41 +-
 .../impl/hibernate/PJsonObjectUserType.java   |  42 +-
 .../job/impl/hibernate/PrintJobDao.java       |  12 +-
 .../impl/hibernate/PrintJobResultExtImpl.java |   6 +-
 .../impl/hibernate/PrintJobStatusExtImpl.java |   4 +-
 .../java/org/mapfish/print/ExamplesTest.java  | 821 +++++++++---------
 13 files changed, 517 insertions(+), 523 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1bbc1f50e..002bf8d0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
 
 plugins {
   id("com.github.spotbugs") version "6.4.8"
+    id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -65,7 +66,8 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 
     dependencies {
         testImplementation(
-                'org.mockito:mockito-core:5.21.0',
+            'org.junit.jupiter:junit-jupiter:6.0.1',
+            'org.mockito:mockito-core:5.20.0',
         )
     }
 
@@ -92,3 +94,12 @@ tasks.register('docs') {
 repositories {
     mavenCentral()
 }
+
+rewrite {
+    activeRecipe("org.openrewrite.hibernate.MigrateToHibernate66")
+    setExportDatatables(true)
+}
+
+dependencies {
+    rewrite("org.openrewrite.recipe:rewrite-hibernate:2.16.0")
+}
diff --git a/core/build.gradle b/core/build.gradle
index f047f29a2..f16b3c3ad 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -137,9 +137,9 @@ dependencies {
             '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.hibernate:hibernate-core:6.6.38.Final',
             'org.postgresql:postgresql:42.7.8',
-            'com.vladmihalcea:hibernate-types-52:2.21.1',
+            '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'
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
index 0d79057ab..fcfee8621 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
@@ -1,16 +1,12 @@
 package org.mapfish.print.servlet.job;
 
-import tools.jackson.databind.node.ObjectNode;
-import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.processor.ExecutionStats;
@@ -20,26 +16,22 @@
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import tools.jackson.databind.node.ObjectNode;
 
 /** Entity for the print_accountings table. */
 @Entity
 @Table(name = "print_accountings")
-@TypeDef(name = "jsonb-node", typeClass = JsonBinaryType.class, defaultForType = ObjectNode.class)
 public class HibernateAccountingEntry {
   private static final Logger LOGGER = LoggerFactory.getLogger(HibernateAccountingEntry.class);
 
   @Id
   @Column(name = "reference_id")
-  @Type(type = "org.hibernate.type.TextType")
   private String referenceId;
 
   @Column(nullable = false, name = "app_id")
-  @Type(type = "org.hibernate.type.TextType")
   private String appId;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private String referrer;
+  @Column private String referrer;
 
   @Column(nullable = false)
   @Enumerated(EnumType.STRING)
@@ -55,11 +47,9 @@ public class HibernateAccountingEntry {
   private long totalTimeMS;
 
   @Column(nullable = false, name = "output_format")
-  @Type(type = "org.hibernate.type.TextType")
   private String outputFormat;
 
   @Column(nullable = false)
-  @Type(type = "org.hibernate.type.TextType")
   private String layout;
 
   @Column(name = "file_size")
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
index 3cb616e41..7940c00fc 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet.job.impl;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
 import org.hibernate.annotations.Type;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.Template;
@@ -11,6 +11,8 @@
 import org.mapfish.print.servlet.MapPrinterServlet;
 import org.mapfish.print.servlet.ServletMapPrinterFactory;
 import org.mapfish.print.servlet.job.PrintJobEntry;
+import org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType;
+import org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.springframework.context.ApplicationContext;
 
@@ -19,17 +21,16 @@
 public class PrintJobEntryImpl implements PrintJobEntry {
 
   @Column(insertable = false, updatable = false)
-  @Type(type = "org.hibernate.type.TextType")
   private String referenceId;
 
   @Column()
-  @Type(type = "org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType")
+  @Type(PJsonObjectUserType.class)
   private PJsonObject requestData;
 
   @Column private long startTime;
 
   @Column()
-  @Type(type = "org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType")
+  @Type(AccessAssertionUserType.class)
   private AccessAssertion access;
 
   /** Constructor. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
index 906b0bdee..afae27063 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
@@ -1,17 +1,16 @@
 package org.mapfish.print.servlet.job.impl;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
-import org.hibernate.annotations.Type;
 import org.mapfish.print.PrintException;
 import org.mapfish.print.servlet.job.PrintJobResult;
 import org.mapfish.print.servlet.job.PrintJobStatus;
@@ -21,21 +20,13 @@
 @Table(name = "print_job_results")
 public class PrintJobResultImpl implements PrintJobResult {
 
-  @Id
-  @Type(type = "org.hibernate.type.TextType")
-  private final String reportURI;
+  @Id private final String reportURI;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private final String mimeType;
+  @Column private final String mimeType;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private final String fileExtension;
+  @Column private final String fileExtension;
 
-  @Column
-  @Type(type = "org.hibernate.type.TextType")
-  private final String fileName;
+  @Column private final String fileName;
 
   @OneToOne(targetEntity = PrintJobStatusImpl.class, fetch = FetchType.LAZY)
   @OnDelete(action = OnDeleteAction.CASCADE)
@@ -43,7 +34,6 @@ public class PrintJobResultImpl implements PrintJobResult {
   private PrintJobStatus status = null;
 
   @Column(insertable = true, updatable = true)
-  @Type(type = "org.hibernate.type.TextType")
   private String referenceId;
 
   /** Default Constructor. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index 76608b34c..a97ef0e78 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -1,18 +1,17 @@
 package org.mapfish.print.servlet.job.impl;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.util.Date;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
 import org.hibernate.annotations.Target;
-import org.hibernate.annotations.Type;
 import org.mapfish.print.config.access.AccessAssertion;
 import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.PrintJobResult;
@@ -26,9 +25,7 @@ public class PrintJobStatusImpl implements PrintJobStatus {
   @Target(PrintJobEntryImpl.class)
   private final PrintJobEntry entry;
 
-  @Id
-  @Type(type = "org.hibernate.type.TextType")
-  private String referenceId;
+  @Id private String referenceId;
 
   @Column
   @Enumerated(EnumType.STRING)
@@ -38,7 +35,6 @@ public class PrintJobStatusImpl implements PrintJobStatus {
 
   @Column private long requestCount;
 
-  @Type(type = "org.hibernate.type.TextType")
   private String error;
 
   @OneToOne(targetEntity = PrintJobResultImpl.class, cascade = CascadeType.ALL, mappedBy = "status")
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
index 086caa369..08344cece 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
@@ -638,7 +638,7 @@ public void run() {
             }
           }
         }
-      } catch (javax.persistence.PessimisticLockException e) {
+      } catch (jakarta.persistence.PessimisticLockException e) {
         // Ignore error on pessimistic locking
         unhealthyCountersHealthCheck.recordUnhealthyProblem(
             getClass().getSimpleName(), "ignoredPessimisticLockIssue");
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java
index 37020a04c..a8c911a68 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/AccessAssertionUserType.java
@@ -14,39 +14,39 @@
 import org.mapfish.print.config.access.AccessAssertionPersister;
 
 /** Hibernate user type for access assertion. */
-public class AccessAssertionUserType implements UserType {
+public class AccessAssertionUserType implements UserType<AccessAssertion> {
 
-  private static final int[] SQL_TYPES = {Types.LONGVARCHAR};
+  private static final int SQL_TYPE = Types.LONGVARCHAR;
 
   @Override
-  public final Object assemble(final Serializable cached, final Object owner) {
-    return deepCopy(cached);
+  public final AccessAssertion assemble(final Serializable cached, final Object owner) {
+    return deepCopy((AccessAssertion) cached);
   }
 
   @Override
-  public final Object deepCopy(final Object value) {
+  public final AccessAssertion deepCopy(final AccessAssertion value) {
     if (value == null) {
       return null;
     }
-    return ((AccessAssertion) value).copy();
+    return value.copy();
   }
 
   @Override
-  public final Serializable disassemble(final Object value) {
+  public final Serializable disassemble(final AccessAssertion value) {
     return (Serializable) deepCopy(value);
   }
 
   @Override
-  public final boolean equals(final Object x, final Object y) {
+  public final boolean equals(final AccessAssertion x, final AccessAssertion y) {
     if (x == null) {
-      return (y != null);
+      return y == null;
     } else {
-      return (x.equals(y));
+      return x.equals(y);
     }
   }
 
   @Override
-  public final int hashCode(final Object x) {
+  public final int hashCode(final AccessAssertion x) {
     return x.hashCode();
   }
 
@@ -56,13 +56,13 @@ public final boolean isMutable() {
   }
 
   @Override
-  public final Object nullSafeGet(
+  public final AccessAssertion nullSafeGet(
       final ResultSet rs,
-      final String[] names,
+      final int position,
       final SharedSessionContractImplementor session,
       final Object owner)
       throws SQLException {
-    String value = rs.getString(names[0]);
+    String value = rs.getString(position);
     if (value != null) {
       try {
         AccessAssertionPersister persister =
@@ -80,22 +80,23 @@ public final Object nullSafeGet(
   @Override
   public final void nullSafeSet(
       final PreparedStatement st,
-      final Object value,
+      final AccessAssertion value,
       final int index,
       final SharedSessionContractImplementor session)
       throws SQLException {
     if (value == null) {
-      st.setNull(index, SQL_TYPES[0]);
+      st.setNull(index, SQL_TYPE);
     } else {
       AccessAssertionPersister persister =
           ApplicationContextProvider.getApplicationContext()
               .getBean(AccessAssertionPersister.class);
-      st.setString(index, persister.marshal(((AccessAssertion) value)).toString());
+      st.setString(index, persister.marshal(value).toString());
     }
   }
 
   @Override
-  public final Object replace(final Object original, final Object target, final Object owner) {
+  public final AccessAssertion replace(
+      final AccessAssertion original, final AccessAssertion target, final Object owner) {
     return deepCopy(original);
   }
 
@@ -105,7 +106,7 @@ public final Class<AccessAssertion> returnedClass() {
   }
 
   @Override
-  public final int[] sqlTypes() {
-    return SQL_TYPES;
+  public final int getSqlType() {
+    return SQL_TYPE;
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
index 1a8b9b2ec..1620a273e 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
@@ -12,25 +12,24 @@
 import org.mapfish.print.wrapper.json.PJsonObject;
 
 /** Hibernate User Type for PJson object. */
-public class PJsonObjectUserType implements UserType {
+public class PJsonObjectUserType implements UserType<PJsonObject> {
 
-  private static final int[] SQL_TYPES = {Types.LONGVARCHAR};
+  private static final int SQL_TYPE = Types.LONGVARCHAR;
 
   private static final String CONTEXT_NAME = "spec";
 
   @Override
-  public final Object assemble(final Serializable cached, final Object owner) {
-    return deepCopy(cached);
+  public final PJsonObject assemble(final Serializable cached, final Object owner) {
+    return deepCopy((PJsonObject) cached);
   }
 
   @Override
-  public final Object deepCopy(final Object value) {
+  public final PJsonObject deepCopy(final PJsonObject value) {
     if (value == null) {
       return null;
     } else {
       try {
-        return new PJsonObject(
-            new JSONObject(((PJsonObject) value).getInternalObj().toString()), CONTEXT_NAME);
+        return new PJsonObject(new JSONObject(value.getInternalObj().toString()), CONTEXT_NAME);
       } catch (JSONException e) {
         throw new RuntimeException(e);
       }
@@ -38,21 +37,21 @@ public final Object deepCopy(final Object value) {
   }
 
   @Override
-  public final Serializable disassemble(final Object value) {
+  public final Serializable disassemble(final PJsonObject value) {
     return (Serializable) deepCopy(value);
   }
 
   @Override
-  public final boolean equals(final Object x, final Object y) {
+  public final boolean equals(final PJsonObject x, final PJsonObject y) {
     if (x == null) {
-      return (y != null);
+      return y == null;
     } else {
-      return (x.equals(y));
+      return x.equals(y);
     }
   }
 
   @Override
-  public final int hashCode(final Object x) {
+  public final int hashCode(final PJsonObject x) {
     return x.hashCode();
   }
 
@@ -62,13 +61,13 @@ public final boolean isMutable() {
   }
 
   @Override
-  public final Object nullSafeGet(
+  public final PJsonObject nullSafeGet(
       final ResultSet rs,
-      final String[] names,
+      final int position,
       final SharedSessionContractImplementor session,
       final Object owner)
       throws SQLException {
-    String value = rs.getString(names[0]);
+    String value = rs.getString(position);
     if (value != null) {
       try {
         return new PJsonObject(new JSONObject(value), CONTEXT_NAME);
@@ -82,19 +81,20 @@ public final Object nullSafeGet(
   @Override
   public final void nullSafeSet(
       final PreparedStatement st,
-      final Object value,
+      final PJsonObject value,
       final int index,
       final SharedSessionContractImplementor session)
       throws SQLException {
     if (value == null) {
-      st.setNull(index, SQL_TYPES[0]);
+      st.setNull(index, SQL_TYPE);
     } else {
-      st.setString(index, ((PJsonObject) value).getInternalObj().toString());
+      st.setString(index, value.getInternalObj().toString());
     }
   }
 
   @Override
-  public final Object replace(final Object original, final Object target, final Object owner) {
+  public final PJsonObject replace(
+      final PJsonObject original, final PJsonObject target, final Object owner) {
     return deepCopy(original);
   }
 
@@ -104,7 +104,7 @@ public final Class<PJsonObject> returnedClass() {
   }
 
   @Override
-  public final int[] sqlTypes() {
-    return SQL_TYPES;
+  public final int getSqlType() {
+    return SQL_TYPE;
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index da25e85c7..51870ce65 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -2,16 +2,16 @@
 
 import jakarta.annotation.Nullable;
 import jakarta.annotation.PostConstruct;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.Root;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Root;
 import org.hibernate.LockMode;
 import org.hibernate.PessimisticLockException;
 import org.hibernate.Session;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
index 97f54b1a1..c839af946 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 import java.net.URI;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
 import org.mapfish.print.servlet.job.impl.PrintJobResultImpl;
 
 /** Extension of Print Job Result that holds data as BLOB. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
index f5a7b3554..cbba2e349 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
 import jakarta.annotation.Nullable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
 import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.impl.PrintJobStatusImpl;
 
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index 6813e3aa1..b4ffe98e1 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -1,412 +1,417 @@
 package org.mapfish.print;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.joran.spi.JoranException;
-import ch.qos.logback.core.util.StatusPrinter2;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.TreeMap;
-import java.util.regex.Pattern;
-import javax.imageio.ImageIO;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.internal.TextListener;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runner.notification.RunListener;
-import org.locationtech.jts.util.Assert;
-import org.locationtech.jts.util.AssertionFailedException;
-import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.test.util.ImageSimilarity;
-import org.mapfish.print.url.data.Handler;
-import org.mapfish.print.wrapper.json.PJsonObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.verapdf.core.EncryptedPdfException;
-import org.verapdf.core.ModelParsingException;
-import org.verapdf.core.ValidationException;
-import org.verapdf.gf.model.GFModelParser;
-import org.verapdf.pdfa.PDFAValidator;
-import org.verapdf.pdfa.flavours.PDFAFlavour;
-import org.verapdf.pdfa.results.ValidationResult;
-import org.verapdf.pdfa.validation.validators.ValidatorFactory;
-
-/**
- * To run this test make sure that the test GeoServer is running:
- *
- * <p>./gradlew examples:farmRun
- *
- * <p>Or run the tests with the following task (which automatically starts the server):
- *
- * <p>./gradlew examples:geoserver
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML, ExamplesTest.TEST_SPRING_XML})
+//
+// import static org.junit.jupiter.api.Assertions.assertEquals;
+// import static org.junit.jupiter.api.Assertions.fail;
+//
+// import ch.qos.logback.classic.LoggerContext;
+// import ch.qos.logback.classic.joran.JoranConfigurator;
+// import ch.qos.logback.core.joran.spi.JoranException;
+// import ch.qos.logback.core.util.StatusPrinter2;
+// import java.awt.image.BufferedImage;
+// import java.io.File;
+// import java.io.IOException;
+// import java.io.InputStream;
+// import java.io.OutputStream;
+// import java.io.PrintWriter;
+// import java.io.StringWriter;
+// import java.net.HttpURLConnection;
+// import java.net.URI;
+// import java.net.URISyntaxException;
+// import java.net.URL;
+// import java.net.URLConnection;
+// import java.nio.charset.StandardCharsets;
+// import java.util.List;
+// import java.util.Map;
+// import java.util.Objects;
+// import java.util.TreeMap;
+// import java.util.regex.Pattern;
+// import javax.imageio.ImageIO;
+// import org.apache.commons.io.IOUtils;
+// import org.apache.commons.lang3.ArrayUtils;
+// import org.apache.commons.lang3.StringUtils;
+// import org.junit.internal.TextListener;
+// import org.junit.jupiter.api.BeforeAll;
+// import org.junit.jupiter.api.Test;
+// import org.junit.runner.JUnitCore;
+// import org.junit.runner.RunWith;
+// import org.junit.runner.notification.RunListener;
+// import org.locationtech.jts.util.Assert;
+// import org.locationtech.jts.util.AssertionFailedException;
+// import org.mapfish.print.servlet.MapPrinterServlet;
+// import org.mapfish.print.test.util.ImageSimilarity;
+// import org.mapfish.print.url.data.Handler;
+// import org.mapfish.print.wrapper.json.PJsonObject;
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.test.context.ContextConfiguration;
+// import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+// import org.verapdf.core.EncryptedPdfException;
+// import org.verapdf.core.ModelParsingException;
+// import org.verapdf.core.ValidationException;
+// import org.verapdf.gf.model.GFModelParser;
+// import org.verapdf.pdfa.PDFAValidator;
+// import org.verapdf.pdfa.flavours.PDFAFlavour;
+// import org.verapdf.pdfa.results.ValidationResult;
+// import org.verapdf.pdfa.validation.validators.ValidatorFactory;
+//
+/// **
+// * To run this test make sure that the test GeoServer is running:
+// *
+// * <p>./gradlew examples:farmRun
+// *
+// * <p>Or run the tests with the following task (which automatically starts the server):
+// *
+// * <p>./gradlew examples:geoserver
+// */
+// @RunWith(SpringJUnit4ClassRunner.class)
+// @ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML,
+// ExamplesTest.TEST_SPRING_XML})
 public class ExamplesTest {
-  public static final String DEFAULT_SPRING_XML =
-      "classpath:mapfish-spring-application-context.xml";
-  public static final String TEST_SPRING_XML =
-      "classpath:test-http-request-factory-application-context.xml";
-  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
-  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
-      Map.of(
-          "pdf", "application/pdf",
-          "png", "image/png",
-          "jpg", "image/jpeg",
-          "jpeg", "image/jpeg",
-          "tif", "image/tiff",
-          "tiff", "image/tiff",
-          "gif", "image/gif",
-          "bmp", "image/bmp");
-  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
-  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
-  private static final String CONFIG_FILE = "config.yaml";
-
-  /**
-   * If this system property is set then it will be interpreted as a regular expression and will be
-   * used to filter the examples that are run.
-   *
-   * <p>For example: -Dexamples.filter=verbose.*
-   *
-   * <p>will run all examples starting with verbose.
-   */
-  private static final String FILTER_PROPERTY = "examples.filter";
-
-  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
-  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
-  private static Pattern exampleFilter;
-  private static Pattern requestFilter;
-  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
-  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
-
-  static {
-    Handler.configureProtocolHandler();
-  }
-
-  @Autowired MapPrinter mapPrinter;
-
-  @BeforeAll
-  public static void setUp() {
-    final LoggerContext loggerContext = getLoggerContext();
-    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
-
-    String filterProperty = System.getProperty(FILTER_PROPERTY);
-    if (!StringUtils.isEmpty(filterProperty)) {
-      String[] parts = filterProperty.split("/", 2);
-
-      if (parts.length == 1) {
-        requestFilter = REQUEST_MATCH_ALL;
-      } else {
-        requestFilter = Pattern.compile(parts[1]);
-      }
-
-      exampleFilter = Pattern.compile(parts[0]);
-
-    } else {
-      requestFilter = REQUEST_MATCH_ALL;
-      exampleFilter = EXAMPLE_MATCH_ALL;
-    }
-  }
-
-  private static LoggerContext getLoggerContext() {
-    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
-    final URL logfile = classLoader.getResource("logback.xml");
-    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-    try {
-      final JoranConfigurator configurator = new JoranConfigurator();
-      configurator.setContext(loggerContext);
-      // Call context.reset() to clear any previous configuration, e.g. default
-      // configuration. For multi-step configuration, omit calling context.reset().
-      loggerContext.reset();
-      configurator.doConfigure(Objects.requireNonNull(logfile));
-    } catch (JoranException je) {
-      // StatusPrinter will handle this
-    }
-    return loggerContext;
-  }
-
-  private static File getFile(Class<?> testClass, String fileName) {
-    final URL resource = testClass.getResource(fileName);
-    if (resource == null) {
-      throw new AssertionError("Unable to find test resource: " + fileName);
-    }
-
-    return new File(resource.getFile());
-  }
-
-  public static void main(String[] args) {
-    JUnitCore junit = new JUnitCore();
-    if (args.length < 1) {
-      System.err.println(
-          "This main is expected to have at least one parameter, it is a regular "
-              + "expression for selecting the examples to run");
-      System.exit(1);
-    }
-    if (args.length > 2) {
-      System.err.println(
-          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
-              + "configRegexp");
-      System.exit(1);
-    }
-
-    String filter = args[0];
-    if (args.length == 2) {
-      filter += "/" + args[1];
-    }
-    System.setProperty(FILTER_PROPERTY, filter);
-    RunListener textListener = new TextListener(System.out);
-    junit.addListener(textListener);
-    junit.run(ExamplesTest.class);
-  }
-
-  @Test
-  public void testExampleDirectoryNames() {
-    final String namePattern = "[a-zA-Z0-9_]+";
-    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-    StringBuilder errors = new StringBuilder();
-    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
-        errors.append("\n    * ").append(examplesDir.getName());
-      }
-    }
-
-    assertEquals(
-        0,
-        errors.length(),
-        String.format(
-            "All example directory names must match the pattern: '%s'.  "
-                + "The following fail that test: %s",
-            namePattern, errors));
-  }
-
-  @Test
-  public void testAllExamples() {
-    Map<String, Throwable> errors = new TreeMap<>();
-
-    int testsRan = 0;
-    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-
-    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
-        testsRan += runExample(example, errors);
-      }
-    }
-
-    reportErrors(errors, testsRan);
-  }
-
-  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
-    if (!errors.isEmpty()) {
-      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
-        error.getValue().printStackTrace();
-      }
-
-      StringBuilder errorReport = new StringBuilder();
-      errorReport.append("\n");
-      errorReport.append(errors.size());
-      errorReport.append(" errors encountered while running ");
-      errorReport.append(testsRan);
-      errorReport.append(" examples.\n");
-      errorReport.append(
-          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
-      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-        StringBuilder exampleName = new StringBuilder();
-        exampleName.append("The example ");
-        exampleName.append(error.getKey());
-        errorReport.append(exampleName);
-        errorReport.append('\n');
-        //noinspection ReplaceAllDot
-        errorReport.append(exampleName.toString().replaceAll(".", "="));
-        errorReport.append('\n');
-        errorReport.append("Failed with the error:\n");
-        final StringWriter sw = new StringWriter();
-        error.getValue().printStackTrace(new PrintWriter(sw));
-        errorReport.append(sw);
-        errorReport.append('\n');
-      }
-      errorReport.append("\n\n");
-      fail(errorReport.toString());
-    }
-  }
-
-  private int runExample(File example, Map<String, Throwable> errors) {
-    int testsRan = 0;
-    try {
-      final File configFile = new File(example, CONFIG_FILE);
-      this.mapPrinter.setConfiguration(configFile);
-
-      if (!hasRequestFile(example)) {
-        throw new AssertionError(
-            String.format(
-                "Example: '%s' does not have any request data files.", example.getName()));
-      }
-      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
-        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
-          continue;
-        }
-        try {
-          if (isRequestDataFile(requestFile)) {
-            // WARN to be displayed in the Travis logs
-            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
-            String requestData =
-                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
-
-            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
-
-            testsRan++;
-            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
-            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
-
-            HttpURLConnection http =
-                createHttpUrlConnection(example.getName(), outputFormat, data.length);
-            http.connect();
-            try (OutputStream os = http.getOutputStream()) {
-              os.write(data);
-            }
-            int responseCode = http.getResponseCode();
-
-            InputStream inputStr = http.getInputStream();
-            if (responseCode != 200) {
-              String encoding =
-                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
-              String response = IOUtils.toString(inputStr, encoding);
-              Assert.isTrue(false, response);
-            }
-
-            Assert.equals(
-                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
-
-            if (requiringPdfAValidationTests.contains(example.getName())) {
-              pdfaValidate(errors, http, example.getName(), requestFile.getName());
-            } else {
-              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
-            }
-          }
-        } catch (IOException | AssertionError | RuntimeException e) {
-          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
-        }
-      }
-    } catch (IOException | RuntimeException | URISyntaxException e) {
-      errors.put(example.getName(), e);
-    }
-
-    return testsRan;
-  }
-
-  private void compareImages(
-      Map<String, Throwable> errors,
-      InputStream stream,
-      File example,
-      File requestFile,
-      String outputFormat)
-      throws IOException {
-    BufferedImage image = ImageIO.read(stream);
-    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
-      File expectedOutputDir = new File(example, "expected_output");
-      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
-      if (!expectedOutput.exists()) {
-        errors.put(
-            example.getName() + " (" + requestFile.getName() + ")",
-            new Exception("File not found: " + expectedOutput));
-      }
-
-      if (!"bmp".equals(outputFormat)) {
-        // BMP is not supported by ImageIO
-        new ImageSimilarity(expectedOutput).assertSimilarity(image);
-      }
-    }
-  }
-
-  private void pdfaValidate(
-      Map<String, Throwable> errors,
-      HttpURLConnection http,
-      String exampleName,
-      String requestFileName) {
-    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
-    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
-      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(), flavour);
-      ValidationResult result = validator.validate(parser);
-      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
-      Assert.isTrue(result.isCompliant());
-    } catch (EncryptedPdfException
-        | ModelParsingException
-        | ValidationException
-        | IOException
-        | AssertionFailedException e) {
-      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
-    }
-  }
-
-  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir) {
-    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
-    return new File(expectedOutputDir, imageName);
-  }
-
-  private boolean hasRequestFile(File example) {
-    for (File file : Objects.requireNonNull(example.listFiles())) {
-      if (isRequestDataFile(file)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private boolean isRequestDataFile(File requestFile) {
-    return requestFile.getName().matches(REQUEST_DATA_FILE);
-  }
-
-  private HttpURLConnection createHttpUrlConnection(
-      String exampleName, String outputFormat, int contentLength)
-      throws IOException, URISyntaxException {
-    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
-    http.setRequestMethod("POST");
-    http.setDoInput(true);
-    http.setDoOutput(true);
-    http.setFixedLengthStreamingMode(contentLength);
-    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-    return http;
-  }
-
-  private URLConnection createUrlConnection(String exampleName, String outputFormat)
-      throws IOException, URISyntaxException {
-    URL url =
-        URL.of(
-            new URI(
-                AbstractApiTest.PRINT_SERVER
-                    + "print/"
-                    + exampleName
-                    + MapPrinterServlet.CREATE_AND_GET_URL
-                    + "."
-                    + outputFormat),
-            null);
-    URLConnection connection = url.openConnection();
-    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
-    connection.setRequestProperty("Cache-Control", "max-age=0");
-    return connection;
-  }
+  //  public static final String DEFAULT_SPRING_XML =
+  //      "classpath:mapfish-spring-application-context.xml";
+  //  public static final String TEST_SPRING_XML =
+  //      "classpath:test-http-request-factory-application-context.xml";
+  //  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
+  //  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
+  //      Map.of(
+  //          "pdf", "application/pdf",
+  //          "png", "image/png",
+  //          "jpg", "image/jpeg",
+  //          "jpeg", "image/jpeg",
+  //          "tif", "image/tiff",
+  //          "tiff", "image/tiff",
+  //          "gif", "image/gif",
+  //          "bmp", "image/bmp");
+  //  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
+  //  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
+  //  private static final String CONFIG_FILE = "config.yaml";
+  //
+  //  /**
+  //   * If this system property is set then it will be interpreted as a regular expression and will
+  // be
+  //   * used to filter the examples that are run.
+  //   *
+  //   * <p>For example: -Dexamples.filter=verbose.*
+  //   *
+  //   * <p>will run all examples starting with verbose.
+  //   */
+  //  private static final String FILTER_PROPERTY = "examples.filter";
+  //
+  //  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
+  //  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
+  //  private static Pattern exampleFilter;
+  //  private static Pattern requestFilter;
+  //  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
+  //  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
+  //
+  //  static {
+  //    Handler.configureProtocolHandler();
+  //  }
+  //
+  //  @Autowired MapPrinter mapPrinter;
+  //
+  //  @BeforeAll
+  //  public static void setUp() {
+  //    final LoggerContext loggerContext = getLoggerContext();
+  //    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
+  //
+  //    String filterProperty = System.getProperty(FILTER_PROPERTY);
+  //    if (!StringUtils.isEmpty(filterProperty)) {
+  //      String[] parts = filterProperty.split("/", 2);
+  //
+  //      if (parts.length == 1) {
+  //        requestFilter = REQUEST_MATCH_ALL;
+  //      } else {
+  //        requestFilter = Pattern.compile(parts[1]);
+  //      }
+  //
+  //      exampleFilter = Pattern.compile(parts[0]);
+  //
+  //    } else {
+  //      requestFilter = REQUEST_MATCH_ALL;
+  //      exampleFilter = EXAMPLE_MATCH_ALL;
+  //    }
+  //  }
+  //
+  //  private static LoggerContext getLoggerContext() {
+  //    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
+  //    final URL logfile = classLoader.getResource("logback.xml");
+  //    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+  //    try {
+  //      final JoranConfigurator configurator = new JoranConfigurator();
+  //      configurator.setContext(loggerContext);
+  //      // Call context.reset() to clear any previous configuration, e.g. default
+  //      // configuration. For multi-step configuration, omit calling context.reset().
+  //      loggerContext.reset();
+  //      configurator.doConfigure(Objects.requireNonNull(logfile));
+  //    } catch (JoranException je) {
+  //      // StatusPrinter will handle this
+  //    }
+  //    return loggerContext;
+  //  }
+  //
+  //  private static File getFile(Class<?> testClass, String fileName) {
+  //    final URL resource = testClass.getResource(fileName);
+  //    if (resource == null) {
+  //      throw new AssertionError("Unable to find test resource: " + fileName);
+  //    }
+  //
+  //    return new File(resource.getFile());
+  //  }
+  //
+  //  public static void main(String[] args) {
+  //    JUnitCore junit = new JUnitCore();
+  //    if (args.length < 1) {
+  //      System.err.println(
+  //          "This main is expected to have at least one parameter, it is a regular "
+  //              + "expression for selecting the examples to run");
+  //      System.exit(1);
+  //    }
+  //    if (args.length > 2) {
+  //      System.err.println(
+  //          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
+  //              + "configRegexp");
+  //      System.exit(1);
+  //    }
+  //
+  //    String filter = args[0];
+  //    if (args.length == 2) {
+  //      filter += "/" + args[1];
+  //    }
+  //    System.setProperty(FILTER_PROPERTY, filter);
+  //    RunListener textListener = new TextListener(System.out);
+  //    junit.addListener(textListener);
+  //    junit.run(ExamplesTest.class);
+  //  }
+  //
+  //  @Test
+  //  public void testExampleDirectoryNames() {
+  //    final String namePattern = "[a-zA-Z0-9_]+";
+  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+  //    StringBuilder errors = new StringBuilder();
+  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+  //      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
+  //        errors.append("\n    * ").append(examplesDir.getName());
+  //      }
+  //    }
+  //
+  //    assertEquals(
+  //        0,
+  //        errors.length(),
+  //        String.format(
+  //            "All example directory names must match the pattern: '%s'.  "
+  //                + "The following fail that test: %s",
+  //            namePattern, errors));
+  //  }
+  //
+  //  @Test
+  //  public void testAllExamples() {
+  //    Map<String, Throwable> errors = new TreeMap<>();
+  //
+  //    int testsRan = 0;
+  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+  //
+  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+  //      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
+  //        testsRan += runExample(example, errors);
+  //      }
+  //    }
+  //
+  //    reportErrors(errors, testsRan);
+  //  }
+  //
+  //  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
+  //    if (!errors.isEmpty()) {
+  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+  //        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
+  //        error.getValue().printStackTrace();
+  //      }
+  //
+  //      StringBuilder errorReport = new StringBuilder();
+  //      errorReport.append("\n");
+  //      errorReport.append(errors.size());
+  //      errorReport.append(" errors encountered while running ");
+  //      errorReport.append(testsRan);
+  //      errorReport.append(" examples.\n");
+  //      errorReport.append(
+  //          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
+  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+  //        StringBuilder exampleName = new StringBuilder();
+  //        exampleName.append("The example ");
+  //        exampleName.append(error.getKey());
+  //        errorReport.append(exampleName);
+  //        errorReport.append('\n');
+  //        //noinspection ReplaceAllDot
+  //        errorReport.append(exampleName.toString().replaceAll(".", "="));
+  //        errorReport.append('\n');
+  //        errorReport.append("Failed with the error:\n");
+  //        final StringWriter sw = new StringWriter();
+  //        error.getValue().printStackTrace(new PrintWriter(sw));
+  //        errorReport.append(sw);
+  //        errorReport.append('\n');
+  //      }
+  //      errorReport.append("\n\n");
+  //      fail(errorReport.toString());
+  //    }
+  //  }
+  //
+  //  private int runExample(File example, Map<String, Throwable> errors) {
+  //    int testsRan = 0;
+  //    try {
+  //      final File configFile = new File(example, CONFIG_FILE);
+  //      this.mapPrinter.setConfiguration(configFile);
+  //
+  //      if (!hasRequestFile(example)) {
+  //        throw new AssertionError(
+  //            String.format(
+  //                "Example: '%s' does not have any request data files.", example.getName()));
+  //      }
+  //      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
+  //        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
+  //          continue;
+  //        }
+  //        try {
+  //          if (isRequestDataFile(requestFile)) {
+  //            // WARN to be displayed in the Travis logs
+  //            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
+  //            String requestData =
+  //                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
+  //
+  //            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
+  //
+  //            testsRan++;
+  //            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
+  //            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
+  //
+  //            HttpURLConnection http =
+  //                createHttpUrlConnection(example.getName(), outputFormat, data.length);
+  //            http.connect();
+  //            try (OutputStream os = http.getOutputStream()) {
+  //              os.write(data);
+  //            }
+  //            int responseCode = http.getResponseCode();
+  //
+  //            InputStream inputStr = http.getInputStream();
+  //            if (responseCode != 200) {
+  //              String encoding =
+  //                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
+  //              String response = IOUtils.toString(inputStr, encoding);
+  //              Assert.isTrue(false, response);
+  //            }
+  //
+  //            Assert.equals(
+  //                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
+  //
+  //            if (requiringPdfAValidationTests.contains(example.getName())) {
+  //              pdfaValidate(errors, http, example.getName(), requestFile.getName());
+  //            } else {
+  //              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
+  //            }
+  //          }
+  //        } catch (IOException | AssertionError | RuntimeException e) {
+  //          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
+  //        }
+  //      }
+  //    } catch (IOException | RuntimeException | URISyntaxException e) {
+  //      errors.put(example.getName(), e);
+  //    }
+  //
+  //    return testsRan;
+  //  }
+  //
+  //  private void compareImages(
+  //      Map<String, Throwable> errors,
+  //      InputStream stream,
+  //      File example,
+  //      File requestFile,
+  //      String outputFormat)
+  //      throws IOException {
+  //    BufferedImage image = ImageIO.read(stream);
+  //    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
+  //      File expectedOutputDir = new File(example, "expected_output");
+  //      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
+  //      if (!expectedOutput.exists()) {
+  //        errors.put(
+  //            example.getName() + " (" + requestFile.getName() + ")",
+  //            new Exception("File not found: " + expectedOutput));
+  //      }
+  //
+  //      if (!"bmp".equals(outputFormat)) {
+  //        // BMP is not supported by ImageIO
+  //        new ImageSimilarity(expectedOutput).assertSimilarity(image);
+  //      }
+  //    }
+  //  }
+  //
+  //  private void pdfaValidate(
+  //      Map<String, Throwable> errors,
+  //      HttpURLConnection http,
+  //      String exampleName,
+  //      String requestFileName) {
+  //    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
+  //    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
+  //      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(),
+  // flavour);
+  //      ValidationResult result = validator.validate(parser);
+  //      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
+  //      Assert.isTrue(result.isCompliant());
+  //    } catch (EncryptedPdfException
+  //        | ModelParsingException
+  //        | ValidationException
+  //        | IOException
+  //        | AssertionFailedException e) {
+  //      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
+  //    }
+  //  }
+  //
+  //  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir)
+  // {
+  //    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
+  //    return new File(expectedOutputDir, imageName);
+  //  }
+  //
+  //  private boolean hasRequestFile(File example) {
+  //    for (File file : Objects.requireNonNull(example.listFiles())) {
+  //      if (isRequestDataFile(file)) {
+  //        return true;
+  //      }
+  //    }
+  //    return false;
+  //  }
+  //
+  //  private boolean isRequestDataFile(File requestFile) {
+  //    return requestFile.getName().matches(REQUEST_DATA_FILE);
+  //  }
+  //
+  //  private HttpURLConnection createHttpUrlConnection(
+  //      String exampleName, String outputFormat, int contentLength)
+  //      throws IOException, URISyntaxException {
+  //    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
+  //    http.setRequestMethod("POST");
+  //    http.setDoInput(true);
+  //    http.setDoOutput(true);
+  //    http.setFixedLengthStreamingMode(contentLength);
+  //    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+  //    return http;
+  //  }
+  //
+  //  private URLConnection createUrlConnection(String exampleName, String outputFormat)
+  //      throws IOException, URISyntaxException {
+  //    URL url =
+  //        URL.of(
+  //            new URI(
+  //                AbstractApiTest.PRINT_SERVER
+  //                    + "print/"
+  //                    + exampleName
+  //                    + MapPrinterServlet.CREATE_AND_GET_URL
+  //                    + "."
+  //                    + outputFormat),
+  //            null);
+  //    URLConnection connection = url.openConnection();
+  //    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
+  //    connection.setRequestProperty("Cache-Control", "max-age=0");
+  //    return connection;
+  //  }
 }

From 1909873fcfc488655d91c0f2b1068219d0119f06 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 8 Dec 2025 13:10:09 +0100
Subject: [PATCH 41/61] Fixed deserializing HttpMethod

---
 .../mapfish/print/parser/MapfishParser.java   |  3 ++
 .../job/impl/hibernate/PrintJobDao.java       | 12 ++----
 .../resources/mapfish-spring-hibernate.xml    | 10 -----
 .../http/ConfigFileResolvingRequestTest.java  |  3 +-
 .../print/http/HttpCredentialTest.java        | 41 ++++++++++++++-----
 .../org/mapfish/print/http/HttpProxyTest.java |  6 +--
 .../map/style/ParserPluginUtilsTest.java      |  3 +-
 ...reateMapPagesFailOnErrorProcessorTest.java |  8 +++-
 .../resources/mapfish-spring-hibernate.xml    | 10 -----
 9 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/parser/MapfishParser.java b/core/src/main/java/org/mapfish/print/parser/MapfishParser.java
index e06049958..3d8e5d5e8 100644
--- a/core/src/main/java/org/mapfish/print/parser/MapfishParser.java
+++ b/core/src/main/java/org/mapfish/print/parser/MapfishParser.java
@@ -28,6 +28,7 @@
 import org.mapfish.print.wrapper.PObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
 
 /**
  * This class parses json parameter objects into the parameter object taken by {@link
@@ -251,6 +252,8 @@ private static Object parseValue(
       }
     } else if (type.isEnum()) {
       value = parseEnum(type, layer.getPath(fieldName), layer.getString(name));
+    } else if (type == HttpMethod.class) {
+      value = HttpMethod.valueOf(layer.getString(name).toUpperCase());
     } else {
       try {
         value = type.getDeclaredConstructor().newInstance();
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index 51870ce65..3d5a93445 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -1,7 +1,7 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
 import jakarta.annotation.Nullable;
-import jakarta.annotation.PostConstruct;
+import jakarta.persistence.PessimisticLockException;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -13,7 +13,6 @@
 import java.util.Collections;
 import java.util.List;
 import org.hibernate.LockMode;
-import org.hibernate.PessimisticLockException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.query.Query;
@@ -25,12 +24,6 @@ public class PrintJobDao {
 
   @Autowired private SessionFactory sf;
 
-  /** Initialize db manager. */
-  @PostConstruct
-  public final void init() {
-    this.sf.openSession();
-  }
-
   private Session getSession() {
     return this.sf.getCurrentSession();
   }
@@ -226,7 +219,8 @@ public final List<PrintJobStatusExtImpl> poll(final int size) {
     query.setMaxResults(size);
     // LOCK but don't wait for release (since this is run continuously
     // anyway, no wait prevents deadlock)
-    query.setLockMode("pj", LockMode.UPGRADE_NOWAIT);
+    query.setLockMode("pj", LockMode.PESSIMISTIC_WRITE);
+    query.setHint("jakarta.persistence.lock.timeout", 0);
     try {
       return query.getResultList();
     } catch (PessimisticLockException ex) {
diff --git a/core/src/main/resources/mapfish-spring-hibernate.xml b/core/src/main/resources/mapfish-spring-hibernate.xml
index 77c884d33..7e0b74f2c 100644
--- a/core/src/main/resources/mapfish-spring-hibernate.xml
+++ b/core/src/main/resources/mapfish-spring-hibernate.xml
@@ -8,16 +8,6 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
-        <property name="annotatedClasses">
-            <list>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobEntryImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobStatusImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobResultImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobStatusExtImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobResultExtImpl</value>
-                <value>org.mapfish.print.servlet.job.HibernateAccountingEntry</value>
-            </list>
-        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
index 9ba1f2711..7cdb89d05 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingRequestTest.java
@@ -13,6 +13,7 @@
 import org.mapfish.print.PrintException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
 
 public class ConfigFileResolvingRequestTest {
@@ -108,7 +109,7 @@ private MfClientHttpRequestFactoryImpl.Request initTestDefaultBehaviour(
 
   private ClientHttpResponse createResponse(final int statusCode) throws IOException {
     var clientHttpResponse = mock(ClientHttpResponse.class);
-    when(clientHttpResponse.getStatusCode().value()).thenReturn(statusCode);
+    when(clientHttpResponse.getStatusCode()).thenReturn(HttpStatusCode.valueOf(statusCode));
     return clientHttpResponse;
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index db091347c..5ecd92883 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationFactory;
@@ -19,9 +19,9 @@
 import org.mapfish.print.processor.http.matcher.MatchInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
     locations = {
       AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
@@ -80,30 +80,51 @@ public void testToCredentials() throws Exception {
     final Credentials object = credential.toCredentials(authscope);
     assertNotNull(object);
     assertEquals(USERNAME, object.getUserPrincipal().getName());
-    assertEquals(PASSWORD, object.getPassword());
+    assertEquals(PASSWORD, new String(object.getPassword()));
 
     authscope =
         new AuthScope(
-            MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
+            MatchInfo.ANY_PORT,
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
         new AuthScope(
-          MatchInfo.ANY_SCHEME,
-          MatchInfo.ANY_HOST,
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
             HttpProxyTest.HTTPS_PROXY_PORT,
             MatchInfo.ANY_REALM,
             MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
+    authscope =
+        new AuthScope(
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
+            80,
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNotNull(credential.toCredentials(authscope));
 
     authscope =
-        new AuthScope(MatchInfo.ANY_SCHEME, "google.com", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME);
+        new AuthScope(
+            MatchInfo.ANY_SCHEME,
+            "google.com",
+            MatchInfo.ANY_PORT,
+            MatchInfo.ANY_REALM,
+            MatchInfo.ANY_SCHEME);
     assertNull(credential.toCredentials(authscope));
 
-    authscope = new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http");
+    authscope =
+        new AuthScope(
+            MatchInfo.ANY_SCHEME,
+            MatchInfo.ANY_HOST,
+            MatchInfo.ANY_PORT,
+            MatchInfo.ANY_REALM,
+            "http");
     assertNotNull(credential.toCredentials(authscope));
   }
 
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index f4e6ce304..fdba68af7 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.AbstractMapfishSpringTest;
 import org.mapfish.print.Constants;
 import org.mapfish.print.config.Configuration;
@@ -45,9 +45,9 @@
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(
     locations = {
       AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
diff --git a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
index 36be930ec..fd974fd92 100644
--- a/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
+++ b/core/src/test/java/org/mapfish/print/map/style/ParserPluginUtilsTest.java
@@ -15,6 +15,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
@@ -41,7 +42,7 @@ private static Optional<Style> testLoadingStyleWithStatusCode(
 
     when(factory.createRequest(new URI("http://valid.uri"), HttpMethod.GET)).thenReturn(request);
     when(request.execute()).thenReturn(response);
-    when(response.getStatusCode().value()).thenReturn(httpStatusCode);
+    when(response.getStatusCode()).thenReturn(HttpStatusCode.valueOf(httpStatusCode));
     when(response.getBody())
         .thenReturn(
             new ByteArrayInputStream(
diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
index 1dd7b7743..d2e058075 100644
--- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapPagesFailOnErrorProcessorTest.java
@@ -91,7 +91,13 @@ private void testPrint(
           new HashMap<>(), requestData, config, config.getDirectory(), getTaskDirectory());
       Assertions.fail("Generation was not canceled");
     } catch (Exception e) {
-      Assertions.assertTrue(e instanceof ExecutionException);
+      if (!(e instanceof ExecutionException)) {
+        e.printStackTrace(System.err);
+      }
+      Assertions.assertTrue(
+          e instanceof ExecutionException,
+          String.format(
+              "Expected ExecutionException, got %s (%s)", e.getClass().getName(), e.getMessage()));
     } finally {
       Assertions.assertTrue(
           wmsRequestsNb.get() < maxWmsRequestsNumber,
diff --git a/core/src/test/resources/mapfish-spring-hibernate.xml b/core/src/test/resources/mapfish-spring-hibernate.xml
index e1b82d348..cf7623d47 100644
--- a/core/src/test/resources/mapfish-spring-hibernate.xml
+++ b/core/src/test/resources/mapfish-spring-hibernate.xml
@@ -8,16 +8,6 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
-        <property name="annotatedClasses">
-            <list>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobEntryImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobStatusImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.PrintJobResultImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobStatusExtImpl</value>
-                <value>org.mapfish.print.servlet.job.impl.hibernate.PrintJobResultExtImpl</value>
-                <value>org.mapfish.print.servlet.job.HibernateAccountingEntry</value>
-            </list>
-        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update

From 2c852c31e487772060489cb198d75cfb2ef53add Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 8 Dec 2025 14:45:53 +0100
Subject: [PATCH 42/61] Fixed NotAnEntity exception

---
 core/src/main/resources/mapfish-spring-hibernate.xml | 7 +++++++
 core/src/test/resources/mapfish-spring-hibernate.xml | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/core/src/main/resources/mapfish-spring-hibernate.xml b/core/src/main/resources/mapfish-spring-hibernate.xml
index 7e0b74f2c..894a62baa 100644
--- a/core/src/main/resources/mapfish-spring-hibernate.xml
+++ b/core/src/main/resources/mapfish-spring-hibernate.xml
@@ -8,6 +8,13 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
+        <property name="packagesToScan">
+            <array>
+<!--                <value>org.mapfish.print.servlet.job</value>-->
+                <value>org.mapfish.print.servlet.job.impl</value>
+                <value>org.mapfish.print.servlet.job.impl.hibernate</value>
+            </array>
+        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update
diff --git a/core/src/test/resources/mapfish-spring-hibernate.xml b/core/src/test/resources/mapfish-spring-hibernate.xml
index cf7623d47..dbdf715ea 100644
--- a/core/src/test/resources/mapfish-spring-hibernate.xml
+++ b/core/src/test/resources/mapfish-spring-hibernate.xml
@@ -8,6 +8,13 @@
 
     <bean id="mfSessionFactory" class="org.springframework.orm.jpa.hibernate.LocalSessionFactoryBean">
         <property name="dataSource" ref="mfDataSource"/>
+        <property name="packagesToScan">
+            <array>
+                <value>org.mapfish.print.servlet.job</value>
+                <value>org.mapfish.print.servlet.job.impl</value>
+                <value>org.mapfish.print.servlet.job.impl.hibernate</value>
+            </array>
+        </property>
         <property name="hibernateProperties">
             <value>
                 hibernate.hbm2ddl.auto=update

From 965d36360c814339b589e47cdb54a4949ae194ab Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Tue, 9 Dec 2025 17:27:24 +0100
Subject: [PATCH 43/61] Fixed proxy and http auth parameters passing

---
 .../java/org/mapfish/print/VersionInfo.java   |  2 +-
 .../mapfish/print/http/HttpCredential.java    |  9 +------
 .../http/MfClientHttpRequestFactoryImpl.java  | 11 +++++++-
 .../mapfish/print/http/MfRoutePlanner.java    | 26 +++++++++----------
 .../org/mapfish/print/http/HttpProxyTest.java |  2 +-
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/VersionInfo.java b/core/src/main/java/org/mapfish/print/VersionInfo.java
index c7008d5ab..6d322e19e 100644
--- a/core/src/main/java/org/mapfish/print/VersionInfo.java
+++ b/core/src/main/java/org/mapfish/print/VersionInfo.java
@@ -2,13 +2,13 @@
 
 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.servlet.ServletContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index e8bb16bce..c34e4d39f 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -106,13 +106,6 @@ public final Credentials toCredentials(final AuthScope authscope) {
     if (this.username == null) {
       return null;
     }
-
-    final String passwordString;
-    if (this.password != null) {
-      passwordString = new String(this.password);
-    } else {
-      passwordString = null;
-    }
-    return new UsernamePasswordCredentials(this.username, passwordString.toCharArray());
+    return new UsernamePasswordCredentials(this.username, this.password);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index bd8147d9c..9591724e3 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -25,6 +25,7 @@
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
@@ -73,6 +74,13 @@ public MfClientHttpRequestFactoryImpl(
             connectionRequestTimeout,
             connectTimeout,
             socketTimeout));
+    setHttpContextFactory(
+        ((httpMethod, uri) -> {
+          var context = HttpClientContext.create();
+          context.setAttribute("request-uri", uri);
+          context.setAttribute("request-method", httpMethod);
+          return (HttpContext) context;
+        }));
   }
 
   @Nullable
@@ -231,7 +239,8 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
         entityEnclosingRequest.setEntity(requestEntity);
       }
 
-      ClassicHttpResponse response = this.client.executeOpen(null, this.request, this.context);
+      ClassicHttpResponse response =
+          (ClassicHttpResponse) this.client.execute(this.request, this.context);
       LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
diff --git a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
index 7598c812c..a8533f508 100644
--- a/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
+++ b/core/src/main/java/org/mapfish/print/http/MfRoutePlanner.java
@@ -29,23 +29,23 @@ public MfRoutePlanner() {
   }
 
   @Override
-  protected HttpHost determineProxy(final HttpHost target, final HttpContext context) throws HttpException {
+  protected HttpHost determineProxy(final HttpHost target, final HttpContext context)
+      throws HttpException {
     Configuration config = MfClientHttpRequestFactoryImpl.getCurrentConfiguration();
-    if (config == null) {
+    if (config == null || context == null) {
       return null;
     }
-    var coreCtx = HttpCoreContext.cast(context);
-    if (coreCtx == null || coreCtx.getRequest() == null) {
-      return null;
-    }
-    var request = coreCtx.getRequest();
-    final URI uri;
-    try {
-      uri = request.getUri();
-    } catch (URISyntaxException e) {
-      throw new RuntimeException(e);
+    var ctx = HttpCoreContext.cast(context);
+    var uri = (URI) ctx.getAttribute("request-uri");
+    var method = (HttpMethod) ctx.getAttribute("request-method");
+    if (ctx.getRequest() != null) {
+      try {
+        uri = ctx.getRequest().getUri();
+        method = HttpMethod.valueOf(ctx.getRequest().getMethod());
+      } catch (URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
     }
-    HttpMethod method = HttpMethod.valueOf(request.getMethod());
 
     final List<HttpProxy> proxies = config.getProxies();
     for (HttpProxy proxy : proxies) {
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index fdba68af7..534aea34f 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -230,7 +230,7 @@ public void testExecuteProxyWithUsername() throws Exception {
             httpExchange.sendResponseHeaders(401, 0);
             httpExchange.close();
           } else {
-            final String expectedAuth = "Basic dXNlcm5hbWU6bnVsbA==";
+            final String expectedAuth = "Basic dXNlcm5hbWU6";
             if (authorization.equals(expectedAuth)) {
               respond(httpExchange, MESSAGE_FROM_PROXY, 200);
             } else {

From 848546e6acb6cca96113e068c56125aee08857c1 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Wed, 10 Dec 2025 18:14:07 +0100
Subject: [PATCH 44/61] Spring-security fix for the server

---
 core/Dockerfile                               |   2 +-
 core/build.gradle                             | 141 +++++++++---------
 .../print/servlet/MapPrinterServlet.java      |  16 +-
 .../print/servlet/RequestSizeFilter.java      |  14 +-
 .../impl/hibernate/PJsonObjectUserType.java   |   6 +-
 .../resources/mapfish-spring-security.xml     |  10 +-
 core/src/main/webapp/WEB-INF/web.xml          |   4 +-
 docs/build.gradle                             |   1 -
 8 files changed, 100 insertions(+), 94 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index b69847c2c..0ce57bb87 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -1,6 +1,6 @@
 FROM mapfish_print_builder AS builder
 
-FROM tomcat:9.0.113-jre21-temurin-jammy AS runner
+FROM tomcat:10-jre21-temurin-jammy AS runner
 LABEL maintainer="Camptocamp <info@camptocamp.com>"
 
 RUN --mount=type=cache,target=/var/cache,sharing=locked \
diff --git a/core/build.gradle b/core/build.gradle
index f16b3c3ad..740f6b50b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -126,86 +126,89 @@ configurations {
 
 dependencies {
     implementation(
-            'org.springframework:spring-context: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:5.8.16',
-            'org.springframework.security:spring-security-web:5.8.16',
-            'com.thetransactioncompany:cors-filter:2.10',
-            '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'
+        '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.0',
+        'org.springframework.security:spring-security-web:7.0.0',
+        '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-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',
+        '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',
+        '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',
+        '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',
+        // 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
+        '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'
@@ -231,14 +234,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')
     )
 }
 
@@ -283,7 +286,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')
         }
     }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index d5ba140c8..38a37bede 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -119,8 +119,8 @@ public class MapPrinterServlet extends BaseMapServlet {
   /**
    * If the job is done (value is true) or not (value is false).
    *
-   * <p>Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response.
+   * <p>Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response.
    */
   public static final String JSON_DONE = "done";
 
@@ -135,8 +135,8 @@ public class MapPrinterServlet extends BaseMapServlet {
    *   <li>error
    * </ul>
    *
-   * Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response
+   * Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response
    */
   public static final String JSON_STATUS = STATUS;
 
@@ -144,8 +144,8 @@ public class MapPrinterServlet extends BaseMapServlet {
    * The elapsed time in ms from the point the job started. If the job is finished, this is the
    * duration it took to process the job.
    *
-   * <p>Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response.
+   * <p>Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response.
    */
   public static final String JSON_ELAPSED_TIME = "elapsedTime";
 
@@ -153,8 +153,8 @@ public class MapPrinterServlet extends BaseMapServlet {
    * A rough estimate for the time in ms the job still has to wait in the queue until it starts
    * processing.
    *
-   * <p>Part of the {@link #getStatus(String, String, javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)} response.
+   * <p>Part of the {@link #getStatus(String, String,jakarta.servlet.http.HttpServletRequest,
+   * jakarta.servlet.http.HttpServletResponse)} response.
    */
   public static final String JSON_WAITING_TIME = "waitingTime";
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java b/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java
index 22c9e0dd3..79c9b9075 100644
--- a/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java
+++ b/core/src/main/java/org/mapfish/print/servlet/RequestSizeFilter.java
@@ -1,13 +1,13 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
index 1620a273e..4bb3ce320 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PJsonObjectUserType.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.servlet.job.impl.hibernate;
 
+import java.io.InvalidClassException;
 import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -20,7 +21,10 @@ public class PJsonObjectUserType implements UserType<PJsonObject> {
 
   @Override
   public final PJsonObject assemble(final Serializable cached, final Object owner) {
-    return deepCopy((PJsonObject) cached);
+    if (cached instanceof PJsonObject value) {
+      return deepCopy(value);
+    }
+    throw new RuntimeException(new InvalidClassException(cached.getClass().getName()));
   }
 
   @Override
diff --git a/core/src/main/resources/mapfish-spring-security.xml b/core/src/main/resources/mapfish-spring-security.xml
index ab3946b02..79d7e8dd6 100644
--- a/core/src/main/resources/mapfish-spring-security.xml
+++ b/core/src/main/resources/mapfish-spring-security.xml
@@ -5,14 +5,14 @@
              xmlns="http://www.springframework.org/schema/security"
              xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-7.0.xsd">
 
     <!-- needed to allow double slashes in the URLs -->
-    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">
-        <beans:property name="allowUrlEncodedSlash" value="true"/>
-    </beans:bean>
+<!--    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">-->
+<!--        <beans:property name="allowUrlEncodedSlash" value="true"/>-->
+<!--    </beans:bean>-->
 
-    <http-firewall ref="httpFirewall"/>
+<!--    <http-firewall ref="httpFirewall"/>-->
 
     <http use-expressions="true">
         <!-- in order to get a challenge (for capabilities for example) you need to use the print/sec/* urls -->
diff --git a/core/src/main/webapp/WEB-INF/web.xml b/core/src/main/webapp/WEB-INF/web.xml
index ca3cec8e2..69d4be0a2 100644
--- a/core/src/main/webapp/WEB-INF/web.xml
+++ b/core/src/main/webapp/WEB-INF/web.xml
@@ -71,7 +71,7 @@
 
     <filter>
         <filter-name>instrumentedFilter</filter-name>
-        <filter-class>com.codahale.metrics.servlet.InstrumentedFilter</filter-class>
+        <filter-class>io.dropwizard.metrics.servlet.InstrumentedFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>instrumentedFilter</filter-name>
@@ -101,7 +101,7 @@
 
     <servlet>
         <servlet-name>metrics-servlet</servlet-name>
-        <servlet-class>com.codahale.metrics.servlets.AdminServlet</servlet-class>
+        <servlet-class>io.dropwizard.metrics.servlets.AdminServlet</servlet-class>
     </servlet>
 
     <!-- single mapping to spring, this only works properly if the advanced dispatch filter is
diff --git a/docs/build.gradle b/docs/build.gradle
index 91e979784..a25162748 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -28,7 +28,6 @@ dependencies {
             "org.springframework:spring-beans:7.0.1",
             "org.springframework:spring-web:7.0.1",
             "org.springframework:spring-context:7.0.1",
-            'javax.servlet:javax.servlet-api:4.0.1'
     )
 }
 

From 1372789efe735d92fb765a8cd317db812b072501 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 11 Dec 2025 10:40:08 +0100
Subject: [PATCH 45/61] Remove channel enforcing in the spring config.

HTTPs handling should be moved to web.xml
---
 core/src/main/resources/mapfish-spring-security.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/mapfish-spring-security.xml b/core/src/main/resources/mapfish-spring-security.xml
index 79d7e8dd6..830c47f3b 100644
--- a/core/src/main/resources/mapfish-spring-security.xml
+++ b/core/src/main/resources/mapfish-spring-security.xml
@@ -8,16 +8,15 @@
         http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-7.0.xsd">
 
     <!-- needed to allow double slashes in the URLs -->
-<!--    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">-->
-<!--        <beans:property name="allowUrlEncodedSlash" value="true"/>-->
-<!--    </beans:bean>-->
+    <beans:bean id="httpFirewall" class="org.springframework.security.web.firewall.DefaultHttpFirewall">
+        <beans:property name="allowUrlEncodedSlash" value="true"/>
+    </beans:bean>
 
-<!--    <http-firewall ref="httpFirewall"/>-->
+    <http-firewall ref="httpFirewall"/>
 
     <http use-expressions="true">
-        <!-- in order to get a challenge (for capabilities for example) you need to use the print/sec/* urls -->
         <csrf disabled="true"/>
-        <intercept-url pattern="/sec/print/**" requires-channel="https" access="isAuthenticated()"/>
+        <intercept-url pattern="/sec/print/**" access="isAuthenticated()"/>
         <intercept-url pattern="/**" access="permitAll()"/>
         <http-basic/>
         <anonymous/>

From 29571e5d6de6fbe492ee352b85f456d716f3a6d0 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 11 Dec 2025 12:40:31 +0100
Subject: [PATCH 46/61] Migrated 'examples' code

---
 examples/build.gradle                         |   3 +-
 .../java/org/mapfish/print/ExamplesTest.java  | 837 +++++++++---------
 2 files changed, 426 insertions(+), 414 deletions(-)

diff --git a/examples/build.gradle b/examples/build.gradle
index d2817ea62..17f7f7aa2 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -23,7 +23,8 @@ dependencies {
         "org.springframework:spring-test:7.0.1",
         "ch.qos.logback:logback-classic:1.5.15",
         "org.verapdf:validation-model:1.24.1",
-        "junit:junit:4.13.2",
+        'org.junit.platform:junit-platform-launcher:6.0.1',
+
     )
 }
 
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index b4ffe98e1..b44d995e0 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -1,417 +1,428 @@
 package org.mapfish.print;
 
-//
-// import static org.junit.jupiter.api.Assertions.assertEquals;
-// import static org.junit.jupiter.api.Assertions.fail;
-//
-// import ch.qos.logback.classic.LoggerContext;
-// import ch.qos.logback.classic.joran.JoranConfigurator;
-// import ch.qos.logback.core.joran.spi.JoranException;
-// import ch.qos.logback.core.util.StatusPrinter2;
-// import java.awt.image.BufferedImage;
-// import java.io.File;
-// import java.io.IOException;
-// import java.io.InputStream;
-// import java.io.OutputStream;
-// import java.io.PrintWriter;
-// import java.io.StringWriter;
-// import java.net.HttpURLConnection;
-// import java.net.URI;
-// import java.net.URISyntaxException;
-// import java.net.URL;
-// import java.net.URLConnection;
-// import java.nio.charset.StandardCharsets;
-// import java.util.List;
-// import java.util.Map;
-// import java.util.Objects;
-// import java.util.TreeMap;
-// import java.util.regex.Pattern;
-// import javax.imageio.ImageIO;
-// import org.apache.commons.io.IOUtils;
-// import org.apache.commons.lang3.ArrayUtils;
-// import org.apache.commons.lang3.StringUtils;
-// import org.junit.internal.TextListener;
-// import org.junit.jupiter.api.BeforeAll;
-// import org.junit.jupiter.api.Test;
-// import org.junit.runner.JUnitCore;
-// import org.junit.runner.RunWith;
-// import org.junit.runner.notification.RunListener;
-// import org.locationtech.jts.util.Assert;
-// import org.locationtech.jts.util.AssertionFailedException;
-// import org.mapfish.print.servlet.MapPrinterServlet;
-// import org.mapfish.print.test.util.ImageSimilarity;
-// import org.mapfish.print.url.data.Handler;
-// import org.mapfish.print.wrapper.json.PJsonObject;
-// import org.slf4j.Logger;
-// import org.slf4j.LoggerFactory;
-// import org.springframework.beans.factory.annotation.Autowired;
-// import org.springframework.test.context.ContextConfiguration;
-// import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-// import org.verapdf.core.EncryptedPdfException;
-// import org.verapdf.core.ModelParsingException;
-// import org.verapdf.core.ValidationException;
-// import org.verapdf.gf.model.GFModelParser;
-// import org.verapdf.pdfa.PDFAValidator;
-// import org.verapdf.pdfa.flavours.PDFAFlavour;
-// import org.verapdf.pdfa.results.ValidationResult;
-// import org.verapdf.pdfa.validation.validators.ValidatorFactory;
-//
-/// **
-// * To run this test make sure that the test GeoServer is running:
-// *
-// * <p>./gradlew examples:farmRun
-// *
-// * <p>Or run the tests with the following task (which automatically starts the server):
-// *
-// * <p>./gradlew examples:geoserver
-// */
-// @RunWith(SpringJUnit4ClassRunner.class)
-// @ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML,
-// ExamplesTest.TEST_SPRING_XML})
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter2;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
+import javax.imageio.ImageIO;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
+import org.locationtech.jts.util.Assert;
+import org.locationtech.jts.util.AssertionFailedException;
+import org.mapfish.print.servlet.MapPrinterServlet;
+import org.mapfish.print.test.util.ImageSimilarity;
+import org.mapfish.print.url.data.Handler;
+import org.mapfish.print.wrapper.json.PJsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.verapdf.core.EncryptedPdfException;
+import org.verapdf.core.ModelParsingException;
+import org.verapdf.core.ValidationException;
+import org.verapdf.gf.model.GFModelParser;
+import org.verapdf.pdfa.PDFAValidator;
+import org.verapdf.pdfa.flavours.PDFAFlavour;
+import org.verapdf.pdfa.results.ValidationResult;
+import org.verapdf.pdfa.validation.validators.ValidatorFactory;
+
+/**
+ * To run this test make sure that the test GeoServer is running:
+ *
+ * <p>./gradlew examples:farmRun
+ *
+ * <p>Or run the tests with the following task (which automatically starts the server):
+ *
+ * <p>./gradlew examples:geoserver
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(locations = {ExamplesTest.DEFAULT_SPRING_XML, ExamplesTest.TEST_SPRING_XML})
 public class ExamplesTest {
-  //  public static final String DEFAULT_SPRING_XML =
-  //      "classpath:mapfish-spring-application-context.xml";
-  //  public static final String TEST_SPRING_XML =
-  //      "classpath:test-http-request-factory-application-context.xml";
-  //  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
-  //  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
-  //      Map.of(
-  //          "pdf", "application/pdf",
-  //          "png", "image/png",
-  //          "jpg", "image/jpeg",
-  //          "jpeg", "image/jpeg",
-  //          "tif", "image/tiff",
-  //          "tiff", "image/tiff",
-  //          "gif", "image/gif",
-  //          "bmp", "image/bmp");
-  //  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
-  //  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
-  //  private static final String CONFIG_FILE = "config.yaml";
-  //
-  //  /**
-  //   * If this system property is set then it will be interpreted as a regular expression and will
-  // be
-  //   * used to filter the examples that are run.
-  //   *
-  //   * <p>For example: -Dexamples.filter=verbose.*
-  //   *
-  //   * <p>will run all examples starting with verbose.
-  //   */
-  //  private static final String FILTER_PROPERTY = "examples.filter";
-  //
-  //  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
-  //  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
-  //  private static Pattern exampleFilter;
-  //  private static Pattern requestFilter;
-  //  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
-  //  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
-  //
-  //  static {
-  //    Handler.configureProtocolHandler();
-  //  }
-  //
-  //  @Autowired MapPrinter mapPrinter;
-  //
-  //  @BeforeAll
-  //  public static void setUp() {
-  //    final LoggerContext loggerContext = getLoggerContext();
-  //    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
-  //
-  //    String filterProperty = System.getProperty(FILTER_PROPERTY);
-  //    if (!StringUtils.isEmpty(filterProperty)) {
-  //      String[] parts = filterProperty.split("/", 2);
-  //
-  //      if (parts.length == 1) {
-  //        requestFilter = REQUEST_MATCH_ALL;
-  //      } else {
-  //        requestFilter = Pattern.compile(parts[1]);
-  //      }
-  //
-  //      exampleFilter = Pattern.compile(parts[0]);
-  //
-  //    } else {
-  //      requestFilter = REQUEST_MATCH_ALL;
-  //      exampleFilter = EXAMPLE_MATCH_ALL;
-  //    }
-  //  }
-  //
-  //  private static LoggerContext getLoggerContext() {
-  //    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
-  //    final URL logfile = classLoader.getResource("logback.xml");
-  //    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-  //    try {
-  //      final JoranConfigurator configurator = new JoranConfigurator();
-  //      configurator.setContext(loggerContext);
-  //      // Call context.reset() to clear any previous configuration, e.g. default
-  //      // configuration. For multi-step configuration, omit calling context.reset().
-  //      loggerContext.reset();
-  //      configurator.doConfigure(Objects.requireNonNull(logfile));
-  //    } catch (JoranException je) {
-  //      // StatusPrinter will handle this
-  //    }
-  //    return loggerContext;
-  //  }
-  //
-  //  private static File getFile(Class<?> testClass, String fileName) {
-  //    final URL resource = testClass.getResource(fileName);
-  //    if (resource == null) {
-  //      throw new AssertionError("Unable to find test resource: " + fileName);
-  //    }
-  //
-  //    return new File(resource.getFile());
-  //  }
-  //
-  //  public static void main(String[] args) {
-  //    JUnitCore junit = new JUnitCore();
-  //    if (args.length < 1) {
-  //      System.err.println(
-  //          "This main is expected to have at least one parameter, it is a regular "
-  //              + "expression for selecting the examples to run");
-  //      System.exit(1);
-  //    }
-  //    if (args.length > 2) {
-  //      System.err.println(
-  //          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
-  //              + "configRegexp");
-  //      System.exit(1);
-  //    }
-  //
-  //    String filter = args[0];
-  //    if (args.length == 2) {
-  //      filter += "/" + args[1];
-  //    }
-  //    System.setProperty(FILTER_PROPERTY, filter);
-  //    RunListener textListener = new TextListener(System.out);
-  //    junit.addListener(textListener);
-  //    junit.run(ExamplesTest.class);
-  //  }
-  //
-  //  @Test
-  //  public void testExampleDirectoryNames() {
-  //    final String namePattern = "[a-zA-Z0-9_]+";
-  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-  //    StringBuilder errors = new StringBuilder();
-  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-  //      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
-  //        errors.append("\n    * ").append(examplesDir.getName());
-  //      }
-  //    }
-  //
-  //    assertEquals(
-  //        0,
-  //        errors.length(),
-  //        String.format(
-  //            "All example directory names must match the pattern: '%s'.  "
-  //                + "The following fail that test: %s",
-  //            namePattern, errors));
-  //  }
-  //
-  //  @Test
-  //  public void testAllExamples() {
-  //    Map<String, Throwable> errors = new TreeMap<>();
-  //
-  //    int testsRan = 0;
-  //    final File examplesDir = getFile(ExamplesTest.class, "/examples");
-  //
-  //    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
-  //      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
-  //        testsRan += runExample(example, errors);
-  //      }
-  //    }
-  //
-  //    reportErrors(errors, testsRan);
-  //  }
-  //
-  //  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
-  //    if (!errors.isEmpty()) {
-  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-  //        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
-  //        error.getValue().printStackTrace();
-  //      }
-  //
-  //      StringBuilder errorReport = new StringBuilder();
-  //      errorReport.append("\n");
-  //      errorReport.append(errors.size());
-  //      errorReport.append(" errors encountered while running ");
-  //      errorReport.append(testsRan);
-  //      errorReport.append(" examples.\n");
-  //      errorReport.append(
-  //          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
-  //      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
-  //        StringBuilder exampleName = new StringBuilder();
-  //        exampleName.append("The example ");
-  //        exampleName.append(error.getKey());
-  //        errorReport.append(exampleName);
-  //        errorReport.append('\n');
-  //        //noinspection ReplaceAllDot
-  //        errorReport.append(exampleName.toString().replaceAll(".", "="));
-  //        errorReport.append('\n');
-  //        errorReport.append("Failed with the error:\n");
-  //        final StringWriter sw = new StringWriter();
-  //        error.getValue().printStackTrace(new PrintWriter(sw));
-  //        errorReport.append(sw);
-  //        errorReport.append('\n');
-  //      }
-  //      errorReport.append("\n\n");
-  //      fail(errorReport.toString());
-  //    }
-  //  }
-  //
-  //  private int runExample(File example, Map<String, Throwable> errors) {
-  //    int testsRan = 0;
-  //    try {
-  //      final File configFile = new File(example, CONFIG_FILE);
-  //      this.mapPrinter.setConfiguration(configFile);
-  //
-  //      if (!hasRequestFile(example)) {
-  //        throw new AssertionError(
-  //            String.format(
-  //                "Example: '%s' does not have any request data files.", example.getName()));
-  //      }
-  //      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
-  //        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
-  //          continue;
-  //        }
-  //        try {
-  //          if (isRequestDataFile(requestFile)) {
-  //            // WARN to be displayed in the Travis logs
-  //            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
-  //            String requestData =
-  //                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
-  //
-  //            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
-  //
-  //            testsRan++;
-  //            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
-  //            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
-  //
-  //            HttpURLConnection http =
-  //                createHttpUrlConnection(example.getName(), outputFormat, data.length);
-  //            http.connect();
-  //            try (OutputStream os = http.getOutputStream()) {
-  //              os.write(data);
-  //            }
-  //            int responseCode = http.getResponseCode();
-  //
-  //            InputStream inputStr = http.getInputStream();
-  //            if (responseCode != 200) {
-  //              String encoding =
-  //                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
-  //              String response = IOUtils.toString(inputStr, encoding);
-  //              Assert.isTrue(false, response);
-  //            }
-  //
-  //            Assert.equals(
-  //                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
-  //
-  //            if (requiringPdfAValidationTests.contains(example.getName())) {
-  //              pdfaValidate(errors, http, example.getName(), requestFile.getName());
-  //            } else {
-  //              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
-  //            }
-  //          }
-  //        } catch (IOException | AssertionError | RuntimeException e) {
-  //          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
-  //        }
-  //      }
-  //    } catch (IOException | RuntimeException | URISyntaxException e) {
-  //      errors.put(example.getName(), e);
-  //    }
-  //
-  //    return testsRan;
-  //  }
-  //
-  //  private void compareImages(
-  //      Map<String, Throwable> errors,
-  //      InputStream stream,
-  //      File example,
-  //      File requestFile,
-  //      String outputFormat)
-  //      throws IOException {
-  //    BufferedImage image = ImageIO.read(stream);
-  //    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
-  //      File expectedOutputDir = new File(example, "expected_output");
-  //      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
-  //      if (!expectedOutput.exists()) {
-  //        errors.put(
-  //            example.getName() + " (" + requestFile.getName() + ")",
-  //            new Exception("File not found: " + expectedOutput));
-  //      }
-  //
-  //      if (!"bmp".equals(outputFormat)) {
-  //        // BMP is not supported by ImageIO
-  //        new ImageSimilarity(expectedOutput).assertSimilarity(image);
-  //      }
-  //    }
-  //  }
-  //
-  //  private void pdfaValidate(
-  //      Map<String, Throwable> errors,
-  //      HttpURLConnection http,
-  //      String exampleName,
-  //      String requestFileName) {
-  //    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
-  //    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
-  //      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(),
-  // flavour);
-  //      ValidationResult result = validator.validate(parser);
-  //      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
-  //      Assert.isTrue(result.isCompliant());
-  //    } catch (EncryptedPdfException
-  //        | ModelParsingException
-  //        | ValidationException
-  //        | IOException
-  //        | AssertionFailedException e) {
-  //      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
-  //    }
-  //  }
-  //
-  //  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir)
-  // {
-  //    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
-  //    return new File(expectedOutputDir, imageName);
-  //  }
-  //
-  //  private boolean hasRequestFile(File example) {
-  //    for (File file : Objects.requireNonNull(example.listFiles())) {
-  //      if (isRequestDataFile(file)) {
-  //        return true;
-  //      }
-  //    }
-  //    return false;
-  //  }
-  //
-  //  private boolean isRequestDataFile(File requestFile) {
-  //    return requestFile.getName().matches(REQUEST_DATA_FILE);
-  //  }
-  //
-  //  private HttpURLConnection createHttpUrlConnection(
-  //      String exampleName, String outputFormat, int contentLength)
-  //      throws IOException, URISyntaxException {
-  //    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
-  //    http.setRequestMethod("POST");
-  //    http.setDoInput(true);
-  //    http.setDoOutput(true);
-  //    http.setFixedLengthStreamingMode(contentLength);
-  //    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
-  //    return http;
-  //  }
-  //
-  //  private URLConnection createUrlConnection(String exampleName, String outputFormat)
-  //      throws IOException, URISyntaxException {
-  //    URL url =
-  //        URL.of(
-  //            new URI(
-  //                AbstractApiTest.PRINT_SERVER
-  //                    + "print/"
-  //                    + exampleName
-  //                    + MapPrinterServlet.CREATE_AND_GET_URL
-  //                    + "."
-  //                    + outputFormat),
-  //            null);
-  //    URLConnection connection = url.openConnection();
-  //    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
-  //    connection.setRequestProperty("Cache-Control", "max-age=0");
-  //    return connection;
-  //  }
+  public static final String DEFAULT_SPRING_XML =
+      "classpath:mapfish-spring-application-context.xml";
+  public static final String TEST_SPRING_XML =
+      "classpath:test-http-request-factory-application-context.xml";
+  public static final String[] BITMAP_FORMATS = {"bmp", "png", "jpeg", "tiff", "jpg", "tif"};
+  private static final Map<String, String> FORMAT_TO_CONTENT_TYPE =
+      Map.of(
+          "pdf", "application/pdf",
+          "png", "image/png",
+          "jpg", "image/jpeg",
+          "jpeg", "image/jpeg",
+          "tif", "image/tiff",
+          "tiff", "image/tiff",
+          "gif", "image/gif",
+          "bmp", "image/bmp");
+  private static final Logger LOGGER = LoggerFactory.getLogger(ExamplesTest.class);
+  private static final String REQUEST_DATA_FILE = "requestData(-.*)?.json";
+  private static final String CONFIG_FILE = "config.yaml";
+
+  /**
+   * If this system property is set then it will be interpreted as a regular expression and will be
+   * used to filter the examples that are run.
+   *
+   * <p>For example: -Dexamples.filter=verbose.*
+   *
+   * <p>will run all examples starting with verbose.
+   */
+  private static final String FILTER_PROPERTY = "examples.filter";
+
+  private static final Pattern REQUEST_MATCH_ALL = Pattern.compile(".*");
+  private static final Pattern EXAMPLE_MATCH_ALL = Pattern.compile(".*");
+  private static Pattern exampleFilter;
+  private static Pattern requestFilter;
+  private static final List<String> requiringPdfAValidationTests = List.of("pdf_a_compliant");
+  private static final StatusPrinter2 statusPrinter2 = new StatusPrinter2();
+
+  static {
+    Handler.configureProtocolHandler();
+  }
+
+  @Autowired MapPrinter mapPrinter;
+
+  @BeforeAll
+  public static void setUp() {
+    final LoggerContext loggerContext = getLoggerContext();
+    statusPrinter2.printInCaseOfErrorsOrWarnings(loggerContext);
+
+    String filterProperty = System.getProperty(FILTER_PROPERTY);
+    if (!StringUtils.isEmpty(filterProperty)) {
+      String[] parts = filterProperty.split("/", 2);
+
+      if (parts.length == 1) {
+        requestFilter = REQUEST_MATCH_ALL;
+      } else {
+        requestFilter = Pattern.compile(parts[1]);
+      }
+
+      exampleFilter = Pattern.compile(parts[0]);
+
+    } else {
+      requestFilter = REQUEST_MATCH_ALL;
+      exampleFilter = EXAMPLE_MATCH_ALL;
+    }
+  }
+
+  private static LoggerContext getLoggerContext() {
+    final ClassLoader classLoader = AbstractApiTest.class.getClassLoader();
+    final URL logfile = classLoader.getResource("logback.xml");
+    final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
+    try {
+      final JoranConfigurator configurator = new JoranConfigurator();
+      configurator.setContext(loggerContext);
+      // Call context.reset() to clear any previous configuration, e.g. default
+      // configuration. For multi-step configuration, omit calling context.reset().
+      loggerContext.reset();
+      configurator.doConfigure(Objects.requireNonNull(logfile));
+    } catch (JoranException je) {
+      // StatusPrinter will handle this
+    }
+    return loggerContext;
+  }
+
+  private static File getFile(Class<?> testClass, String fileName) {
+    final URL resource = testClass.getResource(fileName);
+    if (resource == null) {
+      throw new AssertionError("Unable to find test resource: " + fileName);
+    }
+
+    return new File(resource.getFile());
+  }
+
+  public static void main(String[] args) {
+    if (args.length < 1) {
+      System.err.println(
+          "This main is expected to have at least one parameter, it is a regular "
+              + "expression for selecting the examples to run");
+      System.exit(1);
+    }
+    if (args.length > 2) {
+      System.err.println(
+          "A maximum of 2 parameters are allowed.  param 1=example regex, param2 = "
+              + "configRegexp");
+      System.exit(1);
+    }
+
+    String filter = args[0];
+    if (args.length == 2) {
+      filter += "/" + args[1];
+    }
+    System.setProperty(FILTER_PROPERTY, filter);
+
+    LauncherDiscoveryRequest request =
+        LauncherDiscoveryRequestBuilder.request()
+            .selectors(selectClass(ExamplesTest.class))
+            .build();
+
+    Launcher launcher = LauncherFactory.create();
+    SummaryGeneratingListener listener = new SummaryGeneratingListener();
+    launcher.registerTestExecutionListeners(listener);
+
+    launcher.execute(request);
+
+    listener.getSummary().printTo(new PrintWriter(System.out));
+
+    if (listener.getSummary().getTestsFailedCount() > 0) {
+      System.exit(1);
+    }
+  }
+
+  @Test
+  public void testExampleDirectoryNames() {
+    final String namePattern = "[a-zA-Z0-9_]+";
+    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+    StringBuilder errors = new StringBuilder();
+    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+      if (example.isDirectory() && !examplesDir.getName().matches(namePattern)) {
+        errors.append("\n    * ").append(examplesDir.getName());
+      }
+    }
+
+    assertEquals(
+        0,
+        errors.length(),
+        String.format(
+            "All example directory names must match the pattern: '%s'.  "
+                + "The following fail that test: %s",
+            namePattern, errors));
+  }
+
+  @Test
+  public void testAllExamples() {
+    Map<String, Throwable> errors = new TreeMap<>();
+
+    int testsRan = 0;
+    final File examplesDir = getFile(ExamplesTest.class, "/examples");
+
+    for (File example : Objects.requireNonNull(examplesDir.listFiles())) {
+      if (example.isDirectory() && exampleFilter.matcher(example.getName()).matches()) {
+        testsRan += runExample(example, errors);
+      }
+    }
+
+    reportErrors(errors, testsRan);
+  }
+
+  private void reportErrors(final Map<String, Throwable> errors, final int testsRan) {
+    if (!errors.isEmpty()) {
+      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+        System.err.println("\nExample: '" + error.getKey() + "' failed with the error:");
+        error.getValue().printStackTrace();
+      }
+
+      StringBuilder errorReport = new StringBuilder();
+      errorReport.append("\n");
+      errorReport.append(errors.size());
+      errorReport.append(" errors encountered while running ");
+      errorReport.append(testsRan);
+      errorReport.append(" examples.\n");
+      errorReport.append(
+          "See Standard Error for the stack traces.  A summary is as follows...\n\n");
+      for (Map.Entry<String, Throwable> error : errors.entrySet()) {
+        StringBuilder exampleName = new StringBuilder();
+        exampleName.append("The example ");
+        exampleName.append(error.getKey());
+        errorReport.append(exampleName);
+        errorReport.append('\n');
+        //noinspection ReplaceAllDot
+        errorReport.append(exampleName.toString().replaceAll(".", "="));
+        errorReport.append('\n');
+        errorReport.append("Failed with the error:\n");
+        final StringWriter sw = new StringWriter();
+        error.getValue().printStackTrace(new PrintWriter(sw));
+        errorReport.append(sw);
+        errorReport.append('\n');
+      }
+      errorReport.append("\n\n");
+      fail(errorReport.toString());
+    }
+  }
+
+  private int runExample(File example, Map<String, Throwable> errors) {
+    int testsRan = 0;
+    try {
+      final File configFile = new File(example, CONFIG_FILE);
+      this.mapPrinter.setConfiguration(configFile);
+
+      if (!hasRequestFile(example)) {
+        throw new AssertionError(
+            String.format(
+                "Example: '%s' does not have any request data files.", example.getName()));
+      }
+      for (File requestFile : Objects.requireNonNull(example.listFiles())) {
+        if (!requestFile.isFile() || !requestFilter.matcher(requestFile.getName()).matches()) {
+          continue;
+        }
+        try {
+          if (isRequestDataFile(requestFile)) {
+            // WARN to be displayed in the Travis logs
+            LOGGER.warn("Run example '{}' ({})", example.getName(), requestFile.getName());
+            String requestData =
+                java.nio.file.Files.readString(requestFile.toPath(), Constants.DEFAULT_CHARSET);
+
+            final PJsonObject jsonSpec = MapPrinter.parseSpec(requestData);
+
+            testsRan++;
+            String outputFormat = jsonSpec.getInternalObj().getString("outputFormat");
+            byte[] data = requestData.getBytes(StandardCharsets.UTF_8);
+
+            HttpURLConnection http =
+                createHttpUrlConnection(example.getName(), outputFormat, data.length);
+            http.connect();
+            try (OutputStream os = http.getOutputStream()) {
+              os.write(data);
+            }
+            int responseCode = http.getResponseCode();
+
+            InputStream inputStr = http.getInputStream();
+            if (responseCode != 200) {
+              String encoding =
+                  http.getContentEncoding() == null ? "UTF-8" : http.getContentEncoding();
+              String response = IOUtils.toString(inputStr, encoding);
+              Assert.isTrue(false, response);
+            }
+
+            Assert.equals(
+                FORMAT_TO_CONTENT_TYPE.get(outputFormat), http.getHeaderField("Content-Type"));
+
+            if (requiringPdfAValidationTests.contains(example.getName())) {
+              pdfaValidate(errors, http, example.getName(), requestFile.getName());
+            } else {
+              compareImages(errors, http.getInputStream(), example, requestFile, outputFormat);
+            }
+          }
+        } catch (IOException | AssertionError | RuntimeException e) {
+          errors.put(String.format("%s (%s)", example.getName(), requestFile.getName()), e);
+        }
+      }
+    } catch (IOException | RuntimeException | URISyntaxException e) {
+      errors.put(example.getName(), e);
+    }
+
+    return testsRan;
+  }
+
+  private void compareImages(
+      Map<String, Throwable> errors,
+      InputStream stream,
+      File example,
+      File requestFile,
+      String outputFormat)
+      throws IOException {
+    BufferedImage image = ImageIO.read(stream);
+    if (ArrayUtils.contains(BITMAP_FORMATS, outputFormat)) {
+      File expectedOutputDir = new File(example, "expected_output");
+      File expectedOutput = getExpectedOutput(outputFormat, requestFile, expectedOutputDir);
+      if (!expectedOutput.exists()) {
+        errors.put(
+            example.getName() + " (" + requestFile.getName() + ")",
+            new Exception("File not found: " + expectedOutput));
+      }
+
+      if (!"bmp".equals(outputFormat)) {
+        // BMP is not supported by ImageIO
+        new ImageSimilarity(expectedOutput).assertSimilarity(image);
+      }
+    }
+  }
+
+  private void pdfaValidate(
+      Map<String, Throwable> errors,
+      HttpURLConnection http,
+      String exampleName,
+      String requestFileName) {
+    PDFAFlavour flavour = PDFAFlavour.PDFA_1_A;
+    try (PDFAValidator validator = ValidatorFactory.createValidator(flavour, false)) {
+      GFModelParser parser = GFModelParser.createModelWithFlavour(http.getInputStream(), flavour);
+      ValidationResult result = validator.validate(parser);
+      LOGGER.warn("Example {} is PDF/A conform: {}", exampleName, result.isCompliant());
+      Assert.isTrue(result.isCompliant());
+    } catch (EncryptedPdfException
+        | ModelParsingException
+        | ValidationException
+        | IOException
+        | AssertionFailedException e) {
+      errors.put(String.format("%s (%s)", exampleName, requestFileName), e);
+    }
+  }
+
+  private File getExpectedOutput(String outputFormat, File requestFile, File expectedOutputDir) {
+    final String imageName = requestFile.getName().replace(".json", "." + outputFormat);
+    return new File(expectedOutputDir, imageName);
+  }
+
+  private boolean hasRequestFile(File example) {
+    for (File file : Objects.requireNonNull(example.listFiles())) {
+      if (isRequestDataFile(file)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private boolean isRequestDataFile(File requestFile) {
+    return requestFile.getName().matches(REQUEST_DATA_FILE);
+  }
+
+  private HttpURLConnection createHttpUrlConnection(
+      String exampleName, String outputFormat, int contentLength)
+      throws IOException, URISyntaxException {
+    HttpURLConnection http = (HttpURLConnection) createUrlConnection(exampleName, outputFormat);
+    http.setRequestMethod("POST");
+    http.setDoInput(true);
+    http.setDoOutput(true);
+    http.setFixedLengthStreamingMode(contentLength);
+    http.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+    return http;
+  }
+
+  private URLConnection createUrlConnection(String exampleName, String outputFormat)
+      throws IOException, URISyntaxException {
+    URL url =
+        URL.of(
+            new URI(
+                AbstractApiTest.PRINT_SERVER
+                    + "print/"
+                    + exampleName
+                    + MapPrinterServlet.CREATE_AND_GET_URL
+                    + "."
+                    + outputFormat),
+            null);
+    URLConnection connection = url.openConnection();
+    connection.setRequestProperty("Referer", AbstractApiTest.PRINT_SERVER);
+    connection.setRequestProperty("Cache-Control", "max-age=0");
+    return connection;
+  }
 }

From 0c7429abde424d99811dcc12071c9feb223734a6 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 11 Dec 2025 20:50:24 +0100
Subject: [PATCH 47/61] Re-enabled acceptance tests

---
 build.gradle                                  | 10 ---------
 examples/build.gradle                         | 21 +++++++++----------
 .../org/mapfish/print/AbstractApiTest.java    |  3 +++
 .../java/org/mapfish/print/ExamplesTest.java  |  2 +-
 .../org/mapfish/print/MetricsApiTest.java     |  3 +++
 .../java/org/mapfish/print/PrintApiTest.java  |  3 +++
 ...tp-request-factory-application-context.xml |  2 +-
 7 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 002bf8d0f..70003c79b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
 
 plugins {
   id("com.github.spotbugs") version "6.4.8"
-    id("org.openrewrite.rewrite") version("latest.release")
 }
 
 defaultTasks 'build'
@@ -94,12 +93,3 @@ tasks.register('docs') {
 repositories {
     mavenCentral()
 }
-
-rewrite {
-    activeRecipe("org.openrewrite.hibernate.MigrateToHibernate66")
-    setExportDatatables(true)
-}
-
-dependencies {
-    rewrite("org.openrewrite.recipe:rewrite-hibernate:2.16.0")
-}
diff --git a/examples/build.gradle b/examples/build.gradle
index 17f7f7aa2..ea6dc2250 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -6,7 +6,6 @@ repositories {
             excludeModule("javax.media", "jai_core")
         }
     }
-    maven { url = 'https://maven.restlet.org' }
     maven { url = "https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts" }
     maven { url = "https://repo.osgeo.org/repository/release/" }
 }
@@ -14,17 +13,17 @@ repositories {
 dependencies {
     testImplementation(
         project(':core'),
-        'commons-io:commons-io:2.17.0',
-        "org.springframework:spring-web:7.0.1",
-        'org.json:json:20240303',
-        'org.apache.commons:commons-lang3:3.5',
+        'ch.qos.logback:logback-classic:1.5.21',
+        'org.springframework:spring-core:7.0.1',
+        'org.springframework:spring-tx:7.0.1',
+        'org.springframework:spring-test:7.0.1',
+        'org.springframework:spring-web:7.0.1',
+        'org.json:json:20250517',
+        'commons-io:commons-io:2.21.0',
+        'org.apache.commons:commons-lang3:3.20.0',
         "org.locationtech.jts:jts-core:1.18.2",
-        "org.slf4j:slf4j-api:2.0.16",
-        "org.springframework:spring-test:7.0.1",
-        "ch.qos.logback:logback-classic:1.5.15",
-        "org.verapdf:validation-model:1.24.1",
+        'org.verapdf:validation-model:1.28.2',
         'org.junit.platform:junit-platform-launcher:6.0.1',
-
     )
 }
 
@@ -54,7 +53,7 @@ tasks.register('integrationTest', Test) {
     classpath = sourceSets.test.runtimeClasspath
     dependsOn(':core:compileJava', 'geoserver', testClasses)
     // Use JUnit for tests discovery
-    useJUnit()
+    useJUnitPlatform()
     testLogging {
         exceptionFormat = 'full'
         showCauses true
diff --git a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
index 2f55b605d..7280988c8 100644
--- a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
@@ -10,13 +10,16 @@
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.http.MfClientHttpRequestFactoryImpl;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ExtendWith(SpringExtension.class)
 public abstract class AbstractApiTest {
 
   protected static final String PRINT_SERVER = "http://print:8080/";
diff --git a/examples/src/test/java/org/mapfish/print/ExamplesTest.java b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
index b44d995e0..31c1eb6ae 100644
--- a/examples/src/test/java/org/mapfish/print/ExamplesTest.java
+++ b/examples/src/test/java/org/mapfish/print/ExamplesTest.java
@@ -192,7 +192,7 @@ public static void main(String[] args) {
 
     launcher.execute(request);
 
-    listener.getSummary().printTo(new PrintWriter(System.out));
+    listener.getSummary().printTo(new PrintWriter(System.out, true, StandardCharsets.UTF_8));
 
     if (listener.getSummary().getTestsFailedCount() > 0) {
       System.exit(1);
diff --git a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
index a0ee14f16..4fed6d601 100644
--- a/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/MetricsApiTest.java
@@ -6,11 +6,13 @@
 import java.net.URISyntaxException;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /*
  * Test the servlet metrics API.
@@ -20,6 +22,7 @@
  *      docker compose up -d
  *      docker compose exec tests gradle :examples:test
  */
+@ExtendWith(SpringExtension.class)
 public class MetricsApiTest extends AbstractApiTest {
 
   @Test
diff --git a/examples/src/test/java/org/mapfish/print/PrintApiTest.java b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
index f3ddabd24..930d1396f 100644
--- a/examples/src/test/java/org/mapfish/print/PrintApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
@@ -15,12 +15,14 @@
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.servlet.MapPrinterServlet;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Test the servlet print API.
@@ -33,6 +35,7 @@
  *
  * <p>./gradlew examples:geoserver
  */
+@ExtendWith(SpringExtension.class)
 public class PrintApiTest extends AbstractApiTest {
 
   @Test
diff --git a/examples/src/test/resources/test-http-request-factory-application-context.xml b/examples/src/test/resources/test-http-request-factory-application-context.xml
index 454c0c0a8..84a0dcde9 100644
--- a/examples/src/test/resources/test-http-request-factory-application-context.xml
+++ b/examples/src/test/resources/test-http-request-factory-application-context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
     <bean id="servletContext" class="org.springframework.mock.web.MockServletContext"/>
 </beans>

From 6107a1b716f6def263432721f66613a8f8faf939 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 12 Dec 2025 15:49:41 +0100
Subject: [PATCH 48/61] Increased log verbosity for debugging

---
 core/src/main/resources/logback.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
index 3a2dce5c8..7d5ad416c 100644
--- a/core/src/main/resources/logback.xml
+++ b/core/src/main/resources/logback.xml
@@ -8,11 +8,11 @@
         </encoder>
     </appender>
 
-    <logger name="org.mapfish" level="WARN" />
-    <logger name="com.codahale" level="WARN" />
-    <logger name="org.springframework" level="WARN" />
-    <logger name="org.apache" level="WARN" />
-    <logger name="org.hibernate" level="WARN" />
+    <logger name="org.mapfish" level="DEBUG" />
+    <logger name="com.codahale" level="DEBUG" />
+    <logger name="org.springframework" level="DEBUG" />
+    <logger name="org.apache" level="DEBUG" />
+    <logger name="org.hibernate" level="DEBUG" />
 
     <root level="INFO">
         <appender-ref ref="standardOut" />

From ae8ccd863883b23fe16ee1c0784015251d6502f0 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 15 Dec 2025 15:10:02 +0100
Subject: [PATCH 49/61] Explicitly define path param names in the main servlet

---
 .../print/servlet/MapPrinterServlet.java      | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index 38a37bede..d42b7e530 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -385,8 +385,8 @@ private static String maybeAddRequestId(final String ref, final HttpServletReque
       value = "/{appId}" + STATUS_URL + "/{referenceId:\\S+}.json",
       method = RequestMethod.GET)
   public final void getStatusSpecificAppId(
-      @Nonnull @PathVariable final String appId,
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
@@ -408,7 +408,7 @@ public final void getStatusSpecificAppId(
    */
   @RequestMapping(value = STATUS_URL + "/{referenceId:\\S+}.json", method = RequestMethod.GET)
   public final void getStatusPath(
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
@@ -478,8 +478,8 @@ private void getStatus(
       value = "/{appId}" + CANCEL_URL + "/{referenceId:\\S+}",
       method = RequestMethod.DELETE)
   public final void cancelSpecificAppId(
-      @Nonnull @PathVariable final String appId,
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
@@ -498,7 +498,8 @@ public final void cancelSpecificAppId(
    */
   @RequestMapping(value = CANCEL_URL + "/{referenceId:\\S+}", method = RequestMethod.DELETE)
   public final void cancelPath(
-      @Nonnull @PathVariable final String referenceId, final HttpServletResponse statusResponse) {
+      @Nonnull @PathVariable("referenceId") final String referenceId,
+      final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
       cancel("default", referenceId, statusResponse);
@@ -541,8 +542,8 @@ private void cancel(
    */
   @RequestMapping(value = "/{appId}" + REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @Nonnull @PathVariable final String appId,
-      @PathVariable final String format,
+      @Nonnull @PathVariable("appId") final String appId,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -597,8 +598,8 @@ private void doCreateReport(
       value = "/{appId}" + REPORT_URL + "/{referenceId:\\S+}",
       method = RequestMethod.GET)
   public final void getReportSpecificAppId(
-      @Nonnull @PathVariable final String appId,
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
       throws IOException, ServletException {
@@ -617,7 +618,7 @@ public final void getReportSpecificAppId(
    */
   @RequestMapping(value = REPORT_URL + "/{referenceId:\\S+}", method = RequestMethod.GET)
   public final void getReportPath(
-      @Nonnull @PathVariable final String referenceId,
+      @Nonnull @PathVariable("referenceId") final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
       throws IOException, ServletException {
@@ -658,7 +659,7 @@ private void getReport(
    */
   @RequestMapping(value = REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @PathVariable final String format,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -703,8 +704,8 @@ private static String getAppId(
       value = "/{appId}" + CREATE_AND_GET_URL + ".{format:\\w+}",
       method = RequestMethod.POST)
   public final void createReportAndGet(
-      @Nonnull @PathVariable final String appId,
-      @PathVariable final String format,
+      @Nonnull @PathVariable("appId") final String appId,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -757,7 +758,7 @@ private void doCreateReportAndGet(
    */
   @RequestMapping(value = CREATE_AND_GET_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReportAndGetNoAppId(
-      @PathVariable final String format,
+      @PathVariable("format") final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -830,7 +831,7 @@ public final void getCapabilities(
    */
   @RequestMapping(value = "/{appId}" + CAPABILITIES_URL, method = RequestMethod.GET)
   public final void getCapabilities(
-      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable("appId") final String appId,
       @RequestParam(value = "pretty", defaultValue = "false") final boolean pretty,
       final HttpServletRequest request,
       final HttpServletResponse capabilitiesResponse)
@@ -911,7 +912,7 @@ public final void getExampleRequest(
    */
   @RequestMapping(value = "{appId}" + EXAMPLE_REQUEST_URL, method = RequestMethod.GET)
   public final void getExampleRequest(
-      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable("appId") final String appId,
       final HttpServletRequest request,
       final HttpServletResponse getExampleResponse)
       throws IOException {

From 5c9fa4c7433b3d9da99dd2b28cf4acd02dde0d9a Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 15 Dec 2025 16:01:35 +0100
Subject: [PATCH 50/61] Fixed test link generation for the acceptance tests

---
 .../src/test/java/org/mapfish/print/AbstractApiTest.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
index 7280988c8..e14af167b 100644
--- a/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/AbstractApiTest.java
@@ -9,6 +9,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mapfish.print.http.MfClientHttpRequestFactoryImpl;
@@ -29,7 +31,9 @@ public abstract class AbstractApiTest {
 
   protected ClientHttpRequest getRequest(String path, HttpMethod method)
       throws IOException, URISyntaxException {
-    return httpRequestFactory.createRequest(new URI(PRINT_SERVER + path), method);
+    var actualUrl =
+        Stream.of(path.split("/")).filter(s -> !s.isEmpty()).collect(Collectors.joining("/"));
+    return httpRequestFactory.createRequest(new URI(PRINT_SERVER + actualUrl), method);
   }
 
   protected String getBodyAsText(ClientHttpResponse response) throws IOException {

From 62f57e1b3b342f746218a2326170101957145fac Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Thu, 18 Dec 2025 17:35:25 +0100
Subject: [PATCH 51/61] Proof of concept fix for the failing secure templates
 test

---
 build.gradle                                               | 5 -----
 core/Dockerfile                                            | 2 ++
 docker-compose.yaml                                        | 4 ++++
 examples/build.gradle                                      | 5 ++---
 examples/src/test/java/org/mapfish/print/PrintApiTest.java | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 70003c79b..9d4403552 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,7 +65,6 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 
     dependencies {
         testImplementation(
-            'org.junit.jupiter:junit-jupiter:6.0.1',
             'org.mockito:mockito-core:5.20.0',
         )
     }
@@ -89,7 +88,3 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
 tasks.register('docs') {
     enabled = false
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/core/Dockerfile b/core/Dockerfile
index 0ce57bb87..c5afc24d9 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -45,6 +45,8 @@ ENV LOG_LEVEL=INFO \
   PRINT_YAML_MAX_ALIASES=50 \
   SENTRY_DSN=
 
+COPY extraConfigFor/acceptanceTests/mapfish-spring-application-context-override.xml /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/
+
 CMD ["/usr/local/tomcat/bin/docker-start-print"]
 
 FROM runner AS tester
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 24fd5c3cd..0d6f46071 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,6 +22,9 @@ services:
     image: mapfish_print_builder
     user: ${USER_ID}
     command: tail --follow /dev/null
+    ports:
+      # Forward the port for Java remote debugging defined in the JAVA_OPTS environment variable
+      - 5006:5006
     volumes:
       - ./examples/src:/src/examples/src:ro
       - ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples
@@ -30,3 +33,4 @@ services:
     environment:
       PRINT_YAML_MAX_ALIASES: '200'
       GRADLE_USER_HOME: /home/gradle/.gradle
+      JAVA_OPTS: -Dsun.net.inetaddr.ttl=30 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006
diff --git a/examples/build.gradle b/examples/build.gradle
index ea6dc2250..ebf8048e0 100644
--- a/examples/build.gradle
+++ b/examples/build.gradle
@@ -18,6 +18,7 @@ dependencies {
         'org.springframework:spring-tx:7.0.1',
         'org.springframework:spring-test:7.0.1',
         'org.springframework:spring-web:7.0.1',
+        'org.junit.jupiter:junit-jupiter:6.0.1',
         'org.json:json:20250517',
         'commons-io:commons-io:2.21.0',
         'org.apache.commons:commons-lang3:3.20.0',
@@ -42,9 +43,7 @@ tasks.register('geoserver' , Exec) {
 // prevent that the tests target can be directly called. the integration tests
 // must be run with `./gradlew examples:geoserver` to make sure the
 // server is running
-test {
-    useJUnitPlatform()
-}
+test {}
 test.onlyIf { false }
 
 tasks.register('integrationTest', Test) {
diff --git a/examples/src/test/java/org/mapfish/print/PrintApiTest.java b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
index 930d1396f..2bff2c20c 100644
--- a/examples/src/test/java/org/mapfish/print/PrintApiTest.java
+++ b/examples/src/test/java/org/mapfish/print/PrintApiTest.java
@@ -521,6 +521,7 @@ public void testCors() throws Exception {
     request.getHeaders().set("Origin", "http://example.com/");
     request.getHeaders().set("Access-Control-Request-Method", "POST");
     request.getHeaders().set("Access-Control-Request-Headers", "X-Toto");
+    request.getHeaders().set("Content-Type", "application/json");
     try (ClientHttpResponse response = request.execute()) {
       assertEquals(HttpStatus.OK, response.getStatusCode());
       assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));

From a01f8ffd746fc39a4091cc1204dd73af30fc8750 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 19 Dec 2025 12:38:23 +0100
Subject: [PATCH 52/61] Removed WIP fix

---
 core/Dockerfile     | 2 --
 docker-compose.yaml | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index c5afc24d9..0ce57bb87 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -45,8 +45,6 @@ ENV LOG_LEVEL=INFO \
   PRINT_YAML_MAX_ALIASES=50 \
   SENTRY_DSN=
 
-COPY extraConfigFor/acceptanceTests/mapfish-spring-application-context-override.xml /usr/local/tomcat/webapps/ROOT/WEB-INF/classes/
-
 CMD ["/usr/local/tomcat/bin/docker-start-print"]
 
 FROM runner AS tester
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0d6f46071..24fd5c3cd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,9 +22,6 @@ services:
     image: mapfish_print_builder
     user: ${USER_ID}
     command: tail --follow /dev/null
-    ports:
-      # Forward the port for Java remote debugging defined in the JAVA_OPTS environment variable
-      - 5006:5006
     volumes:
       - ./examples/src:/src/examples/src:ro
       - ./examples/src/test/resources/examples:/src/examples/src/test/resources/examples
@@ -33,4 +30,3 @@ services:
     environment:
       PRINT_YAML_MAX_ALIASES: '200'
       GRADLE_USER_HOME: /home/gradle/.gradle
-      JAVA_OPTS: -Dsun.net.inetaddr.ttl=30 -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006

From a2332967a1ec12c3347fdc0aea89e8e8c143cd53 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 19 Dec 2025 15:44:27 +0100
Subject: [PATCH 53/61] Fixed http to https redirect for the private templates

---
 core/build.gradle                                   | 4 ++--
 core/src/main/resources/mapfish-spring-security.xml | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 740f6b50b..f53d6217d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -135,8 +135,8 @@ dependencies {
         '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.0',
-        'org.springframework.security:spring-security-web:7.0.0',
+        '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',
diff --git a/core/src/main/resources/mapfish-spring-security.xml b/core/src/main/resources/mapfish-spring-security.xml
index 830c47f3b..13df38e6b 100644
--- a/core/src/main/resources/mapfish-spring-security.xml
+++ b/core/src/main/resources/mapfish-spring-security.xml
@@ -12,6 +12,14 @@
         <beans:property name="allowUrlEncodedSlash" value="true"/>
     </beans:bean>
 
+    <beans:bean id="httpsRedirectFilter" class="org.springframework.security.web.transport.HttpsRedirectFilter">
+        <beans:property name="requestMatcher">
+            <beans:bean factory-method="pathPattern" class="org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher">
+                <beans:constructor-arg value="/sec/print/**"/>
+            </beans:bean>
+        </beans:property>
+    </beans:bean>
+
     <http-firewall ref="httpFirewall"/>
 
     <http use-expressions="true">
@@ -20,6 +28,7 @@
         <intercept-url pattern="/**" access="permitAll()"/>
         <http-basic/>
         <anonymous/>
+        <custom-filter ref="httpsRedirectFilter" after="FIRST"/>
     </http>
 
     <!--

From e54f3174f3b128b439a38368977ebd59d4a3e246 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Fri, 19 Dec 2025 18:54:32 +0100
Subject: [PATCH 54/61] Restored missing dependencies for unit tests

---
 core/build.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index f53d6217d..777f2f19c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -211,8 +211,12 @@ dependencies {
     //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() {

From 730c01a4fd435e95a08402fef9b82ea7182202a5 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 22 Dec 2025 15:20:24 +0100
Subject: [PATCH 55/61] Fixed clustering tests.

Removed length constraints for the data table in the PrintJobResultExtImpl
---
 .../print/servlet/job/impl/PrintJobResultImpl.java        | 8 ++++----
 .../print/servlet/job/impl/PrintJobStatusImpl.java        | 2 +-
 .../servlet/job/impl/hibernate/PrintJobResultExtImpl.java | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
index afae27063..d0c1b6d82 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
@@ -20,13 +20,13 @@
 @Table(name = "print_job_results")
 public class PrintJobResultImpl implements PrintJobResult {
 
-  @Id private final String reportURI;
+  @Id private String reportURI;
 
-  @Column private final String mimeType;
+  @Column private String mimeType;
 
-  @Column private final String fileExtension;
+  @Column private String fileExtension;
 
-  @Column private final String fileName;
+  @Column private String fileName;
 
   @OneToOne(targetEntity = PrintJobStatusImpl.class, fetch = FetchType.LAZY)
   @OnDelete(action = OnDeleteAction.CASCADE)
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index a97ef0e78..80db119d7 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -23,7 +23,7 @@
 public class PrintJobStatusImpl implements PrintJobStatus {
   @Embedded
   @Target(PrintJobEntryImpl.class)
-  private final PrintJobEntry entry;
+  private PrintJobEntry entry;
 
   @Id private String referenceId;
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
index c839af946..3eadb8112 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
@@ -10,7 +10,7 @@
 @Entity
 public class PrintJobResultExtImpl extends PrintJobResultImpl {
 
-  @Column(length = 1000000000)
+  @Column(length = 1000000)
   @Basic
   private byte[] data;
 

From 5c76c93cda502d714822f3c8167804c10c3de1f3 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 22 Dec 2025 16:21:15 +0100
Subject: [PATCH 56/61] Added size constraints instead of the default ones

---
 .../org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index 80db119d7..3709ac726 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -35,6 +35,7 @@ public class PrintJobStatusImpl implements PrintJobStatus {
 
   @Column private long requestCount;
 
+  @Column(length = 4096)
   private String error;
 
   @OneToOne(targetEntity = PrintJobResultImpl.class, cascade = CascadeType.ALL, mappedBy = "status")

From b7da39d0e172b8e1c7bfffac7795c8cdead1c39c Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Tue, 23 Dec 2025 13:12:45 +0100
Subject: [PATCH 57/61] Merge PrintJobImpl interface and implementation

---
 core/build.gradle                             |   1 +
 .../print/servlet/MapPrinterServlet.java      |   4 +-
 .../mapfish/print/servlet/job/PrintJob.java   |   3 +-
 .../print/servlet/job/PrintJobEntry.java      | 137 ++++++++++++++--
 .../servlet/job/impl/PrintJobEntryImpl.java   | 153 ------------------
 .../servlet/job/impl/PrintJobStatusImpl.java  |   6 +-
 .../servlet/job/impl/RegistryJobQueue.java    |   2 +-
 .../print/servlet/job/ClusteringTaskTest.java |   9 +-
 .../job/PostResultToRegistryTaskTest.java     |   5 +-
 9 files changed, 141 insertions(+), 179 deletions(-)
 delete mode 100644 core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java

diff --git a/core/build.gradle b/core/build.gradle
index 777f2f19c..89df028d9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -91,6 +91,7 @@ test {
         junitXml.getRequired().set(true)
         html.getRequired().set(true)
     }
+    maxHeapSize = "2G"
     useJUnitPlatform()
 }
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index d42b7e530..d4c104632 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -53,8 +53,8 @@
 import org.mapfish.print.processor.http.matcher.UriMatchers;
 import org.mapfish.print.servlet.job.JobManager;
 import org.mapfish.print.servlet.job.NoSuchReferenceException;
+import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.PrintJobStatus;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.mapfish.print.url.data.Handler;
@@ -1152,7 +1152,7 @@ private String createAndSubmitPrintJob(
       return null;
     }
 
-    PrintJobEntryImpl jobEntry = new PrintJobEntryImpl(ref, specJson, System.currentTimeMillis());
+    PrintJobEntry jobEntry = new PrintJobEntry(ref, specJson, System.currentTimeMillis());
     jobEntry.configureAccess(template, this.context);
 
     try {
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
index 4c921e1c6..5681abadc 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJob.java
@@ -39,7 +39,6 @@
 import org.mapfish.print.output.OutputFormat;
 import org.mapfish.print.processor.ExecutionStats;
 import org.mapfish.print.processor.Processor;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -385,7 +384,7 @@ public Set<String> getAppIds() {
             return null;
           }
         };
-    this.entry = new PrintJobEntryImpl();
+    this.entry = new PrintJobEntry();
   }
 
   /** Interface encapsulating the code to run with the open output stream. */
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java
index 2f0a833ec..e3e68d38a 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/PrintJobEntry.java
@@ -1,33 +1,152 @@
 package org.mapfish.print.servlet.job;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.util.Date;
+import org.hibernate.annotations.Type;
+import org.mapfish.print.config.Configuration;
+import org.mapfish.print.config.Template;
 import org.mapfish.print.config.access.AccessAssertion;
+import org.mapfish.print.config.access.AndAccessAssertion;
+import org.mapfish.print.servlet.MapPrinterServlet;
+import org.mapfish.print.servlet.ServletMapPrinterFactory;
+import org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType;
+import org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType;
 import org.mapfish.print.wrapper.json.PJsonObject;
+import org.springframework.context.ApplicationContext;
 
 /** Print Job Entry. */
-public interface PrintJobEntry {
+@Embeddable
+public class PrintJobEntry {
+
+  @Column(insertable = false, updatable = false)
+  private String referenceId;
+
+  @Column()
+  @Type(PJsonObjectUserType.class)
+  private PJsonObject requestData;
+
+  @Column private long startTime;
+
+  @Column()
+  @Type(AccessAssertionUserType.class)
+  private AccessAssertion access;
+
+  /** Constructor. */
+  public PrintJobEntry() {}
+
+  /**
+   * Constructor.
+   *
+   * @param referenceId reference of the report.
+   * @param requestData the request data
+   * @param startTime the time when the print job started.
+   */
+  public PrintJobEntry(
+      final String referenceId, final PJsonObject requestData, final long startTime) {
+    this.referenceId = referenceId;
+    this.requestData = requestData;
+    this.startTime = startTime;
+  }
+
+  /**
+   * Constructor.
+   *
+   * @param referenceId reference of the report.
+   * @param requestData the request data
+   * @param startTime the time when the print job started.
+   * @param access the an access control object for downloading this report. Typically this is
+   *     combined access of the template and the configuration.
+   */
+  public PrintJobEntry(
+      final String referenceId,
+      final PJsonObject requestData,
+      final long startTime,
+      final AccessAssertion access) {
+    this.referenceId = referenceId;
+    this.requestData = requestData;
+    this.access = access;
+    this.startTime = startTime;
+  }
 
   /** Get reference ID. */
-  String getReferenceId();
+  public final String getReferenceId() {
+    return this.referenceId;
+  }
+
+  public final void setReferenceId(final String referenceId) {
+    this.referenceId = referenceId;
+  }
 
   /** Get request data. */
-  PJsonObject getRequestData();
+  public final PJsonObject getRequestData() {
+    return this.requestData;
+  }
+
+  public final void setRequestData(final PJsonObject requestData) {
+    this.requestData = requestData;
+  }
 
   /** Get start time (as long). */
-  long getStartTime();
+  public final long getStartTime() {
+    return this.startTime;
+  }
+
+  public final void setStartTime(final long startTime) {
+    this.startTime = startTime;
+  }
 
   /** Get start time (as date). */
-  Date getStartDate();
+  public final Date getStartDate() {
+    return new Date(this.startTime);
+  }
 
   /** Get access assertion. */
-  AccessAssertion getAccess();
+  public final AccessAssertion getAccess() {
+    return this.access;
+  }
+
+  public final void setAccess(final AccessAssertion access) {
+    this.access = access;
+  }
 
   /** Get app ID. */
-  String getAppId();
+  public final String getAppId() {
+    return getRequestData()
+        .optString(
+            MapPrinterServlet.JSON_APP, ServletMapPrinterFactory.DEFAULT_CONFIGURATION_FILE_KEY);
+  }
 
   /** Get time since start. */
-  long getTimeSinceStart();
+  public final long getTimeSinceStart() {
+    return System.currentTimeMillis() - getStartTime();
+  }
 
   /** Assert that the current is authorized to access this job. */
-  void assertAccess();
+  public final void assertAccess() {
+    this.access.assertAccess(
+        getClass().getSimpleName()
+            + " for app '"
+            + getAppId()
+            + "' for print job '"
+            + getReferenceId()
+            + "'",
+        this);
+  }
+
+  /**
+   * Configure the access permissions required to access this print job.
+   *
+   * @param template the containing print template which should have sufficient information to
+   *     configure the access.
+   * @param context the application context
+   */
+  public final void configureAccess(final Template template, final ApplicationContext context) {
+    final Configuration configuration = template.getConfiguration();
+
+    AndAccessAssertion accessAssertion = context.getBean(AndAccessAssertion.class);
+    accessAssertion.setPredicates(
+        configuration.getAccessAssertion(), template.getAccessAssertion());
+    this.access = accessAssertion;
+  }
 }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
deleted file mode 100644
index 7940c00fc..000000000
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.mapfish.print.servlet.job.impl;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-import java.util.Date;
-import org.hibernate.annotations.Type;
-import org.mapfish.print.config.Configuration;
-import org.mapfish.print.config.Template;
-import org.mapfish.print.config.access.AccessAssertion;
-import org.mapfish.print.config.access.AndAccessAssertion;
-import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.servlet.ServletMapPrinterFactory;
-import org.mapfish.print.servlet.job.PrintJobEntry;
-import org.mapfish.print.servlet.job.impl.hibernate.AccessAssertionUserType;
-import org.mapfish.print.servlet.job.impl.hibernate.PJsonObjectUserType;
-import org.mapfish.print.wrapper.json.PJsonObject;
-import org.springframework.context.ApplicationContext;
-
-/** Print Job Entry. */
-@Embeddable
-public class PrintJobEntryImpl implements PrintJobEntry {
-
-  @Column(insertable = false, updatable = false)
-  private String referenceId;
-
-  @Column()
-  @Type(PJsonObjectUserType.class)
-  private PJsonObject requestData;
-
-  @Column private long startTime;
-
-  @Column()
-  @Type(AccessAssertionUserType.class)
-  private AccessAssertion access;
-
-  /** Constructor. */
-  public PrintJobEntryImpl() {}
-
-  /**
-   * Constructor.
-   *
-   * @param referenceId reference of the report.
-   * @param requestData the request data
-   * @param startTime the time when the print job started.
-   */
-  public PrintJobEntryImpl(
-      final String referenceId, final PJsonObject requestData, final long startTime) {
-    this.referenceId = referenceId;
-    this.requestData = requestData;
-    this.startTime = startTime;
-  }
-
-  /**
-   * Constructor.
-   *
-   * @param referenceId reference of the report.
-   * @param requestData the request data
-   * @param startTime the time when the print job started.
-   * @param access the an access control object for downloading this report. Typically this is
-   *     combined access of the template and the configuration.
-   */
-  public PrintJobEntryImpl(
-      final String referenceId,
-      final PJsonObject requestData,
-      final long startTime,
-      final AccessAssertion access) {
-    this.referenceId = referenceId;
-    this.requestData = requestData;
-    this.access = access;
-    this.startTime = startTime;
-  }
-
-  @Override
-  public final String getReferenceId() {
-    return this.referenceId;
-  }
-
-  public final void setReferenceId(final String referenceId) {
-    this.referenceId = referenceId;
-  }
-
-  @Override
-  public final PJsonObject getRequestData() {
-    return this.requestData;
-  }
-
-  public final void setRequestData(final PJsonObject requestData) {
-    this.requestData = requestData;
-  }
-
-  @Override
-  public final long getStartTime() {
-    return this.startTime;
-  }
-
-  public final void setStartTime(final long startTime) {
-    this.startTime = startTime;
-  }
-
-  @Override
-  public final Date getStartDate() {
-    return new Date(this.startTime);
-  }
-
-  @Override
-  public final AccessAssertion getAccess() {
-    return this.access;
-  }
-
-  public final void setAccess(final AccessAssertion access) {
-    this.access = access;
-  }
-
-  @Override
-  public final String getAppId() {
-    return getRequestData()
-        .optString(
-            MapPrinterServlet.JSON_APP, ServletMapPrinterFactory.DEFAULT_CONFIGURATION_FILE_KEY);
-  }
-
-  @Override
-  public final long getTimeSinceStart() {
-    return System.currentTimeMillis() - getStartTime();
-  }
-
-  @Override
-  public final void assertAccess() {
-    this.access.assertAccess(
-        getClass().getSimpleName()
-            + " for app '"
-            + getAppId()
-            + "' for print job '"
-            + getReferenceId()
-            + "'",
-        this);
-  }
-
-  /**
-   * Configure the access permissions required to access this print job.
-   *
-   * @param template the containing print template which should have sufficient information to
-   *     configure the access.
-   * @param context the application context
-   */
-  public final void configureAccess(final Template template, final ApplicationContext context) {
-    final Configuration configuration = template.getConfiguration();
-
-    AndAccessAssertion accessAssertion = context.getBean(AndAccessAssertion.class);
-    accessAssertion.setPredicates(
-        configuration.getAccessAssertion(), template.getAccessAssertion());
-    this.access = accessAssertion;
-  }
-}
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
index 3709ac726..ef832fb12 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
@@ -11,7 +11,6 @@
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import java.util.Date;
-import org.hibernate.annotations.Target;
 import org.mapfish.print.config.access.AccessAssertion;
 import org.mapfish.print.servlet.job.PrintJobEntry;
 import org.mapfish.print.servlet.job.PrintJobResult;
@@ -21,9 +20,8 @@
 @Entity
 @Table(name = "print_job_statuses")
 public class PrintJobStatusImpl implements PrintJobStatus {
-  @Embedded
-  @Target(PrintJobEntryImpl.class)
-  private PrintJobEntry entry;
+
+  @Embedded private PrintJobEntry entry;
 
   @Id private String referenceId;
 
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java
index a71008760..db2d44304 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/RegistryJobQueue.java
@@ -225,7 +225,7 @@ private PrintJobStatusImpl load(final String referenceId)
 
       PrintJobStatusImpl report =
           new PrintJobStatusImpl(
-              new PrintJobEntryImpl(referenceId, requestData, startTime, accessAssertion),
+              new PrintJobEntry(referenceId, requestData, startTime, accessAssertion),
               requestCount);
       report.setStatus(status);
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
index efc96be3e..91caf79a7 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/ClusteringTaskTest.java
@@ -13,7 +13,6 @@
 import org.mapfish.print.config.access.AlwaysAllowAssertion;
 import org.mapfish.print.servlet.ClusteredMapPrinterServletTest;
 import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.slf4j.Logger;
@@ -63,16 +62,16 @@ public void testRun() throws Exception {
                     + "}"),
             "job");
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "first job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "second job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "third job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
     jobMan1.submit(
-        new PrintJobEntryImpl(
+        new PrintJobEntry(
             "fourth job", requestData, System.currentTimeMillis(), new AlwaysAllowAssertion()));
 
     int ready = 0;
diff --git a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
index c6cde2bad..6c26e399d 100644
--- a/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/job/PostResultToRegistryTaskTest.java
@@ -14,7 +14,6 @@
 import org.mapfish.print.config.Template;
 import org.mapfish.print.processor.AbstractProcessor;
 import org.mapfish.print.servlet.MapPrinterServlet;
-import org.mapfish.print.servlet.job.impl.PrintJobEntryImpl;
 import org.mapfish.print.servlet.job.impl.ThreadPoolJobManager;
 import org.mapfish.print.wrapper.json.PJsonObject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +31,7 @@ public void testRun() {
 
     assertRegistryValues(0, 0, true);
     TestPrintJob printJob = new TestPrintJob();
-    PrintJobEntryImpl entry = (PrintJobEntryImpl) printJob.getEntry();
+    PrintJobEntry entry = (PrintJobEntry) printJob.getEntry();
     entry.setStartTime(System.currentTimeMillis());
     jobManager.submit(printJob);
 
@@ -99,7 +98,7 @@ private class TestPrintJob extends PrintJob {
     {
       try {
         initForTesting(context);
-        PrintJobEntryImpl entry = (PrintJobEntryImpl) getEntry();
+        PrintJobEntry entry = (PrintJobEntry) getEntry();
         entry.setRequestData(
             new PJsonObject(
                 new JSONObject(

From 41663984ce63aef77e8b67a900af178d57719350 Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Wed, 24 Dec 2025 14:49:08 +0100
Subject: [PATCH 58/61] Resolved the deprecated issues

---
 .../http/ErrorResponseClientHttpResponse.java |  4 ++--
 .../mapfish/print/http/HttpCredential.java    |  3 +--
 .../http/MfClientHttpRequestFactoryImpl.java  | 14 +++++++------
 .../print/map/image/wms/WmsUtilities.java     | 20 +++++++++----------
 .../servlet/job/HibernateAccounting.java      | 18 ++++++-----------
 .../job/impl/hibernate/PrintJobDao.java       |  8 ++++----
 .../print/http/HttpCredentialTest.java        |  6 +++---
 .../org/mapfish/print/http/HttpProxyTest.java |  5 ++++-
 8 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
index a6ae2429a..eac9fb703 100644
--- a/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
+++ b/core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java
@@ -6,7 +6,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.util.StreamUtils;
 
 public class ErrorResponseClientHttpResponse implements ClientHttpResponse {
   private final Exception exception;
@@ -28,10 +27,11 @@ public HttpHeaders getHeaders() {
   @Override
   @Nonnull
   public InputStream getBody() {
-    return StreamUtils.emptyInput();
+    return InputStream.nullInputStream();
   }
 
   @Override
+  @Nonnull
   public HttpStatusCode getStatusCode() throws IOException {
     return FAKE_HTTP_ERROR_CODE;
   }
diff --git a/core/src/main/java/org/mapfish/print/http/HttpCredential.java b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
index c34e4d39f..09aad5841 100644
--- a/core/src/main/java/org/mapfish/print/http/HttpCredential.java
+++ b/core/src/main/java/org/mapfish/print/http/HttpCredential.java
@@ -6,7 +6,6 @@
 import java.net.UnknownHostException;
 import java.util.List;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.mapfish.print.config.Configuration;
 import org.mapfish.print.config.ConfigurationObject;
@@ -94,7 +93,7 @@ public boolean matches(final MatchInfo matchInfo)
    * @param authscope the scope to test against.
    */
   @Nullable
-  public final Credentials toCredentials(final AuthScope authscope) {
+  public final UsernamePasswordCredentials toCredentials(final AuthScope authscope) {
     try {
 
       if (!matches(MatchInfo.fromAuthScope(authscope))) {
diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
index 9591724e3..f5c0a0908 100644
--- a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
+++ b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -20,6 +20,7 @@
 import org.apache.hc.client5.http.SystemDefaultDnsResolver;
 import org.apache.hc.client5.http.classic.HttpClient;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
+import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -97,7 +98,6 @@ private static CloseableHttpClient createHttpClient(
     final RequestConfig requestConfig =
         RequestConfig.custom()
             .setConnectionRequestTimeout(connectionRequestTimeout, TimeUnit.MILLISECONDS)
-            .setConnectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
             .setResponseTimeout(socketTimeout, TimeUnit.MILLISECONDS)
             .build();
 
@@ -106,6 +106,10 @@ private static CloseableHttpClient createHttpClient(
             .disableCookieManagement()
             .setConnectionManager(
                 PoolingHttpClientConnectionManagerBuilder.create()
+                    .setDefaultConnectionConfig(
+                        ConnectionConfig.custom()
+                            .setConnectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
+                            .build())
                     .setTlsSocketStrategy(new MfTLSSocketStrategy())
                     .setDnsResolver(new RandomizingDnsResolver())
                     .setMaxConnPerRoute(maxConnTotal)
@@ -238,9 +242,7 @@ protected Response executeInternal(@Nonnull final HttpHeaders headers) throws IO
             new ByteArrayEntity(bytes, ContentType.APPLICATION_OCTET_STREAM);
         entityEnclosingRequest.setEntity(requestEntity);
       }
-
-      ClassicHttpResponse response =
-          (ClassicHttpResponse) this.client.execute(this.request, this.context);
+      ClassicHttpResponse response = this.client.executeOpen(null, this.request, this.context);
       LOGGER.debug("Response: {} -- {}", response.getCode(), this.getURI());
 
       return new Response(response);
@@ -274,16 +276,16 @@ public String getStatusText() {
     @Override
     public void close() {
       try {
-        getBody();
         if (inputStream != null) {
           inputStream.close();
-          inputStream = null;
         }
+        this.response.close();
       } catch (IOException e) {
         LOGGER.error(
             "Error occurred while trying to retrieve Http Response {} in order to close it.",
             this.id,
             e);
+      } finally {
         inputStream = null;
       }
       LOGGER.trace("Closed Http Response object: {}", this.id);
diff --git a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
index 441a26147..f0c2ae4ef 100644
--- a/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
+++ b/core/src/main/java/org/mapfish/print/map/image/wms/WmsUtilities.java
@@ -14,8 +14,8 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hc.core5.net.URLEncodedUtils;
 import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.net.URIBuilder;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.ows.wms.request.GetMapRequest;
@@ -73,7 +73,7 @@ public static URI makeWmsGetLayerRequest(
 
     Multimap<String, String> extraParams = HashMultimap.create();
     if (commonURI.getQuery() != null) {
-      for (NameValuePair pair : URLEncodedUtils.parse(commonURI, StandardCharsets.UTF_8)) {
+      for (NameValuePair pair : new URIBuilder(commonURI).getQueryParams()) {
         extraParams.put(pair.getName(), pair.getValue());
       }
     }
@@ -201,14 +201,14 @@ public static ClientHttpRequest createWmsRequest(
       final URI paramlessUri;
       try {
         paramlessUri =
-          new URI(
-            uri.getScheme(),
-            uri.getUserInfo(),
-            uri.getHost(),
-            uri.getPort(),
-            uri.getPath(),
-            null,
-            null);
+            new URI(
+                uri.getScheme(),
+                uri.getUserInfo(),
+                uri.getHost(),
+                uri.getPort(),
+                uri.getPath(),
+                null,
+                null);
       } catch (URISyntaxException e) {
         throw new RuntimeException(e);
       }
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
index 22cba9cf9..3ddf38977 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccounting.java
@@ -1,6 +1,5 @@
 package org.mapfish.print.servlet.job;
 
-import jakarta.annotation.Nonnull;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -10,8 +9,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
 
 /** Store accounting info in the DB. */
@@ -73,15 +70,12 @@ private void insertRecord(final HibernateAccountingEntry tuple) {
       try {
         final TransactionTemplate tmpl =
             new TransactionTemplate(HibernateAccounting.this.txManager);
-        tmpl.execute(
-            new TransactionCallbackWithoutResult() {
-              @Override
-              protected void doInTransactionWithoutResult(@Nonnull final TransactionStatus status) {
-                final Session currentSession = HibernateAccounting.this.sf.getCurrentSession();
-                currentSession.merge(tuple);
-                currentSession.flush();
-                currentSession.evict(tuple);
-              }
+        tmpl.executeWithoutResult(
+            (status) -> {
+              final Session currentSession = HibernateAccounting.this.sf.getCurrentSession();
+              currentSession.merge(tuple);
+              currentSession.flush();
+              currentSession.evict(tuple);
             });
       } catch (HibernateException ex) {
         unhealthyCountersHealthCheck.recordUnhealthyProblem(
diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
index 3d5a93445..bc765d755 100644
--- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
+++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
@@ -164,7 +164,7 @@ public final void cancelOld(
                     builder.lessThan(root.get("lastCheckTime"), checkTimeThreshold)))));
     update.set(root.get("status"), PrintJobStatus.Status.CANCELED);
     update.set(root.get("error"), message);
-    getSession().createQuery(update).executeUpdate();
+    getSession().createMutationQuery(update).executeUpdate();
   }
 
   /**
@@ -180,7 +180,7 @@ public final void updateLastCheckTime(final String id, final long lastCheckTime)
     final Root<PrintJobStatusExtImpl> root = update.from(PrintJobStatusExtImpl.class);
     update.where(builder.equal(root.get("referenceId"), id));
     update.set(root.get("lastCheckTime"), lastCheckTime);
-    getSession().createQuery(update).executeUpdate();
+    getSession().createMutationQuery(update).executeUpdate();
   }
 
   /**
@@ -198,7 +198,7 @@ public final int deleteOld(final long checkTimeThreshold) {
         builder.and(
             builder.isNotNull(root.get("lastCheckTime")),
             builder.lessThan(root.get("lastCheckTime"), checkTimeThreshold)));
-    return getSession().createQuery(delete).executeUpdate();
+    return getSession().createMutationQuery(delete).executeUpdate();
   }
 
   /**
@@ -255,6 +255,6 @@ public void delete(final String referenceId) {
         builder.createCriteriaDelete(PrintJobStatusExtImpl.class);
     final Root<PrintJobStatusExtImpl> root = delete.from(PrintJobStatusExtImpl.class);
     delete.where(builder.equal(root.get("referenceId"), referenceId));
-    getSession().createQuery(delete).executeUpdate();
+    getSession().createMutationQuery(delete).executeUpdate();
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
index 5ecd92883..304db43d0 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpCredentialTest.java
@@ -7,7 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -77,10 +77,10 @@ public void testToCredentials() throws Exception {
     credential.setMatchers(Collections.singletonList(matcher));
 
     AuthScope authscope = new AuthScope(null, -1);
-    final Credentials object = credential.toCredentials(authscope);
+    final UsernamePasswordCredentials object = credential.toCredentials(authscope);
     assertNotNull(object);
     assertEquals(USERNAME, object.getUserPrincipal().getName());
-    assertEquals(PASSWORD, new String(object.getPassword()));
+    assertEquals(PASSWORD, new String(object.getUserPassword()));
 
     authscope =
         new AuthScope(
diff --git a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
index 534aea34f..d2ac1fac4 100644
--- a/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
+++ b/core/src/test/java/org/mapfish/print/http/HttpProxyTest.java
@@ -12,6 +12,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.security.KeyManagementException;
@@ -160,7 +161,9 @@ public static void respond(HttpExchange httpExchange, String errorMessage, int r
       throws IOException {
     final byte[] bytes = errorMessage.getBytes(Constants.DEFAULT_CHARSET);
     httpExchange.sendResponseHeaders(responseCode, bytes.length);
-    httpExchange.getResponseBody().write(bytes);
+    try (OutputStream os = httpExchange.getResponseBody()) {
+      os.write(bytes);
+    }
     httpExchange.close();
   }
 

From 0c84ce6536a7ebaa7727b0250bd069504789f84e Mon Sep 17 00:00:00 2001
From: "geo-ghci-int[bot]"
 <146321879+geo-ghci-int[bot]@users.noreply.github.com>
Date: Mon, 29 Dec 2025 09:29:31 +0000
Subject: [PATCH 59/61] Apply pre-commit fix

From the artifact of the previous workflow run
---
 .../mapfish/print/cli/CliServletContext.java  |  12 +-
 .../print/http/MfCredentialsProvider.java     |   4 +-
 .../print/http/MfTLSSocketStrategy.java       |  13 +-
 .../mapfish/print/http/UserAgentCreator.java  |   4 +-
 .../java/org/mapfish/print/http/Utils.java    |   3 +-
 .../MetricsRegistryContextListener.java       |   2 +-
 .../print/processor/ExecutionStats.java       |   6 +-
 .../processor/http/matcher/MatchInfo.java     |  63 +++------
 .../mapfish/print/servlet/BaseMapServlet.java |   4 +-
 .../BooleanHandleReportLoadResult.java        |   2 +-
 .../print/servlet/HandleReportLoadResult.java |   2 +-
 .../servlet/VoidHandleReportLoadResult.java   |   2 +-
 .../fileloader/ServletConfigFileLoader.java   |   2 +-
 .../print/AbstractMapfishSpringTest.java      |  42 +++---
 ...eredReflectiveAttributeValidationTest.java |  13 +-
 .../attribute/ReflectiveAttributeTest.java    |  23 +--
 .../attribute/ScalebarAttributeTest.java      |  53 ++++---
 .../print/attribute/StringAttributeTest.java  |  33 +++--
 .../print/attribute/map/MapAttributeTest.java |  40 +++---
 ...oryAllConfigObjectMustBePrototypeTest.java |  24 ++--
 .../config/ConfigurationFactoryTest.java      |  26 ++--
 .../config/access/AndAccessAssertionTest.java |  37 ++---
 .../access/RoleAccessAssertionTest.java       | 118 +++++++++-------
 ...igFileResolvingHttpRequestFactoryTest.java |  14 +-
 .../print/map/geotools/GeoJsonLayerTest.java  | 129 +++++++++--------
 .../GeotiffLayerFactoryPluginTest.java        |  61 ++++----
 .../metrics/JobQueueHealthCheckTest.java      |   4 +-
 ...JasperReportOutputFormatSimpleMapTest.java |  44 +++---
 .../org/mapfish/print/output/ValuesTest.java  | 115 +++++++--------
 .../print/parser/MapfishParserTest.java       | 132 ++++++++++--------
 .../PdfConfigurationProcessorTest.java        |  62 ++++----
 .../ProcessorDependencyGraphFactoryTest.java  |  40 +++---
 .../http/RestrictUrisProcessorTest.java       |  32 +++--
 .../http/matcher/AddressHostMatcherTest.java  |  34 ++++-
 .../http/matcher/DnsHostMatcherTest.java      |  17 ++-
 .../http/matcher/HostnameMatcherTest.java     |  17 ++-
 .../http/matcher/LocalHostMatcherTest.java    |  17 ++-
 .../MapPrinterServletSecurityTest.java        |  38 ++---
 .../ClasspathConfigFileLoaderTest.java        |  79 ++++++-----
 .../fileloader/FileConfigFileLoaderTest.java  |  39 +++---
 .../ServletConfigFileLoaderTest.java          |  44 +++---
 41 files changed, 813 insertions(+), 633 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
index 38ccc0917..cafe0a97d 100644
--- a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
+++ b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
@@ -1,11 +1,5 @@
 package org.mapfish.print.cli;
 
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.EventListener;
-import java.util.Map;
-import java.util.Set;
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterRegistration;
 import jakarta.servlet.RequestDispatcher;
@@ -15,6 +9,12 @@
 import jakarta.servlet.SessionCookieConfig;
 import jakarta.servlet.SessionTrackingMode;
 import jakarta.servlet.descriptor.JspConfigDescriptor;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * An essentially non-functional servlet context that is used by the CLI application to satisfy the
diff --git a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
index 3edecb2e4..79f50ca25 100644
--- a/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
+++ b/core/src/main/java/org/mapfish/print/http/MfCredentialsProvider.java
@@ -2,10 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.hc.client5.http.auth.CredentialsProvider;
-import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.apache.hc.client5.http.auth.Credentials;
+import org.apache.hc.client5.http.auth.CredentialsProvider;
+import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.mapfish.print.config.Configuration;
 
diff --git a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
index f54b3de3d..0b79ec966 100644
--- a/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
+++ b/core/src/main/java/org/mapfish/print/http/MfTLSSocketStrategy.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.Socket;
 import javax.net.ssl.SSLSocket;
-
 import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
 import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.protocol.HttpContext;
@@ -14,11 +13,13 @@ public final class MfTLSSocketStrategy implements TlsSocketStrategy {
   private final TlsSocketStrategy defaultStrategy = DefaultClientTlsStrategy.createDefault();
 
   @Override
-  public SSLSocket upgrade(final Socket socket,
-                           final String target,
-                           final int port,
-                           final Object attachment,
-                           final HttpContext context) throws IOException {
+  public SSLSocket upgrade(
+      final Socket socket,
+      final String target,
+      final int port,
+      final Object attachment,
+      final HttpContext context)
+      throws IOException {
     return getSocketStrategy().upgrade(socket, target, port, attachment, context);
   }
 
diff --git a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
index 16dd0a164..8eec77600 100644
--- a/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
+++ b/core/src/main/java/org/mapfish/print/http/UserAgentCreator.java
@@ -24,8 +24,8 @@ private UserAgentCreator() {}
    */
   public static String getUserAgent() {
 
-    final String httpClientUserAgent = getUserAgent(
-            "Apache-HttpClient", "org.apache.http.client", UserAgentCreator.class);
+    final String httpClientUserAgent =
+        getUserAgent("Apache-HttpClient", "org.apache.http.client", UserAgentCreator.class);
 
     // This is based on the code from HttpClient:
     final VersionInfo mapFishPrintVersionInfo =
diff --git a/core/src/main/java/org/mapfish/print/http/Utils.java b/core/src/main/java/org/mapfish/print/http/Utils.java
index 50b19a27a..423004aa6 100644
--- a/core/src/main/java/org/mapfish/print/http/Utils.java
+++ b/core/src/main/java/org/mapfish/print/http/Utils.java
@@ -1,10 +1,9 @@
 package org.mapfish.print.http;
 
-import org.springframework.http.HttpHeaders;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.springframework.http.HttpHeaders;
 
 /** Network utils class. */
 public final class Utils {
diff --git a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
index aacdd0ba6..b9ea2d088 100644
--- a/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
+++ b/core/src/main/java/org/mapfish/print/metrics/MetricsRegistryContextListener.java
@@ -26,7 +26,7 @@ public final void contextInitialized(final ServletContextEvent event) {
   protected final MetricRegistry getMetricRegistry() {
     // In Spring 6+, getWebApplicationContext accepts jakarta.servlet.ServletContext
     final WebApplicationContext webApplicationContext =
-      getWebApplicationContext(this.servletContext);
+        getWebApplicationContext(this.servletContext);
     return webApplicationContext.getBean(MetricRegistry.class);
   }
 }
diff --git a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
index 6467551c3..889c5a259 100644
--- a/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
+++ b/core/src/main/java/org/mapfish/print/processor/ExecutionStats.java
@@ -1,8 +1,5 @@
 package org.mapfish.print.processor;
 
-import tools.jackson.databind.node.ArrayNode;
-import tools.jackson.databind.node.JsonNodeFactory;
-import tools.jackson.databind.node.ObjectNode;
 import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +7,9 @@
 import net.sf.jasperreports.engine.PrintPageFormat;
 import org.mapfish.print.attribute.map.MapAttribute;
 import org.mapfish.print.attribute.map.MapfishMapContext;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.ObjectNode;
 
 /** Statisctics about the execution of a print job. */
 public class ExecutionStats {
diff --git a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
index f5696be13..c75eff754 100644
--- a/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
+++ b/core/src/main/java/org/mapfish/print/processor/http/matcher/MatchInfo.java
@@ -2,53 +2,34 @@
 
 import java.net.MalformedURLException;
 import java.net.URI;
-
 import org.apache.commons.lang3.Strings;
 import org.apache.hc.client5.http.auth.AuthScope;
 import org.springframework.http.HttpMethod;
 
-/**
- * Information required for performing a request match.
- */
+/** Information required for performing a request match. */
 public final class MatchInfo {
-  /**
-   * A value representing all and any schemes.
-   */
+  /** A value representing all and any schemes. */
   public static final String ANY_SCHEME = null;
 
-  /**
-   * A value representing all and any hosts.
-   */
+  /** A value representing all and any hosts. */
   public static final String ANY_HOST = null;
 
-  /**
-   * A value representing all and any realms.
-   */
+  /** A value representing all and any realms. */
   public static final String ANY_REALM = null;
 
-  /**
-   * A value representing all and any paths.
-   */
+  /** A value representing all and any paths. */
   public static final String ANY_PATH = null;
 
-  /**
-   * A value representing all and any fragments.
-   */
+  /** A value representing all and any fragments. */
   public static final String ANY_FRAGMENT = null;
 
-  /**
-   * A value representing all and any queries.
-   */
+  /** A value representing all and any queries. */
   public static final String ANY_QUERY = null;
 
-  /**
-   * A value representing all and any queries.
-   */
+  /** A value representing all and any queries. */
   public static final HttpMethod ANY_METHOD = null;
 
-  /**
-   * A value representing all and any ports.
-   */
+  /** A value representing all and any ports. */
   public static final int ANY_PORT = -1;
 
   private final String scheme;
@@ -64,9 +45,9 @@ public final class MatchInfo {
    * Constructor.
    *
    * @param scheme the scheme to match.
-   * @param host   the host to match.
-   * @param port   the host to match.
-   * @param realm  the realm to match.
+   * @param host the host to match.
+   * @param port the host to match.
+   * @param realm the realm to match.
    */
   private MatchInfo(final String scheme, final String host, final int port, final String realm) {
     this.scheme = scheme;
@@ -82,8 +63,8 @@ private MatchInfo(final String scheme, final String host, final int port, final
   /**
    * Constructor.
    *
-   * @param uri    the uri containing the parameters to match.
-   * @param port   the host to match.
+   * @param uri the uri containing the parameters to match.
+   * @param port the host to match.
    * @param method the method to match.
    */
   private MatchInfo(final URI uri, final int port, final HttpMethod method) {
@@ -100,7 +81,7 @@ private MatchInfo(final URI uri, final int port, final HttpMethod method) {
   /**
    * Create an info object from a uri and the http method object.
    *
-   * @param uri    the uri
+   * @param uri the uri
    * @param method the method
    */
   public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
@@ -123,13 +104,15 @@ public static MatchInfo fromUri(final URI uri, final HttpMethod method) {
    */
   public static MatchInfo fromAuthScope(final AuthScope authscope) {
 
-    String newScheme = Strings.CS.equals(authscope.getSchemeName(), ANY_SCHEME) ? ANY_SCHEME
-      : authscope.getSchemeName();
-    String newHost = Strings.CS.equals(authscope.getHost(), ANY_HOST) ? ANY_HOST
-      : authscope.getHost();
+    String newScheme =
+        Strings.CS.equals(authscope.getSchemeName(), ANY_SCHEME)
+            ? ANY_SCHEME
+            : authscope.getSchemeName();
+    String newHost =
+        Strings.CS.equals(authscope.getHost(), ANY_HOST) ? ANY_HOST : authscope.getHost();
     int newPort = authscope.getPort() == ANY_PORT ? ANY_PORT : authscope.getPort();
-    String newRealm = Strings.CS.equals(authscope.getRealm(), ANY_REALM) ? ANY_REALM
-      : authscope.getRealm();
+    String newRealm =
+        Strings.CS.equals(authscope.getRealm(), ANY_REALM) ? ANY_REALM : authscope.getRealm();
 
     return new MatchInfo(newScheme, newHost, newPort, newRealm);
   }
diff --git a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
index e835f518e..4688a2a6a 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BaseMapServlet.java
@@ -1,9 +1,9 @@
 package org.mapfish.print.servlet;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import org.mapfish.print.PrintException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
index 2b15ffbb7..f910a0188 100644
--- a/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/BooleanHandleReportLoadResult.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
-import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
index eadca958b..bfe418600 100644
--- a/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/HandleReportLoadResult.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URI;
@@ -8,7 +9,6 @@
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.slf4j.Logger;
diff --git a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
index 47abe82c9..ec2c06032 100644
--- a/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
+++ b/core/src/main/java/org/mapfish/print/servlet/VoidHandleReportLoadResult.java
@@ -1,8 +1,8 @@
 package org.mapfish.print.servlet;
 
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URI;
-import jakarta.servlet.http.HttpServletResponse;
 import org.mapfish.print.servlet.job.PrintJobStatus;
 import org.mapfish.print.servlet.job.loader.ReportLoader;
 import org.springframework.http.HttpStatus;
diff --git a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
index bc67539f5..f1c894326 100644
--- a/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
+++ b/core/src/main/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoader.java
@@ -1,10 +1,10 @@
 package org.mapfish.print.servlet.fileloader;
 
+import jakarta.servlet.ServletContext;
 import java.io.File;
 import java.net.URI;
 import java.util.Collections;
 import java.util.Iterator;
-import jakarta.servlet.ServletContext;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /** A plugin that loads the config resources from urls starting with prefix: {@value #PREFIX}://. */
diff --git a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
index ac1c80871..29ca711d3 100644
--- a/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
+++ b/core/src/test/java/org/mapfish/print/AbstractMapfishSpringTest.java
@@ -34,24 +34,24 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(
-  locations = {
-    AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
-    AbstractMapfishSpringTest.TEST_SPRING_XML,
-    AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
-  })
+    locations = {
+      AbstractMapfishSpringTest.DEFAULT_SPRING_XML,
+      AbstractMapfishSpringTest.TEST_SPRING_XML,
+      AbstractMapfishSpringTest.TEST_SPRING_FONT_XML
+    })
 public abstract class AbstractMapfishSpringTest {
   public static final String DEFAULT_SPRING_XML =
-    "classpath:mapfish-spring-application-context.xml";
+      "classpath:mapfish-spring-application-context.xml";
   public static final String TEST_SPRING_XML =
-    "classpath:test-http-request-factory-application-context.xml";
+      "classpath:test-http-request-factory-application-context.xml";
   public static final String TEST_SPRING_FONT_XML =
-    "classpath:test-mapfish-spring-custom-fonts.xml";
+      "classpath:test-mapfish-spring-custom-fonts.xml";
   // The maximum number of times to retry fetching a resource used in tests
   public static final int HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY = 2;
   // The interval between retries used in tests
   public static final int HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS = 1;
   protected static final Processor.ExecutionContext CONTEXT =
-    new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
+      new AbstractProcessor.Context(new HashMap<>(), new AtomicBoolean(false));
   static final Pattern IMPORT_PATTERN = Pattern.compile("@@importFile\\((\\S+)\\)@@");
 
   @Autowired private WorkingDirectories workingDirectories;
@@ -67,7 +67,7 @@ public static File getFile(Class<?> testClass, String fileName) {
     final URL resource = testClass.getResource(fileName);
     if (resource == null) {
       throw new AssertionError(
-        "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
+          "Unable to find test resource: " + fileName + ", on: " + testClass.getName());
     }
 
     return new File(resource.getFile());
@@ -87,7 +87,7 @@ public static PJsonObject parseJSONObjectFromString(String jsonString) {
   }
 
   public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fileName)
-    throws IOException {
+      throws IOException {
     final File file = getFile(testClass, fileName);
     String jsonString = Files.readString(file.toPath(), Constants.DEFAULT_CHARSET);
     Matcher matcher = IMPORT_PATTERN.matcher(jsonString);
@@ -105,7 +105,7 @@ public static PJsonObject parseJSONObjectFromFile(Class<?> testClass, String fil
   public static MapfishMapContext createTestMapContext() {
     try {
       final CenterScaleMapBounds bounds =
-        new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
+          new CenterScaleMapBounds(CRS.decode("CRS:84"), 0, 0, 30000);
       return new MapfishMapContext(bounds, new Dimension(500, 500), 0, 72, true, true);
     } catch (FactoryException e) {
       throw new RuntimeException(e);
@@ -187,13 +187,13 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     }
 
     String platformVersionName =
-      "expectedSimpleImage"
-        + classifier
-        + "-"
-        + normalizedOSName()
-        + "-jdk"
-        + javaVersion
-        + ".png";
+        "expectedSimpleImage"
+            + classifier
+            + "-"
+            + normalizedOSName()
+            + "-jdk"
+            + javaVersion
+            + ".png";
     String platformName = "expectedSimpleImage" + classifier + "-" + normalizedOSName() + ".png";
     String defaultName = "expectedSimpleImage" + classifier + ".png";
 
@@ -203,8 +203,8 @@ protected String getExpectedImageName(String classifier, String baseDir) {
     //        ImageIO.write(actualImage, "png", new File(TMP, baseDir + "/" + defaultName));
 
     return OptionalUtils.or(
-        () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
-      .orElse(defaultName);
+            () -> findImage(baseDir, platformVersionName), () -> findImage(baseDir, platformName))
+        .orElse(defaultName);
   }
 
   private Optional<String> findImage(final String baseDir, final String fileName) {
diff --git a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
index 6fc2383f2..7f016456d 100644
--- a/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/AllRegisteredReflectiveAttributeValidationTest.java
@@ -22,13 +22,14 @@ public class AllRegisteredReflectiveAttributeValidationTest extends AbstractMapf
 
   @Test
   public void testAllAttributesHaveLegalValues() {
-    assertDoesNotThrow(() -> {
-      for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
-        attribute.init();
-      }
+    assertDoesNotThrow(
+        () -> {
+          for (ReflectiveAttribute<?> attribute : allReflectiveAttributes) {
+            attribute.init();
+          }
 
-      // no exception... good
-    });
+          // no exception... good
+        });
 
     // no exception... good
   }
diff --git a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
index f3c974deb..c099477bc 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ReflectiveAttributeTest.java
@@ -15,32 +15,35 @@
 public class ReflectiveAttributeTest {
   @Test
   public void testPJsonObjIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(PJsonObjParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(PJsonObjParamIllegal.class).init());
   }
 
   @Test
   public void testPJsonArrayIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(PJsonArrayParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(PJsonArrayParamIllegal.class).init());
   }
 
   @Test
   public void testJsonObjIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(JsonObjParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(JsonObjParamIllegal.class).init());
   }
 
   @Test
   public void testJsonArrayIllegal() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(JsonArrayParamIllegal.class).init());
+    assertThrows(
+        AssertionFailedException.class,
+        () -> new TestReflectiveAtt(JsonArrayParamIllegal.class).init());
   }
 
   @Test
   public void testEmpty() {
-    assertThrows(AssertionFailedException.class, () ->
-      new TestReflectiveAtt(Empty.class).init());
+    assertThrows(AssertionFailedException.class, () -> new TestReflectiveAtt(Empty.class).init());
   }
 
   private static class TestReflectiveAtt extends ReflectiveAttribute<Object> {
diff --git a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
index f52e6d39a..23b85996c 100644
--- a/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/ScalebarAttributeTest.java
@@ -43,42 +43,49 @@ public void testCreateValue() {
 
   @Test
   public void testPostConstruct() {
-    assertDoesNotThrow(() -> {
-      ScalebarAttributeValues values = getValues();
-      values.postConstruct();
-      // passes.. ok
-    });
+    assertDoesNotThrow(
+        () -> {
+          ScalebarAttributeValues values = getValues();
+          values.postConstruct();
+          // passes.. ok
+        });
     // passes.. ok
   }
 
   @Test
   public void testPostConstructInvalidColor() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      ScalebarAttributeValues values = getValues();
-
-      values.backgroundColor = "sun-yellow";
-      values.postConstruct();
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          ScalebarAttributeValues values = getValues();
+
+          values.backgroundColor = "sun-yellow";
+          values.postConstruct();
+        });
   }
 
   @Test
   public void testPostConstructInvalidUnit() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      ScalebarAttributeValues values = getValues();
-
-      values.unit = "light-years";
-      values.postConstruct();
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          ScalebarAttributeValues values = getValues();
+
+          values.unit = "light-years";
+          values.postConstruct();
+        });
   }
 
   @Test
   public void testPostConstructInvalidIntervals() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      ScalebarAttributeValues values = getValues();
-
-      values.intervals = 0;
-      values.postConstruct();
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          ScalebarAttributeValues values = getValues();
+
+          values.intervals = 0;
+          values.postConstruct();
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
index 791e5c3c8..d2bd67ea6 100644
--- a/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/StringAttributeTest.java
@@ -47,22 +47,25 @@ public void testParsableByValues() throws Exception {
 
   @Test
   public void testParsableByValuesError() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-      PJsonObject requestData = loadJsonRequestDataError();
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+          PJsonObject requestData = loadJsonRequestDataError();
 
-      Template template = config.getTemplate("main");
-      new Values(
-          new HashMap<>(),
-          requestData,
-          template,
-          config.getDirectory(),
-          httpClientFactory,
-          config.getDirectory(),
-          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-          new AtomicBoolean(false));
-    });
+          Template template = config.getTemplate("main");
+          new Values(
+              new HashMap<>(),
+              requestData,
+              template,
+              config.getDirectory(),
+              httpClientFactory,
+              config.getDirectory(),
+              HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+              HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+              new AtomicBoolean(false));
+        });
   }
 
   private PJsonObject loadJsonRequestData() throws IOException {
diff --git a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
index 6f20799ec..3d675a0e0 100644
--- a/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
+++ b/core/src/test/java/org/mapfish/print/attribute/map/MapAttributeTest.java
@@ -40,24 +40,28 @@ public void setUp() {
   @SuppressWarnings("unchecked")
   @Test
   public void testMaxDpi() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final File configFile =
-          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
-      final Configuration config = configurationFactory.getConfig(configFile);
-      final Template template = config.getTemplate("main");
-
-      final PJsonObject pJsonObject = loadJsonRequestData();
-      final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
-      final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
-      map.remove("dpi");
-      map.accumulate("dpi", 1000);
-
-      final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
-          (ReflectiveAttribute<MapAttribute.MapAttributeValues>) template.getAttributes().get("map");
-
-      final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
-      MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final File configFile =
+              getFile(
+                  CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "config.yaml");
+          final Configuration config = configurationFactory.getConfig(configFile);
+          final Template template = config.getTemplate("main");
+
+          final PJsonObject pJsonObject = loadJsonRequestData();
+          final PJsonObject attributesJson = pJsonObject.getJSONObject("attributes");
+          final JSONObject map = attributesJson.getJSONObject("map").getInternalObj();
+          map.remove("dpi");
+          map.accumulate("dpi", 1000);
+
+          final ReflectiveAttribute<MapAttribute.MapAttributeValues> mapAttribute =
+              (ReflectiveAttribute<MapAttribute.MapAttributeValues>)
+                  template.getAttributes().get("map");
+
+          final MapAttribute.MapAttributeValues value = mapAttribute.createValue(template);
+          MapfishParser.parse(true, attributesJson.getJSONObject("map"), value);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
index 7bd6aa253..5801a5dfe 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryAllConfigObjectMustBePrototypeTest.java
@@ -17,16 +17,18 @@ public class ConfigurationFactoryAllConfigObjectMustBePrototypeTest {
 
   @Test
   public void testAll() throws Exception {
-    assertThrows(BeanCreationException.class, () -> {
-      ClassPathXmlApplicationContext applicationContext =
-          new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
-      ConfigurationFactory configurationFactory =
-          applicationContext.getBean(ConfigurationFactory.class);
-      File configFile =
-          AbstractMapfishSpringTest.getFile(
-              ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
-              "configRequiringSpringInjection.yaml");
-      configurationFactory.getConfig(configFile);
-    });
+    assertThrows(
+        BeanCreationException.class,
+        () -> {
+          ClassPathXmlApplicationContext applicationContext =
+              new ClassPathXmlApplicationContext(DEFAULT_SPRING_XML, TEST_SPRING_XML);
+          ConfigurationFactory configurationFactory =
+              applicationContext.getBean(ConfigurationFactory.class);
+          File configFile =
+              AbstractMapfishSpringTest.getFile(
+                  ConfigurationFactoryAllConfigObjectMustBePrototypeTest.class,
+                  "configRequiringSpringInjection.yaml");
+          configurationFactory.getConfig(configFile);
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
index b12d104e7..cf1a4eef5 100644
--- a/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/config/ConfigurationFactoryTest.java
@@ -120,19 +120,25 @@ public void testConfigurationInjection() throws Exception {
 
   @Test
   public void testConfigurationAttributeMustImplementAttribute() throws Exception {
-    assertThrows(ConstructorException.class, () -> {
-      File configFile =
-          getFile(ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
-      configurationFactory.getConfig(configFile);
-    });
+    assertThrows(
+        ConstructorException.class,
+        () -> {
+          File configFile =
+              getFile(
+                  ConfigurationFactoryTest.class, "configWithProcessorAsAttribute_bad_config.yaml");
+          configurationFactory.getConfig(configFile);
+        });
   }
 
   @Test
   public void testConfigurationProcessorMustImplementProcessor() throws Exception {
-    assertThrows(ConstructorException.class, () -> {
-      File configFile =
-          getFile(ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
-      configurationFactory.getConfig(configFile);
-    });
+    assertThrows(
+        ConstructorException.class,
+        () -> {
+          File configFile =
+              getFile(
+                  ConfigurationFactoryTest.class, "configWithAttributeAsProcessor_bad_config.yaml");
+          configurationFactory.getConfig(configFile);
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
index 238bbfb00..ae08bd29f 100644
--- a/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/AndAccessAssertionTest.java
@@ -23,27 +23,32 @@ public void tearDown() {
 
   @Test
   public void testSetPredicates() {
-    assertThrows(AssertionError.class, () -> {
-
-      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
-      andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
-    });
+    assertThrows(
+        AssertionError.class,
+        () -> {
+          final AndAccessAssertion andAssertion =
+              applicationContext.getBean(AndAccessAssertion.class);
+          andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE, AlwaysAllowAssertion.INSTANCE);
+          andAssertion.setPredicates(AlwaysAllowAssertion.INSTANCE);
+        });
   }
 
   @Test
   public void testAssertAccessNotAllowed() {
-    assertThrows(AccessDeniedException.class, () -> {
-      final AndAccessAssertion andAssertion = applicationContext.getBean(AndAccessAssertion.class);
-      AccessAssertion pred1 =
-          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
-      AccessAssertion pred2 =
-          new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
-      andAssertion.setPredicates(pred1, pred2);
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          final AndAccessAssertion andAssertion =
+              applicationContext.getBean(AndAccessAssertion.class);
+          AccessAssertion pred1 =
+              new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_USER"));
+          AccessAssertion pred2 =
+              new RoleAccessAssertion().setRequiredRoles(Collections.singleton("ROLE_OTHER"));
+          andAssertion.setPredicates(pred1, pred2);
 
-      AccessAssertionTestUtil.setCreds("ROLE_USER");
-      andAssertion.assertAccess("", this);
-    });
+          AccessAssertionTestUtil.setCreds("ROLE_USER");
+          andAssertion.assertAccess("", this);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
index 294a83e04..c3907616e 100644
--- a/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
+++ b/core/src/test/java/org/mapfish/print/config/access/RoleAccessAssertionTest.java
@@ -25,32 +25,38 @@ public void tearDown() {
 
   @Test
   public void testSetRequiredRoles() {
-    assertThrows(AssertionError.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-    });
+    assertThrows(
+        AssertionError.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+        });
   }
 
   @Test
   public void testAssertAccessNoCredentials() {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
   public void testAssertAccessWrongCreds() {
-    assertThrows(AccessDeniedException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-
-      setCreds("ROLE_USER2");
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+
+          setCreds("ROLE_USER2");
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
@@ -82,25 +88,29 @@ public void testAssertAccessOneOf() {
 
   @Test
   public void testAssertAccessOneOfFailed() {
-    assertThrows(AccessDeniedException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
-
-      setCreds("ROLE_OTHER");
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(SetsUtils.create("ROLE_USER", "ROLE_USER2"));
+
+          setCreds("ROLE_OTHER");
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
   public void testAssertNoRolesNoCreds() {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(new HashSet<>());
-
-      assertion.assertAccess("", this);
-      setCreds("ROLE_OTHER", "ROLE_USER2");
-      assertion.assertAccess("", this);
-    });
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(new HashSet<>());
+
+          assertion.assertAccess("", this);
+          setCreds("ROLE_OTHER", "ROLE_USER2");
+          assertion.assertAccess("", this);
+        });
   }
 
   @Test
@@ -117,29 +127,33 @@ public void testAssertNoRolesSomeCreds() {
 
   @Test
   public void testMarshalUnmarshalNoAuth() {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-      final JSONObject marshalData = assertion.marshal();
-
-      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-      newAssertion.unmarshal(marshalData);
-      newAssertion.assertAccess("", this);
-    });
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+          final JSONObject marshalData = assertion.marshal();
+
+          RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+          newAssertion.unmarshal(marshalData);
+          newAssertion.assertAccess("", this);
+        });
   }
 
   @Test
   public void testMarshalUnmarshalNotPermitted() {
-    assertThrows(AccessDeniedException.class, () -> {
-      setCreds("ROLE_OTHER");
-      final RoleAccessAssertion assertion = new RoleAccessAssertion();
-      assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
-      final JSONObject marshalData = assertion.marshal();
-
-      RoleAccessAssertion newAssertion = new RoleAccessAssertion();
-      newAssertion.unmarshal(marshalData);
-      newAssertion.assertAccess("", this);
-    });
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          setCreds("ROLE_OTHER");
+          final RoleAccessAssertion assertion = new RoleAccessAssertion();
+          assertion.setRequiredRoles(Collections.singleton("ROLE_USER"));
+          final JSONObject marshalData = assertion.marshal();
+
+          RoleAccessAssertion newAssertion = new RoleAccessAssertion();
+          newAssertion.unmarshal(marshalData);
+          newAssertion.assertAccess("", this);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
index 7daaf50c6..25b566a5a 100644
--- a/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/http/ConfigFileResolvingHttpRequestFactoryTest.java
@@ -149,12 +149,14 @@ public void testCreateRequestRelativeFileToConfig() throws Exception {
 
   @Test
   public void testCreateRequestIllegalFile() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI uri = logbackXml.toURI();
-      final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
-
-      request.execute();
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI uri = logbackXml.toURI();
+          final ClientHttpRequest request = resolvingFactory.createRequest(uri, HttpMethod.GET);
+
+          request.execute();
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
index 0af9af867..8ff4f417a 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeoJsonLayerTest.java
@@ -70,70 +70,87 @@ public void testGeoJsonEmbedded() throws Exception {
 
   @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final File file =
-          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-      final PJsonObject requestData =
-          parseJSONObjectFromString(
-              "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
-
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-      configuration.setFileLoaderManager(this.fileLoaderManager);
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-      MapfishParserTest.populateLayerParam(requestData, param, "type");
-      geojsonLayerParser
-          .parse(template, param)
-          .getLayers(
-              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final File file =
+              getFile(
+                  CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+          final PJsonObject requestData =
+              parseJSONObjectFromString(
+                  "{type:\"geojson\";style:\"polygon\";geoJson:\"" + file.toURI().toURL() + "\"}");
+
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+          configuration.setFileLoaderManager(this.fileLoaderManager);
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+          MapfishParserTest.populateLayerParam(requestData, param, "type");
+          geojsonLayerParser
+              .parse(template, param)
+              .getLayers(
+                  httpRequestFactory,
+                  AbstractMapfishSpringTest.createTestMapContext(),
+                  CONTEXT,
+                  null);
+        });
   }
 
   @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-      configuration.setFileLoaderManager(this.fileLoaderManager);
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-      param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
-      geojsonLayerParser
-          .parse(template, param)
-          .getLayers(
-              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+          configuration.setFileLoaderManager(this.fileLoaderManager);
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+          param.geoJson = "file://../" + BASE_DIR + "/geojson.json";
+          geojsonLayerParser
+              .parse(template, param)
+              .getLayers(
+                  httpRequestFactory,
+                  AbstractMapfishSpringTest.createTestMapContext(),
+                  CONTEXT,
+                  null);
+        });
   }
 
   @Test
   public void testGeoNotUrlNotGeoJson() {
-    assertThrows(Exception.class, () -> {
-      final File file =
-          getFile(CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
-      final PJsonObject requestData =
-          parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
-
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(file);
-      configuration.setFileLoaderManager(this.fileLoaderManager);
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
-      MapfishParserTest.populateLayerParam(requestData, param, "type");
-      geojsonLayerParser
-          .parse(template, param)
-          .getLayers(
-              httpRequestFactory, AbstractMapfishSpringTest.createTestMapContext(), CONTEXT, null);
-    });
+    assertThrows(
+        Exception.class,
+        () -> {
+          final File file =
+              getFile(
+                  CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.class, BASE_DIR + "geojson.json");
+          final PJsonObject requestData =
+              parseJSONObjectFromString("{type:\"geojson\";style:\"polygon\";geoJson:\"Random\"}");
+
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(file);
+          configuration.setFileLoaderManager(this.fileLoaderManager);
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeoJsonLayer.GeoJsonParam param = new GeoJsonLayer.GeoJsonParam();
+          MapfishParserTest.populateLayerParam(requestData, param, "type");
+          geojsonLayerParser
+              .parse(template, param)
+              .getLayers(
+                  httpRequestFactory,
+                  AbstractMapfishSpringTest.createTestMapContext(),
+                  CONTEXT,
+                  null);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
index c82f9df40..5add674fd 100644
--- a/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
+++ b/core/src/test/java/org/mapfish/print/map/geotools/GeotiffLayerFactoryPluginTest.java
@@ -15,36 +15,43 @@ public class GeotiffLayerFactoryPluginTest {
 
   @Test
   public void testGeoIllegalFileUrl() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final File file =
-          AbstractMapfishSpringTest.getFile(
-              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
-              CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR + "sampleGeoTiff.tif");
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-      param.url = file.toURI().toURL().toString();
-      new GeotiffLayer.Plugin().parse(template, param);
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final File file =
+              AbstractMapfishSpringTest.getFile(
+                  CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.class,
+                  CreateMapProcessorFlexibleScaleAndCenterGeoTiffTest.BASE_DIR
+                      + "sampleGeoTiff.tif");
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+          param.url = file.toURI().toURL().toString();
+          new GeotiffLayer.Plugin().parse(template, param);
+        });
   }
 
   @Test
   public void testGeoIllegalFileUrl2() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final Configuration configuration = new Configuration();
-      configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
-
-      Template template = new Template();
-      template.setConfiguration(configuration);
-
-      GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
-      param.url =
-          "file://../" + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR + "/geojson.json";
-      new GeotiffLayer.Plugin().parse(template, param);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final Configuration configuration = new Configuration();
+          configuration.setConfigurationFile(File.createTempFile("xyz", ".yaml"));
+
+          Template template = new Template();
+          template.setConfiguration(configuration);
+
+          GeotiffLayer.GeotiffParam param = new GeotiffLayer.GeotiffParam();
+          param.url =
+              "file://../"
+                  + CreateMapProcessorFlexibleScaleBBoxGeoJsonTest.BASE_DIR
+                  + "/geojson.json";
+          new GeotiffLayer.Plugin().parse(template, param);
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
index 0662ff45c..283157522 100644
--- a/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
+++ b/core/src/test/java/org/mapfish/print/metrics/JobQueueHealthCheckTest.java
@@ -51,8 +51,8 @@ public void testCheck_Failed_NoPrintJobs() {
         assertThrowsExactly(
             RuntimeException.class,
             () ->
-              // WHEN
-              jobQueueHealthCheck.check());
+                // WHEN
+                jobQueueHealthCheck.check());
 
     assertEquals(
         "None of the print job queued was processed by this server, in the last (seconds): 300",
diff --git a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
index d5e754814..4f280918a 100644
--- a/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
+++ b/core/src/test/java/org/mapfish/print/output/JasperReportOutputFormatSimpleMapTest.java
@@ -52,28 +52,30 @@ public void testPrint() throws Exception {
 
   @Test
   public void testAllOutputFormats() throws Exception {
-    assertDoesNotThrow(() -> {
-      final Configuration config = configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
-      final PJsonObject requestData = loadJsonRequestData();
+    assertDoesNotThrow(
+        () -> {
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config.yaml"));
+          final PJsonObject requestData = loadJsonRequestData();
 
-      for (OutputFormat format : this.outputFormat.values()) {
-        if ("bmp".equals(format.getFileSuffix())
-            || "jpeg".equals(format.getFileSuffix())
-            || "jpg".equals(format.getFileSuffix())) {
-          // BMP and JPEG do not support transparency
-          continue;
-        }
-        final OutputStream outputStream = new ByteArrayOutputStream();
-        format.print(
-            new HashMap<>(),
-            requestData,
-            config,
-            getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
-            getTaskDirectory(),
-            outputStream);
-        // no error?  its a pass
+          for (OutputFormat format : this.outputFormat.values()) {
+            if ("bmp".equals(format.getFileSuffix())
+                || "jpeg".equals(format.getFileSuffix())
+                || "jpg".equals(format.getFileSuffix())) {
+              // BMP and JPEG do not support transparency
+              continue;
+            }
+            final OutputStream outputStream = new ByteArrayOutputStream();
+            format.print(
+                new HashMap<>(),
+                requestData,
+                config,
+                getFile(JasperReportOutputFormatSimpleMapTest.class, BASE_DIR),
+                getTaskDirectory(),
+                outputStream);
+            // no error?  its a pass
 
-      }
-    });
+          }
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/output/ValuesTest.java b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
index c71e39a40..684d3c939 100644
--- a/core/src/test/java/org/mapfish/print/output/ValuesTest.java
+++ b/core/src/test/java/org/mapfish/print/output/ValuesTest.java
@@ -72,27 +72,29 @@ public void testNoDefaults() throws Exception {
 
   @Test
   public void testNoDefaults_Error_OnMissing_Attribute() throws Exception {
-    assertThrows(ObjectMissingException.class, () -> {
-      configurationFactory.setDoValidation(false);
-      final JSONObject obj = new JSONObject();
-      PJsonObject requestData = new PJsonObject(obj, "");
-      final JSONObject atts = new JSONObject();
-      obj.put("attributes", atts);
-      final Configuration config =
-          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-      Template template = config.getTemplates().values().iterator().next();
-      new Values(
-          new HashMap<>(),
-          requestData,
-          template,
-          new File("tmp"),
-          this.httpRequestFactory,
-          new File("."),
-          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-          new AtomicBoolean(false));
-    });
+    assertThrows(
+        ObjectMissingException.class,
+        () -> {
+          configurationFactory.setDoValidation(false);
+          final JSONObject obj = new JSONObject();
+          PJsonObject requestData = new PJsonObject(obj, "");
+          final JSONObject atts = new JSONObject();
+          obj.put("attributes", atts);
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+          Template template = config.getTemplates().values().iterator().next();
+          new Values(
+              new HashMap<>(),
+              requestData,
+              template,
+              new File("tmp"),
+              this.httpRequestFactory,
+              new File("."),
+              HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+              HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+              new AtomicBoolean(false));
+        });
   }
 
   @Test
@@ -138,40 +140,41 @@ public void testDefaults() throws Exception {
 
   @Test
   public void testExpectObjectGetArray() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-
-      PJsonObject requestData =
-          parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
-      String badLegendConf =
-          """
-        [{
-            "name": "",
-            "classes": [{
-                "name": "osm",
-                "icons":\
-         ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
-        &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
-            }]
-        }]
-        """;
-      requestData
-          .getInternalObj()
-          .getJSONObject("attributes")
-          .put("legend", new JSONArray(badLegendConf));
-      final Configuration config =
-          configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
-
-      Template template = config.getTemplates().values().iterator().next();
-      new Values(
-          new HashMap<>(),
-          requestData,
-          template,
-          new File("tmp"),
-          this.httpRequestFactory,
-          new File("."),
-          HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
-          HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
-          new AtomicBoolean(false));
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          PJsonObject requestData =
+              parseJSONObjectFromFile(ValuesTest.class, BASE_DIR + "requestData.json");
+          String badLegendConf =
+              """
+              [{
+                  "name": "",
+                  "classes": [{
+                      "name": "osm",
+                      "icons":\
+               ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
+              &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
+                  }]
+              }]
+              """;
+          requestData
+              .getInternalObj()
+              .getJSONObject("attributes")
+              .put("legend", new JSONArray(badLegendConf));
+          final Configuration config =
+              configurationFactory.getConfig(getFile(BASE_DIR + "config-no-defaults.yaml"));
+
+          Template template = config.getTemplates().values().iterator().next();
+          new Values(
+              new HashMap<>(),
+              requestData,
+              template,
+              new File("tmp"),
+              this.httpRequestFactory,
+              new File("."),
+              HTTP_REQUEST_MAX_NUMBER_FETCH_RETRY,
+              HTTP_REQUEST_FETCH_RETRY_INTERVAL_MILLIS,
+              new AtomicBoolean(false));
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
index 482832d85..b7a06afa7 100644
--- a/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
+++ b/core/src/test/java/org/mapfish/print/parser/MapfishParserTest.java
@@ -91,32 +91,39 @@ public void testChoice() {
 
   @Test
   public void testBothOneOfChoices() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestChoiceClass p = new TestChoiceClass();
-      PJsonObject json =
-          AbstractMapfishSpringTest.parseJSONObjectFromString("{\"choiceA\":1,\"choiceB\":2.0}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestChoiceClass p = new TestChoiceClass();
+          PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString(
+                  "{\"choiceA\":1,\"choiceB\":2.0}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testBothOneOfChoicesAndCanSatisfyOneOf() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestChoiceClass p = new TestChoiceClass();
-      PJsonObject json =
-          AbstractMapfishSpringTest.parseJSONObjectFromString(
-              "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestChoiceClass p = new TestChoiceClass();
+          PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString(
+                  "{\"choiceA\":1,\"choiceB\":2.0,\"choiceC\":3.0}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testMissingOneOfChoices() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestChoiceClass p = new TestChoiceClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestChoiceClass p = new TestChoiceClass();
+          PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
@@ -152,20 +159,25 @@ public void testOnlyRequirementDefinedNotDependant() {
 
   @Test
   public void testMissingBothRequirements() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestRequireClass p = new TestRequireClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestRequireClass p = new TestRequireClass();
+          PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testMissingOneOfTwoRequirements() {
-    assertThrows(AssertionFailedException.class, () -> {
-      TestRequireClass p = new TestRequireClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        AssertionFailedException.class,
+        () -> {
+          TestRequireClass p = new TestRequireClass();
+          PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1, \"b\":true}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
@@ -178,24 +190,28 @@ public void testFinalPublic() {
 
   @Test
   public void testFinalFieldMustNotBeInJson() {
-    assertThrows(ExtraPropertyException.class, () -> {
-      TestFinalClass p = new TestFinalClass();
-      PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
-      MapfishParser.parse(true, json, p);
-    });
+    assertThrows(
+        ExtraPropertyException.class,
+        () -> {
+          TestFinalClass p = new TestFinalClass();
+          PJsonObject json = AbstractMapfishSpringTest.parseJSONObjectFromString("{\"i\":1}");
+          MapfishParser.parse(true, json, p);
+        });
   }
 
   @Test
   public void testEnumIllegalVal() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      TestEnumParam p = new TestEnumParam();
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          TestEnumParam p = new TestEnumParam();
 
-      final PJsonObject json =
-          AbstractMapfishSpringTest.parseJSONObjectFromString(
-              "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
+          final PJsonObject json =
+              AbstractMapfishSpringTest.parseJSONObjectFromString(
+                  "{\"e1\":\"foo\", \"e2\": [2, \"VAL2\"]}");
 
-      MapfishParser.parse(true, json, p, "toIgnore");
-    });
+          MapfishParser.parse(true, json, p, "toIgnore");
+        });
   }
 
   @Test
@@ -300,23 +316,25 @@ public void testPopulateLayerParam_TooManyParams() throws IOException {
 
   @Test
   public void testDoesntMap() {
-    assertThrows(ExtraPropertyException.class, () -> {
-      String legendAtts =
-          """
-        {
-            "extra": "",
-            "classes": [{
-                "name": "osm",
-                "icons":\
-         ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
-        &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
-            }]
-        }
-        """;
-      PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
-      LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
-      MapfishParser.parse(true, requestData, param);
-    });
+    assertThrows(
+        ExtraPropertyException.class,
+        () -> {
+          String legendAtts =
+              """
+              {
+                  "extra": "",
+                  "classes": [{
+                      "name": "osm",
+                      "icons":\
+               ["http://localhost:9876/e2egeoserver/wms?REQUEST=GetLegendGraphic\
+              &VERSION=1.0.0&FORMAT=image/png&WIDTH=20&HEIGHT=20&LAYER=topp:states"]
+                  }]
+              }
+              """;
+          PObject requestData = new PJsonObject(new JSONObject(legendAtts), "legend");
+          LegendAttribute.LegendAttributeValue param = new LegendAttribute.LegendAttributeValue();
+          MapfishParser.parse(true, requestData, param);
+        });
   }
 
   enum TestEnum {
diff --git a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
index a0c67bf5e..ae3fdfccc 100644
--- a/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/PdfConfigurationProcessorTest.java
@@ -121,38 +121,44 @@ public void testKeywords() {
 
   @Test
   public void testExec_WrongFieldName() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      Map<String, Object> attributeMap = new HashMap<>();
-      final String titleKey = "titleAtt";
-      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-      in.values = new Values();
-      in.pdfConfig = new PDFConfig();
-
-      attributeMap.put("title", titleKey + ".xxx");
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      in.values.put(titleKey, new CustomTitleAtt());
-      pdfConfigurationProcessor.execute(in, null);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          Map<String, Object> attributeMap = new HashMap<>();
+          final String titleKey = "titleAtt";
+          final PdfConfigurationProcessor pdfConfigurationProcessor =
+              new PdfConfigurationProcessor();
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+          in.values = new Values();
+          in.pdfConfig = new PDFConfig();
+
+          attributeMap.put("title", titleKey + ".xxx");
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          in.values.put(titleKey, new CustomTitleAtt());
+          pdfConfigurationProcessor.execute(in, null);
+        });
   }
 
   @Test
   public void testExec_NullValue() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      Map<String, Object> attributeMap = new HashMap<>();
-      final String titleKey = "titleAtt";
-      final PdfConfigurationProcessor pdfConfigurationProcessor = new PdfConfigurationProcessor();
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
-      in.values = new Values();
-      in.pdfConfig = new PDFConfig();
-
-      attributeMap.put("title", titleKey + ".value");
-      pdfConfigurationProcessor.setUpdates(attributeMap);
-      in.values.put(titleKey, new CustomTitleAtt());
-      pdfConfigurationProcessor.execute(in, null);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          Map<String, Object> attributeMap = new HashMap<>();
+          final String titleKey = "titleAtt";
+          final PdfConfigurationProcessor pdfConfigurationProcessor =
+              new PdfConfigurationProcessor();
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          PdfConfigurationProcessor.In in = new PdfConfigurationProcessor.In();
+          in.values = new Values();
+          in.pdfConfig = new PDFConfig();
+
+          attributeMap.put("title", titleKey + ".value");
+          pdfConfigurationProcessor.setUpdates(attributeMap);
+          in.values.put(titleKey, new CustomTitleAtt());
+          pdfConfigurationProcessor.execute(in, null);
+        });
   }
 
   private void assertNumErrors(Map<String, Object> attributeMap, int expectedNumErrors) {
diff --git a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
index 8f071a583..3f33be1c1 100644
--- a/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/ProcessorDependencyGraphFactoryTest.java
@@ -396,12 +396,14 @@ public void testBuildProcessInputHasValuesAndOtherInput_WithInputMapping() {
    */
   @Test
   public void testBuildDependencyAttachesToLastElementProducingTheValue() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final List<TestProcessor<MapInput, Void>> processors =
-          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final List<TestProcessor<MapInput, Void>> processors =
+              Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
 
-      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-    });
+          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+        });
   }
 
   /**
@@ -424,11 +426,13 @@ public void testBuildDebugOutput() {
    */
   @Test
   public void testBuildValuesWithSameNameAndDifferentType() {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final List processors = Arrays.asList(NeedsMap, RootMapOut, NeedsMapList);
 
-      this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-    });
+          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+        });
   }
 
   /**
@@ -452,14 +456,16 @@ public void testBuildWhenOutputsMapToAllOtherInputs() {
    */
   @Test
   public void testExtraOutputMapperMapping() {
-    assertThrows(RuntimeException.class, () -> {
-      final List<TestProcessor<MapInput, Void>> processors =
-          Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
-
-      ProcessorDependencyGraph graph =
-          this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
-      assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
-    });
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          final List<TestProcessor<MapInput, Void>> processors =
+              Arrays.asList(NeedsMap, RootMapOut, NeedsMapAndWidthOutputsMap, RootTableAndWidthOut);
+
+          ProcessorDependencyGraph graph =
+              this.processorDependencyGraphFactory.build(processors, Collections.emptyMap());
+          assertContainsProcessors(graph.getRoots(), RootMapOut, RootTableAndWidthOut);
+        });
   }
 
   private void assertHasOrdering(TestOrderExecution execution, Processor... processors) {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
index 815182a5f..b6c947ba0 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/RestrictUrisProcessorTest.java
@@ -46,13 +46,15 @@ public void testCreateFactoryWrapperLegalRequest() throws Exception {
 
   @Test
   public void testCreateFactoryWrapperIllegalRequest() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
-      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-      final ClientHttpRequestFactory factoryWrapper =
-          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-      factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final RestrictUrisProcessor restrictUrisProcessor = createLocalhostOnly();
+          ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+          final ClientHttpRequestFactory factoryWrapper =
+              restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+          factoryWrapper.createRequest(new URI("http://www.google.com/q"), HttpMethod.GET);
+        });
   }
 
   @Test
@@ -66,13 +68,15 @@ public void testRejectWithLegalRequest() throws Exception {
 
   @Test
   public void testRejectWithIllegalRequest() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
-      ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
-      final ClientHttpRequestFactory factoryWrapper =
-          restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
-      factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final RestrictUrisProcessor restrictUrisProcessor = createDenyInternal();
+          ClientHttpFactoryProcessorParam params = new ClientHttpFactoryProcessorParam();
+          final ClientHttpRequestFactory factoryWrapper =
+              restrictUrisProcessor.createFactoryWrapper(params, requestFactory);
+          factoryWrapper.createRequest(new URI("http://192.168.12.23/q"), HttpMethod.GET);
+        });
   }
 
   private RestrictUrisProcessor createLocalhostOnly() {
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
index 7fa82089e..a93be856a 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/AddressHostMatcherTest.java
@@ -20,15 +20,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setMask("255.255.255.0");
     addressHostMatcher.setIp("127.0.0.0");
@@ -42,15 +53,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         addressHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     addressHostMatcher.setPort(8080);
     assertMatch(addressHostMatcher, true, new URI("http://127.0.0.1:8080"), HttpMethod.GET);
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
index ba68c69cc..00594c330 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/DnsHostMatcherTest.java
@@ -30,15 +30,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "localhost",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         dnsHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     dnsHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
index 7f1abc87b..675f7549f 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/HostnameMatcherTest.java
@@ -39,15 +39,26 @@ public void testNoSubdomain() throws Exception {
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "localhost", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "localhost",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertFalse(
         hostnameHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     hostnameHostMatcher.setPort(8080);
 
diff --git a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
index 85ff93117..77fb2a7b0 100644
--- a/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
+++ b/core/src/test/java/org/mapfish/print/processor/http/matcher/LocalHostMatcherTest.java
@@ -47,15 +47,26 @@ public void testAccepts() throws Exception {
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME, MatchInfo.ANY_HOST, 80, MatchInfo.ANY_REALM, "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", MatchInfo.ANY_PORT, MatchInfo.ANY_REALM, "http"))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    MatchInfo.ANY_PORT,
+                    MatchInfo.ANY_REALM,
+                    "http"))));
     assertTrue(
         localHostMatcher.matches(
             MatchInfo.fromAuthScope(
-                new AuthScope(MatchInfo.ANY_SCHEME, "127.0.0.1", 80, MatchInfo.ANY_REALM, MatchInfo.ANY_SCHEME))));
+                new AuthScope(
+                    MatchInfo.ANY_SCHEME,
+                    "127.0.0.1",
+                    80,
+                    MatchInfo.ANY_REALM,
+                    MatchInfo.ANY_SCHEME))));
 
     assertMatch(localHostMatcher, false, new URI("http://www.camptocamp.com/"), HttpMethod.GET);
 
diff --git a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
index 2687eeab3..26db0e7b7 100644
--- a/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/MapPrinterServletSecurityTest.java
@@ -60,34 +60,38 @@ public void testCreateReportAndGet_Success() throws Exception {
   @Test
   @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_InsufficientPrivileges() throws Exception {
-    assertThrows(AccessDeniedException.class, () -> {
-      AccessAssertionTestUtil.setCreds("ROLE_USER");
-      setUpConfigFiles();
+    assertThrows(
+        AccessDeniedException.class,
+        () -> {
+          AccessAssertionTestUtil.setCreds("ROLE_USER");
+          setUpConfigFiles();
 
-      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+          final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+          final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-      String requestData = loadRequestDataAsString();
+          String requestData = loadRequestDataAsString();
 
-      this.servlet.createReportAndGetNoAppId(
-          "png", requestData, false, servletCreateRequest, servletCreateResponse);
-    });
+          this.servlet.createReportAndGetNoAppId(
+              "png", requestData, false, servletCreateRequest, servletCreateResponse);
+        });
   }
 
   @Test
   @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS)
   public void testCreateReportAndGet_NoCredentials() throws Exception {
-    assertThrows(AuthenticationCredentialsNotFoundException.class, () -> {
-      setUpConfigFiles();
+    assertThrows(
+        AuthenticationCredentialsNotFoundException.class,
+        () -> {
+          setUpConfigFiles();
 
-      final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
-      final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
+          final MockHttpServletRequest servletCreateRequest = new MockHttpServletRequest();
+          final MockHttpServletResponse servletCreateResponse = new MockHttpServletResponse();
 
-      String requestData = loadRequestDataAsString();
+          String requestData = loadRequestDataAsString();
 
-      this.servlet.createReportAndGetNoAppId(
-          "png", requestData, false, servletCreateRequest, servletCreateResponse);
-    });
+          this.servlet.createReportAndGetNoAppId(
+              "png", requestData, false, servletCreateRequest, servletCreateResponse);
+        });
   }
 
   @Test
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
index 70d3c2da2..366b003e0 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ClasspathConfigFileLoaderTest.java
@@ -100,55 +100,68 @@ public void testLoadFileChildResource() throws Exception {
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
-
-      this.loader.loadFile(
-          configFileUri, "classpath://test-http-request-factory-application-context.xml");
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
+
+          this.loader.loadFile(
+              configFileUri, "classpath://test-http-request-factory-application-context.xml");
+        });
   }
 
   @Test
   public void testLoadFileChildResource_NotClasspathURI() throws Exception {
-    assertThrows(IllegalArgumentException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
-      final String resourceFileName = "resourceFile.txt";
-
-      final String uri = getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
-      this.loader.loadFile(configFileUri, uri);
-    });
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
+          final String resourceFileName = "resourceFile.txt";
+
+          final String uri =
+              getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString();
+          this.loader.loadFile(configFileUri, uri);
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
-      final String resourceFileName = "resourceFile.txt";
-
-      final File file =
-          new File(
-              getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(), "doesNotExist");
-      this.loader.loadFile(configFileUri, file.getPath());
-    });
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
+          final String resourceFileName = "resourceFile.txt";
+
+          final File file =
+              new File(
+                  getFile(FileConfigFileLoader.class, resourceFileName).getParentFile(),
+                  "doesNotExist");
+          this.loader.loadFile(configFileUri, file.getPath());
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist2() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI(configFileUriString);
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI(configFileUriString);
 
-      this.loader.loadFile(configFileUri, "doesNotExist");
-    });
+          this.loader.loadFile(configFileUri, "doesNotExist");
+        });
   }
 
   @Test
   public void testLoadFileChildResource_ConfigFileDoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI("classpath://xyz.yaml");
-      final String resourceFileName = "resourceFile.txt";
-
-      this.loader.loadFile(
-          configFileUri, getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
-    });
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI("classpath://xyz.yaml");
+          final String resourceFileName = "resourceFile.txt";
+
+          this.loader.loadFile(
+              configFileUri,
+              getFile(FileConfigFileLoader.class, resourceFileName).toURI().toString());
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
index d71772b31..dfb39afc4 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/FileConfigFileLoaderTest.java
@@ -54,14 +54,15 @@ public void testLoadFile() throws Exception {
 
   @Test
   public void testLoadFileMissingFile() throws Exception {
-    assertThrows(NoSuchElementException.class, () ->
-      this.loader.loadFile(new URI("file:/c:/doesnotexist")));
+    assertThrows(
+        NoSuchElementException.class, () -> this.loader.loadFile(new URI("file:/c:/doesnotexist")));
   }
 
   @Test
   public void testLastModifiedMissingFile() throws Exception {
-    assertThrows(NoSuchElementException.class, () ->
-      this.loader.lastModified(new URI("file:/c:/doesnotexist")));
+    assertThrows(
+        NoSuchElementException.class,
+        () -> this.loader.lastModified(new URI("file:/c:/doesnotexist")));
   }
 
   @Test
@@ -113,22 +114,28 @@ public void testLoadFileChildResource() throws Exception {
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI configFileUri = CONFIG_FILE.toURI();
-
-      this.loader.loadFile(
-          configFileUri,
-          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-              .getAbsolutePath());
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI configFileUri = CONFIG_FILE.toURI();
+
+          this.loader.loadFile(
+              configFileUri,
+              getFile(
+                      FileConfigFileLoader.class,
+                      "/test-http-request-factory-application-context.xml")
+                  .getAbsolutePath());
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = CONFIG_FILE.toURI();
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = CONFIG_FILE.toURI();
 
-      this.loader.loadFile(configFileUri, "doesNotExist");
-    });
+          this.loader.loadFile(configFileUri, "doesNotExist");
+        });
   }
 }
diff --git a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
index 689c63f58..f9dec053b 100644
--- a/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
+++ b/core/src/test/java/org/mapfish/print/servlet/fileloader/ServletConfigFileLoaderTest.java
@@ -111,32 +111,40 @@ public void testLoadFileChildResource() throws Exception {
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
-
-      this.loader.loadFile(
-          configFileUri,
-          getFile(FileConfigFileLoader.class, "/test-http-request-factory-application-context.xml")
-              .getAbsolutePath());
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+
+          this.loader.loadFile(
+              configFileUri,
+              getFile(
+                      FileConfigFileLoader.class,
+                      "/test-http-request-factory-application-context.xml")
+                  .getAbsolutePath());
+        });
   }
 
   @Test
   public void testLoadFileChildResource_NotInConfigDir_ServletURI() throws Exception {
-    assertThrows(IllegalFileAccessException.class, () -> {
-      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
-
-      this.loader.loadFile(
-          configFileUri, "servlet:///test-http-request-factory-application-context.xml");
-    });
+    assertThrows(
+        IllegalFileAccessException.class,
+        () -> {
+          final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+
+          this.loader.loadFile(
+              configFileUri, "servlet:///test-http-request-factory-application-context.xml");
+        });
   }
 
   @Test
   public void testLoadFileChildResource_DoesNotExist() throws Exception {
-    assertThrows(NoSuchElementException.class, () -> {
-      final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
+    assertThrows(
+        NoSuchElementException.class,
+        () -> {
+          final URI configFileUri = new URI(CONFIG_FILE_URI_STRING);
 
-      this.loader.loadFile(configFileUri, "doesNotExist");
-    });
+          this.loader.loadFile(configFileUri, "doesNotExist");
+        });
   }
 }

From 98de59a9174d9e0aa081d1bab639039bff7a67ac Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 29 Dec 2025 14:10:23 +0100
Subject: [PATCH 60/61] Addressed linter errors regarding path variable names

---
 .../print/servlet/MapPrinterServlet.java      | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
index d4c104632..d3a6e9401 100644
--- a/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
+++ b/core/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java
@@ -385,8 +385,8 @@ private static String maybeAddRequestId(final String ref, final HttpServletReque
       value = "/{appId}" + STATUS_URL + "/{referenceId:\\S+}.json",
       method = RequestMethod.GET)
   public final void getStatusSpecificAppId(
-      @Nonnull @PathVariable("appId") final String appId,
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
@@ -408,7 +408,7 @@ public final void getStatusSpecificAppId(
    */
   @RequestMapping(value = STATUS_URL + "/{referenceId:\\S+}.json", method = RequestMethod.GET)
   public final void getStatusPath(
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String referenceId,
       final HttpServletRequest statusRequest,
       final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
@@ -478,8 +478,8 @@ private void getStatus(
       value = "/{appId}" + CANCEL_URL + "/{referenceId:\\S+}",
       method = RequestMethod.DELETE)
   public final void cancelSpecificAppId(
-      @Nonnull @PathVariable("appId") final String appId,
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable final String referenceId,
       final HttpServletResponse statusResponse) {
     withAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
@@ -498,8 +498,7 @@ public final void cancelSpecificAppId(
    */
   @RequestMapping(value = CANCEL_URL + "/{referenceId:\\S+}", method = RequestMethod.DELETE)
   public final void cancelPath(
-      @Nonnull @PathVariable("referenceId") final String referenceId,
-      final HttpServletResponse statusResponse) {
+      @Nonnull @PathVariable final String referenceId, final HttpServletResponse statusResponse) {
     noAppIdCounter.inc();
     try (Timer.Context ignored = cancelTimer.time()) {
       cancel("default", referenceId, statusResponse);
@@ -542,8 +541,8 @@ private void cancel(
    */
   @RequestMapping(value = "/{appId}" + REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @Nonnull @PathVariable("appId") final String appId,
-      @PathVariable("format") final String format,
+      @Nonnull @PathVariable final String appId,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -598,11 +597,11 @@ private void doCreateReport(
       value = "/{appId}" + REPORT_URL + "/{referenceId:\\S+}",
       method = RequestMethod.GET)
   public final void getReportSpecificAppId(
-      @Nonnull @PathVariable("appId") final String appId,
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String appId,
+      @Nonnull @PathVariable final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
-      throws IOException, ServletException {
+      throws IOException {
     withAppIdCounter.inc();
     try (Timer.Context ignored = getReportTimer.time()) {
       getReport(appId, referenceId, inline, getReportResponse);
@@ -618,10 +617,10 @@ public final void getReportSpecificAppId(
    */
   @RequestMapping(value = REPORT_URL + "/{referenceId:\\S+}", method = RequestMethod.GET)
   public final void getReportPath(
-      @Nonnull @PathVariable("referenceId") final String referenceId,
+      @Nonnull @PathVariable final String referenceId,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletResponse getReportResponse)
-      throws IOException, ServletException {
+      throws IOException {
     noAppIdCounter.inc();
     try (Timer.Context ignored = getReportTimer.time()) {
       getReport("default", referenceId, inline, getReportResponse);
@@ -641,7 +640,7 @@ private void getReport(
       @Nonnull final String referenceId,
       final boolean inline,
       final HttpServletResponse getReportResponse)
-      throws IOException, ServletException {
+      throws IOException {
     MDC.put(Processor.MDC_APPLICATION_ID_KEY, applicationId);
     MDC.put(Processor.MDC_JOB_ID_KEY, referenceId);
     setNoCache(getReportResponse);
@@ -659,7 +658,7 @@ private void getReport(
    */
   @RequestMapping(value = REPORT_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReport(
-      @PathVariable("format") final String format,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
@@ -704,8 +703,8 @@ private static String getAppId(
       value = "/{appId}" + CREATE_AND_GET_URL + ".{format:\\w+}",
       method = RequestMethod.POST)
   public final void createReportAndGet(
-      @Nonnull @PathVariable("appId") final String appId,
-      @PathVariable("format") final String format,
+      @Nonnull @PathVariable final String appId,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -726,7 +725,7 @@ private void doCreateReportAndGet(
       final boolean inline,
       final HttpServletRequest createReportRequest,
       final HttpServletResponse createReportResponse)
-      throws NoSuchAppException, InterruptedException, IOException, ServletException {
+      throws NoSuchAppException, InterruptedException, IOException {
     String ref =
         createAndSubmitPrintJob(
             appId, format, requestData, createReportRequest, createReportResponse);
@@ -758,7 +757,7 @@ private void doCreateReportAndGet(
    */
   @RequestMapping(value = CREATE_AND_GET_URL + ".{format:\\w+}", method = RequestMethod.POST)
   public final void createReportAndGetNoAppId(
-      @PathVariable("format") final String format,
+      @PathVariable final String format,
       @RequestBody final String requestData,
       @RequestParam(value = "inline", defaultValue = "false") final boolean inline,
       final HttpServletRequest createReportRequest,
@@ -831,7 +830,7 @@ public final void getCapabilities(
    */
   @RequestMapping(value = "/{appId}" + CAPABILITIES_URL, method = RequestMethod.GET)
   public final void getCapabilities(
-      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable final String appId,
       @RequestParam(value = "pretty", defaultValue = "false") final boolean pretty,
       final HttpServletRequest request,
       final HttpServletResponse capabilitiesResponse)
@@ -912,7 +911,7 @@ public final void getExampleRequest(
    */
   @RequestMapping(value = "{appId}" + EXAMPLE_REQUEST_URL, method = RequestMethod.GET)
   public final void getExampleRequest(
-      @Nonnull @PathVariable("appId") final String appId,
+      @Nonnull @PathVariable final String appId,
       final HttpServletRequest request,
       final HttpServletResponse getExampleResponse)
       throws IOException {

From 8977450712f7d6a61bf9eb168e43f59ec2a1279f Mon Sep 17 00:00:00 2001
From: "Andrey Rusakov (andrey.rusakov@camptocamp.com)" <lanseg@proton.me>
Date: Mon, 5 Jan 2026 10:56:02 +0100
Subject: [PATCH 61/61] Fixed the linter recommendation for the path variable
 names

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9d4403552..53ebe5b2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,7 +60,7 @@ 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 {