Upgrade to Spring 6

Author: sbrunner

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: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',

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

@@ -10,7 +10,7 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;

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

@@ -6,9 +6,9 @@
 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 jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
+import jakarta.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

@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.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

@@ -3,7 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.annotation.Nonnull;
+import jakarta.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 java.util.List;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONWriter;

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

@@ -11,8 +11,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.Nonnull;
+import jakarta.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

@@ -3,7 +3,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import javax.annotation.Nonnull;
+import jakarta.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

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
+import jakarta.annotation.Nonnull;
 import org.geotools.api.referencing.FactoryException;
 import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.json.JSONArray;