From 8ce6be3fc3985592c60e81597beb5388b1c2342f Mon Sep 17 00:00:00 2001
From: Renovate Bot <167181728+ndwlocatieservices@users.noreply.github.com>
Date: Tue, 12 Dec 2023 00:15:27 +0000
Subject: [PATCH 1/3] Update all non-major dependencies
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e9ec1eb..0dc3a646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.1.5
+ 3.2.0
nu.ndw.nls.accessibilitymap
@@ -23,7 +23,7 @@
17
- 3.1.0
+ 3.1.1
UTF-8
UTF-8
0.2.6
@@ -35,14 +35,14 @@
7.1.0
4.7.5
2022.0.4
- 2.2.0
+ 2.3.0
1.3.1
2.2.19
- 3.3.2
- 4.2.1
- 3.1.0
- 7.7.1
+ 3.3.5
+ 4.2.2
+ 3.2.1
+ 7.7.2
From e381c0c449534faae1a82e41e36f3d597cb444fe Mon Sep 17 00:00:00 2001
From: Bas Duineveld <167181728+ndwlocatieservices@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:05:56 +0100
Subject: [PATCH 2/3] #64406 Bump Spring Cloud, Keycloak, fix JarLauncher
---
docker/nls-accessibility-map-api/Dockerfile | 2 +-
docker/nls-accessibility-map-jobs/Dockerfile | 2 +-
pom.xml | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/nls-accessibility-map-api/Dockerfile b/docker/nls-accessibility-map-api/Dockerfile
index dc795837..3917c15e 100644
--- a/docker/nls-accessibility-map-api/Dockerfile
+++ b/docker/nls-accessibility-map-api/Dockerfile
@@ -27,4 +27,4 @@ COPY --chown=java:java logback-deploy.xml logback-deploy.xml
USER 1000
-ENTRYPOINT java org.springframework.boot.loader.JarLauncher
+ENTRYPOINT java org.springframework.boot.loader.launch.JarLauncher
diff --git a/docker/nls-accessibility-map-jobs/Dockerfile b/docker/nls-accessibility-map-jobs/Dockerfile
index b5516ea8..453dbaf7 100644
--- a/docker/nls-accessibility-map-jobs/Dockerfile
+++ b/docker/nls-accessibility-map-jobs/Dockerfile
@@ -28,4 +28,4 @@ COPY --chown=java:java logback-deploy.xml ./
RUN mkdir ./graphhopper && chmod -R 755 ./graphhopper && chown -R java ./graphhopper
USER 1000
-ENTRYPOINT java org.springframework.boot.loader.JarLauncher $COMMAND
+ENTRYPOINT java org.springframework.boot.loader.launch.JarLauncher $COMMAND
diff --git a/pom.xml b/pom.xml
index 0dc3a646..aed851ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,19 +29,19 @@
0.2.6
0.8.11
1.4.1
- 22.0.5
+ 23.0.1
7.4
1.5.5.Final
7.1.0
4.7.5
- 2022.0.4
+ 2023.0.0
2.3.0
1.3.1
2.2.19
- 3.3.5
+ 3.3.6
4.2.2
- 3.2.1
+ 3.2.2
7.7.2
From 7420a5b638dcc74a1214991c1e576e1509b5b579 Mon Sep 17 00:00:00 2001
From: Bas Duineveld <167181728+ndwlocatieservices@users.noreply.github.com>
Date: Tue, 12 Dec 2023 22:11:26 +0100
Subject: [PATCH 3/3] #64447 Fix GeoTools imports
---
.../jobs/nwb/mappers/RijksdriehoekToWgs84Mapper.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/jobs/src/main/java/nu/ndw/nls/accessibilitymap/jobs/nwb/mappers/RijksdriehoekToWgs84Mapper.java b/jobs/src/main/java/nu/ndw/nls/accessibilitymap/jobs/nwb/mappers/RijksdriehoekToWgs84Mapper.java
index 159dd058..290321a4 100644
--- a/jobs/src/main/java/nu/ndw/nls/accessibilitymap/jobs/nwb/mappers/RijksdriehoekToWgs84Mapper.java
+++ b/jobs/src/main/java/nu/ndw/nls/accessibilitymap/jobs/nwb/mappers/RijksdriehoekToWgs84Mapper.java
@@ -1,12 +1,12 @@
package nu.ndw.nls.accessibilitymap.jobs.nwb.mappers;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.operation.MathTransform;
+import org.geotools.api.referencing.operation.TransformException;
import org.geotools.geometry.jts.JTS;
import org.geotools.referencing.CRS;
import org.locationtech.jts.geom.LineString;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
import org.springframework.stereotype.Component;
@Component