Upgrade to Spring 6

core/build.gradle

@@ -1,3 +1,7 @@
+tasks.withType(JavaCompile).configureEach {
+    sourceCompatibility = '21'
+    targetCompatibility = '21'
+}
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.apache.tools.ant.filters.ReplaceTokens
 
@@ -125,14 +129,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:6.1.6',
+            'org.springframework:spring-web:6.1.6',
+            'org.springframework:spring-webmvc:6.1.6',
+            'org.springframework:spring-aspects:6.1.6',
+            'org.springframework:spring-orm:6.1.6',
+            'org.springframework:spring-jdbc:6.1.6',
+            'org.springframework:spring-tx:6.1.6',
+            'org.springframework:spring-test:6.1.6',
             'org.springframework.security:spring-security-config:5.8.16',
             'org.springframework.security:spring-security-web:5.8.16',
             'com.thetransactioncompany:cors-filter:2.10',
@@ -142,6 +146,9 @@ dependencies {
             'com.mchange:c3p0:0.10.2',
             'javax.media:jai-core:1.1.3',
     )
+    implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0'
+    implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'
+    implementation 'org.apache.httpcomponents.core5:httpcore5:5.2.3'
     metrics(
             'io.dropwizard.metrics:metrics-core:4.2.30',
             'io.dropwizard.metrics:metrics-servlet:4.2.30',

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

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

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

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

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

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

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

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

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;

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;

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;

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;

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;

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;

core/src/main/java/org/mapfish/print/cli/CliServletContext.java

@@ -1,20 +1,20 @@
 package org.mapfish.print.cli;
 
+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;
 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 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;
 
 /**
  * An essentially non-functional servlet context that is used by the CLI application to satisfy the
@@ -81,19 +81,16 @@ 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;
@@ -102,7 +99,6 @@ public Enumeration<String> getServletNames() {
   @Override
   public void log(final String msg) {}
 
-  @Override
   @Deprecated
   public void log(final Exception exception, final String msg) {}
 
@@ -292,7 +288,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;
   }
 }

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;

core/src/main/java/org/mapfish/print/config/ConfigurationFactory.java

@@ -1,14 +1,14 @@
 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;
 import java.io.InputStream;
 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;

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.

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;

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 javax.servlet.ServletContext;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.mapfish.print.metrics.UnhealthyCountersHealthCheck;

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;

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;

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;

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;

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

core/src/main/java/org/mapfish/print/http/ErrorResponseClientHttpResponse.java

@@ -1,7 +1,7 @@
 package org.mapfish.print.http;
 
+import jakarta.annotation.Nonnull;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.client.AbstractClientHttpResponse;
 import org.springframework.util.StreamUtils;