From 94aea6059c89976b915ad2cff17dc46e96ea516b Mon Sep 17 00:00:00 2001
From: Takara Baumbach <takara.baumbach@heigit.org>
Date: Tue, 30 Jul 2024 18:13:33 +0200
Subject: [PATCH 1/2] build: update dependencies

---
 ors-api/pom.xml                               |   9 --
 ors-engine/pom.xml                            |   9 --
 .../src/main/java/org/heigit/ors/jts/JTS.java | 106 +-----------------
 .../reader/traffic/HereTrafficReader.java     |  13 +--
 .../reader/traffic/TrafficLink.java           |   2 +-
 .../reader/traffic/TrafficLinkMetadata.java   |   2 +-
 .../HereTrafficGraphStorageBuilder.java       |   9 +-
 .../java/org/heigit/ors/util/GeomUtility.java |  12 +-
 pom.xml                                       |  81 +++++++++++--
 9 files changed, 95 insertions(+), 148 deletions(-)

diff --git a/ors-api/pom.xml b/ors-api/pom.xml
index cb4acdb19a..827aed0269 100644
--- a/ors-api/pom.xml
+++ b/ors-api/pom.xml
@@ -299,12 +299,10 @@
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>commons-compiler</artifactId>
-            <version>3.1.10</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
             <scope>test</scope>
         </dependency>
         <!-- TODO: remove this if nothing breaks
@@ -364,13 +362,6 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>json-path</artifactId>
-            <version>5.3.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/ors-engine/pom.xml b/ors-engine/pom.xml
index b5a0e9b75f..4f90901c4b 100644
--- a/ors-engine/pom.xml
+++ b/ors-engine/pom.xml
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>com.carrotsearch</groupId>
             <artifactId>hppc</artifactId>
-            <version>0.8.1</version>
         </dependency>
 
         <dependency>
@@ -96,11 +95,6 @@
             <artifactId>gt-metadata</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-opengis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-referencing</artifactId>
@@ -140,7 +134,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.26.0</version>
         </dependency>
 
         <dependency>
@@ -178,14 +171,12 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-params</artifactId>
-            <version>${jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>${jupiter.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/ors-engine/src/main/java/org/heigit/ors/jts/JTS.java b/ors-engine/src/main/java/org/heigit/ors/jts/JTS.java
index 3b0fe2aa4e..9fc57de805 100644
--- a/ors-engine/src/main/java/org/heigit/ors/jts/JTS.java
+++ b/ors-engine/src/main/java/org/heigit/ors/jts/JTS.java
@@ -16,16 +16,14 @@
  */
 package org.heigit.ors.jts;
 
-import org.geotools.geometry.GeneralDirectPosition;
 import org.geotools.metadata.i18n.ErrorKeys;
-import org.geotools.metadata.i18n.Errors;
-import org.geotools.referencing.GeodeticCalculator;
 import org.locationtech.jts.algorithm.Orientation;
 import org.locationtech.jts.geom.*;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
 
-import java.util.*;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * JTS Geometry utility methods, bringing Geotools to JTS.
@@ -48,29 +46,12 @@
  * @since 2.2
  */
 public final class JTS {
-    /**
-     * A pool of direct positions for use in {@link #orthodromicDistance}.
-     */
-    private static final GeneralDirectPosition[] POSITIONS = new GeneralDirectPosition[4];
     private static final GeometryFactory factory;
 
     static {
-        for (int i = 0; i < POSITIONS.length; i++) {
-            POSITIONS[i] = new GeneralDirectPosition(i);
-        }
-
         factory = new GeometryFactory();
     }
 
-    /**
-     * Geodetic calculators already created for a given coordinate reference system. For use in
-     * {@link #orthodromicDistance}.
-     * <p>
-     * Note: We would like to use {@link org.geotools.util.CanonicalSet}, but we can't because
-     * {@link GeodeticCalculator} keep a reference to the CRS which is used as the key.
-     */
-    private static final Map<CoordinateReferenceSystem, GeodeticCalculator> CALCULATORS = new HashMap<>();
-
     /**
      * Do not allow instantiation of this class.
      */
@@ -86,64 +67,10 @@ private JTS() {
      */
     private static void ensureNonNull(final String name, final Object object) throws IllegalArgumentException {
         if (object == null) {
-            throw new IllegalArgumentException(Errors.format(ErrorKeys.NULL_ARGUMENT_$1, name));
-        }
-    }
-
-
-    /**
-     * Computes the orthodromic distance between two points. This method:
-     * <p>
-     * <ol>
-     * <li>Transforms both points to geographic coordinates
-     * (<var>latitude</var>,<var>longitude</var>).</li>
-     * <li>Computes the orthodromic distance between the two points using ellipsoidal calculations.</li>
-     * </ol>
-     * <p>
-     * The real work is performed by {@link GeodeticCalculator}. This convenience method simply
-     * manages a pool of pre-defined geodetic calculators for the given coordinate reference system
-     * in order to avoid repetitive object creation. If a large amount of orthodromic distances need
-     * to be computed, direct use of {@link GeodeticCalculator} provides better performance than
-     * this convenience method.
-     *
-     * @param p1  First point
-     * @param p2  Second point
-     * @param crs Reference system the two points are in.
-     * @return Orthodromic distance between the two points, in meters.
-     * @throws TransformException if the coordinates can't be transformed from the specified CRS to a
-     *                            {@linkplain org.opengis.referencing.crs.GeographicCRS geographic CRS}.
-     */
-    public static synchronized double orthodromicDistance(final Coordinate p1, final Coordinate p2,
-                                                          final CoordinateReferenceSystem crs) throws TransformException {
-        ensureNonNull("p1", p1);
-        ensureNonNull("p2", p2);
-        ensureNonNull("crs", crs);
-
-        /*
-         * Need to synchronize because we use a single instance of a Map (CALCULATORS) as well as
-         * shared instances of GeodeticCalculator and GeneralDirectPosition (POSITIONS). None of
-         * them are thread-safe.
-         */
-        GeodeticCalculator gc = CALCULATORS.get(crs);
-
-        if (gc == null) {
-            gc = new GeodeticCalculator(crs);
-            CALCULATORS.put(crs, gc);
+            throw new IllegalArgumentException(MessageFormat.format(ErrorKeys.NULL_ARGUMENT_$1, name));
         }
-        if (!crs.equals(gc.getCoordinateReferenceSystem())) throw new AssertionError(crs);
-
-        final GeneralDirectPosition pos = POSITIONS[Math.min(POSITIONS.length - 1, crs
-                .getCoordinateSystem().getDimension())];
-        pos.setCoordinateReferenceSystem(crs);
-        copy(p1, pos.ordinates);
-        gc.setStartingPosition(pos);
-        copy(p2, pos.ordinates);
-        gc.setDestinationPosition(pos);
-
-        return gc.getOrthodromicDistance();
     }
 
-
     /**
      * Copies the ordinates values from the specified JTS coordinates to the specified array. The
      * destination array can have any length. Only the relevant field of the source coordinate will
@@ -175,7 +102,6 @@ public static void copy(final Coordinate point, final double[] ordinates) {
         }
     }
 
-
     /**
      * Creates a smoothed copy of the input Geometry. This is only useful for polygonal and lineal
      * geometries. Point objects will be returned unchanged. The smoothing algorithm inserts new
@@ -220,10 +146,8 @@ public static Geometry smooth(final Geometry geom, double fit) {
      * @throws IllegalArgumentException if either {@code geom} or {@code factory} is {@code null}
      */
     public static Geometry smooth(final Geometry geom, double fit, final GeometryFactory factory) {
-
         ensureNonNull("geom", geom);
         ensureNonNull("factory", factory);
-
         // Adjust fit if necessary
         fit = Math.max(0.0, Math.min(1.0, fit));
         return smooth(geom, fit, factory, new GeometrySmoother(factory));
@@ -231,7 +155,6 @@ public static Geometry smooth(final Geometry geom, double fit, final GeometryFac
 
     private static Geometry smooth(final Geometry geom, final double fit,
                                    final GeometryFactory factory, GeometrySmoother smoother) {
-
         return switch (geom.getGeometryType().toUpperCase()) {
             case "POINT", "MULTIPOINT" ->
                 // For points, just return the input geometry
@@ -250,13 +173,11 @@ private static Geometry smooth(final Geometry geom, final double fit,
 
     private static Geometry smoothLineString(GeometryFactory factory, GeometrySmoother smoother,
                                              Geometry geom, double fit) {
-
         if (geom instanceof LinearRing linearRing) {
             // Treat as a Polygon
             Polygon poly = factory.createPolygon(linearRing, null);
             Polygon smoothed = smoother.smooth(poly, fit);
             return smoothed.getExteriorRing();
-
         } else {
             return smoother.smooth((LineString) geom, fit);
         }
@@ -264,41 +185,33 @@ private static Geometry smoothLineString(GeometryFactory factory, GeometrySmooth
 
     private static Geometry smoothMultiLineString(GeometryFactory factory,
                                                   GeometrySmoother smoother, Geometry geom, double fit) {
-
         final int N = geom.getNumGeometries();
         LineString[] smoothed = new LineString[N];
-
         for (int i = 0; i < N; i++) {
             smoothed[i] = (LineString) smoothLineString(factory, smoother, geom.getGeometryN(i),
                     fit);
         }
-
         return factory.createMultiLineString(smoothed);
     }
 
     private static Geometry smoothMultiPolygon(GeometryFactory factory, GeometrySmoother smoother,
                                                Geometry geom, double fit) {
-
         final int N = geom.getNumGeometries();
         Polygon[] smoothed = new Polygon[N];
 
         for (int i = 0; i < N; i++) {
             smoothed[i] = smoother.smooth((Polygon) geom.getGeometryN(i), fit);
         }
-
         return factory.createMultiPolygon(smoothed);
     }
 
     private static Geometry smoothGeometryCollection(GeometryFactory factory,
                                                      GeometrySmoother smoother, Geometry geom, double fit) {
-
         final int N = geom.getNumGeometries();
         Geometry[] smoothed = new Geometry[N];
-
         for (int i = 0; i < N; i++) {
             smoothed[i] = smooth(geom.getGeometryN(i), fit, factory, smoother);
         }
-
         return factory.createGeometryCollection(smoothed);
     }
 
@@ -313,13 +226,10 @@ static LineString removeCollinearVertices(final LineString ls) {
         if (ls == null) {
             throw new NullPointerException("The provided linestring is null");
         }
-
         final int N = ls.getNumPoints();
         final boolean isLinearRing = ls instanceof LinearRing;
-
         List<Coordinate> retain = new ArrayList<>();
         retain.add(ls.getCoordinateN(0));
-
         int i0 = 0;
         int i1 = 1;
         int i2 = 2;
@@ -354,7 +264,6 @@ static LineString removeCollinearVertices(final LineString ls) {
 
             return ls;
         }
-
         return isLinearRing ? ls.getFactory()
                 .createLinearRing(retain.toArray(new Coordinate[size])) : ls.getFactory()
                 .createLineString(retain.toArray(new Coordinate[size]));
@@ -420,10 +329,8 @@ public static Geometry removeCollinearVertices(final Geometry g) {
                 part = removeCollinearVertices(part);
                 parts[i] = part;
             }
-
             return g.getFactory().createMultiPolygon(parts);
         }
-
         throw new IllegalArgumentException(
                 "This method can work on LineString, Polygon and Multipolygon: " + g.getClass());
     }
@@ -445,7 +352,6 @@ public static Geometry removeCollinearVertices(final Geometry geometry, int minP
         if ((minPoints <= 0) || (geometry.getNumPoints() < minPoints)) {
             return geometry;
         }
-
         if (geometry instanceof LineString lineString) {
             return removeCollinearVertices(lineString);
         } else if (geometry instanceof Polygon polygon) {
@@ -460,7 +366,6 @@ public static Geometry removeCollinearVertices(final Geometry geometry, int minP
 
             return geometry.getFactory().createMultiPolygon(parts);
         }
-
         throw new IllegalArgumentException(
                 "This method can work on LineString, Polygon and Multipolygon: "
                         + geometry.getClass());
@@ -472,7 +377,6 @@ public static Polygon toGeometry(final Envelope env) {
 
     public static Polygon toGeometry(final Envelope env, GeometryFactory factory) {
         ensureNonNull("env", env);
-
         return factory.createPolygon(factory.createLinearRing(new Coordinate[]{
                 new Coordinate(env.getMinX(), env.getMinY()),
                 new Coordinate(env.getMaxX(), env.getMinY()),
diff --git a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/HereTrafficReader.java b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/HereTrafficReader.java
index 0534563e9a..253e66b4c7 100644
--- a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/HereTrafficReader.java
+++ b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/HereTrafficReader.java
@@ -15,19 +15,18 @@
 
 import com.graphhopper.util.DistanceCalcEarth;
 import org.apache.log4j.Logger;
-import org.geotools.data.FileDataStore;
-import org.geotools.data.FileDataStoreFinder;
+import org.geotools.api.data.FileDataStore;
+import org.geotools.api.data.FileDataStoreFinder;
+import org.geotools.api.data.SimpleFeatureSource;
+import org.geotools.api.feature.Property;
+import org.geotools.api.feature.simple.SimpleFeature;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureIterator;
-import org.geotools.data.simple.SimpleFeatureSource;
-import org.geotools.feature.DefaultFeatureCollection;
 import org.heigit.ors.util.CSVUtility;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.MultiLineString;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKTReader;
-import org.opengis.feature.Property;
-import org.opengis.feature.simple.SimpleFeature;
 
 import java.io.File;
 import java.io.IOException;
@@ -181,7 +180,7 @@ private Map<Integer, TrafficPattern> readPatterns() {
      * @return A (Geo)JSON object representing the contents of the file
      */
     private SimpleFeatureCollection readHereGeometries() throws IOException {
-        SimpleFeatureCollection collection = new DefaultFeatureCollection();
+        SimpleFeatureCollection collection;
         try {
             File file = new File(streetGeometriesFile);
             FileDataStore store = FileDataStoreFinder.getDataStore(file);
diff --git a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLink.java b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLink.java
index 1453d62166..606438dd25 100644
--- a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLink.java
+++ b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLink.java
@@ -2,11 +2,11 @@
 
 import com.graphhopper.util.DistanceCalcEarth;
 import org.apache.log4j.Logger;
+import org.geotools.api.feature.Property;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.LineString;
-import org.opengis.feature.Property;
 
 import java.io.InvalidObjectException;
 import java.util.Collection;
diff --git a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLinkMetadata.java b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLinkMetadata.java
index ea8fe3f3fb..454149791b 100644
--- a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLinkMetadata.java
+++ b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/traffic/TrafficLinkMetadata.java
@@ -1,8 +1,8 @@
 package org.heigit.ors.routing.graphhopper.extensions.reader.traffic;
 
 import org.apache.log4j.Logger;
+import org.geotools.api.feature.Property;
 import org.heigit.ors.routing.graphhopper.extensions.TrafficRelevantWayType;
-import org.opengis.feature.Property;
 
 import java.util.Collection;
 
diff --git a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/storages/builders/HereTrafficGraphStorageBuilder.java b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/storages/builders/HereTrafficGraphStorageBuilder.java
index e37f4a439a..6e93061651 100644
--- a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/storages/builders/HereTrafficGraphStorageBuilder.java
+++ b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/storages/builders/HereTrafficGraphStorageBuilder.java
@@ -24,8 +24,13 @@
 import com.graphhopper.storage.GraphExtension;
 import com.graphhopper.util.EdgeIteratorState;
 import com.graphhopper.util.FetchMode;
-import me.tongfei.progressbar.*;
+import me.tongfei.progressbar.DelegatingProgressBarConsumer;
+import me.tongfei.progressbar.ProgressBar;
+import me.tongfei.progressbar.ProgressBarBuilder;
+import me.tongfei.progressbar.ProgressBarStyle;
 import org.apache.log4j.Logger;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeatureType;
 import org.geotools.data.DataUtilities;
 import org.geotools.feature.DefaultFeatureCollection;
 import org.geotools.feature.SchemaException;
@@ -47,8 +52,6 @@
 import org.locationtech.jts.geom.LineString;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKTReader;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/ors-engine/src/main/java/org/heigit/ors/util/GeomUtility.java b/ors-engine/src/main/java/org/heigit/ors/util/GeomUtility.java
index be0127b2db..ed3eb1a80a 100644
--- a/ors-engine/src/main/java/org/heigit/ors/util/GeomUtility.java
+++ b/ors-engine/src/main/java/org/heigit/ors/util/GeomUtility.java
@@ -17,17 +17,17 @@
 import com.graphhopper.util.DistanceCalcEarth;
 import com.graphhopper.util.PointList;
 import com.graphhopper.util.shapes.BBox;
+import org.geotools.api.geometry.MismatchedDimensionException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.NoSuchAuthorityCodeException;
+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.geotools.referencing.crs.DefaultGeographicCRS;
 import org.heigit.ors.exceptions.InternalServerException;
 import org.locationtech.jts.geom.*;
-import org.opengis.geometry.MismatchedDimensionException;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.NoSuchAuthorityCodeException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
 
 
 public class GeomUtility {
diff --git a/pom.xml b/pom.xml
index 9afb07c06e..a8727003cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,27 +46,36 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.timestamp>${maven.build.timestamp}</project.timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
-        <springdoc-openapi-starter.version>2.6.0</springdoc-openapi-starter.version>
-        <swagger-parser.version>2.1.22</swagger-parser.version>
-        <snakeyaml.version>2.2</snakeyaml.version>
-        <geotools.version>29.6</geotools.version>
+
         <!-- switch graphhopper versions to enable debugging -->
         <graphhopper.version>v4.9.1</graphhopper.version>
         <!--graphhopper.version>v4.9-SNAPSHOT</graphhopper.version-->
+        <springdoc-openapi-starter.version>2.6.0</springdoc-openapi-starter.version>
+        <swagger-parser.version>2.1.22</swagger-parser.version>
+        <snakeyaml.version>2.2</snakeyaml.version>
+        <geotools.version>31.2</geotools.version>
         <slf4j.version>2.0.13</slf4j.version>
         <log4j.version>2.22.1</log4j.version>
         <fasterxml.jackson.version>2.17.2</fasterxml.jackson.version>
         <commons-io.version>2.16.1</commons-io.version>
+        <commons-logging.version>1.3.3</commons-logging.version>
+        <commons-compress.version>1.26.2</commons-compress.version>
+        <commons-compiler.version>3.1.12</commons-compiler.version>
         <typesafe-config.version>1.4.1</typesafe-config.version>
         <jts.version>1.19.0</jts.version>
         <org-json.version>20240303</org-json.version>
         <postgresql.version>42.7.3</postgresql.version>
         <progressbar.version>0.10.0</progressbar.version>
+        <guava.version>33.2.1-jre</guava.version>
         <jline.version>3.26.3</jline.version>
         <jqwik.version>1.9.0</jqwik.version>
         <json-simple.version>1.1.1</json-simple.version>
         <jupiter.version>5.10.3</jupiter.version>
         <swagger-core.version>2.2.22</swagger-core.version>
+        <rest-assured.version>5.5.0</rest-assured.version>
+        <hamcrest.version>2.2</hamcrest.version>
+        <hppc.version>0.8.2</hppc.version>
+
         <sonar.projectKey>GIScience_openrouteservice</sonar.projectKey>
         <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
         <sonar.organization>giscience</sonar.organization>
@@ -165,7 +174,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>33.0.0-jre</version>
+                <version>${guava.version}</version>
             </dependency>
 
             <dependency>
@@ -246,6 +255,24 @@
                 <version>${commons-io.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${commons-logging.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>${commons-compress.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.codehaus.janino</groupId>
+                <artifactId>commons-compiler</artifactId>
+                <version>${commons-compiler.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jsr310</artifactId>
@@ -324,12 +351,6 @@
                 <version>${geotools.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.geotools</groupId>
-                <artifactId>gt-opengis</artifactId>
-                <version>${geotools.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.geotools</groupId>
                 <artifactId>gt-referencing</artifactId>
@@ -378,6 +399,44 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>rest-assured</artifactId>
+                <version>${rest-assured.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest</artifactId>
+                <version>${hamcrest.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.carrotsearch</groupId>
+                <artifactId>hppc</artifactId>
+                <version>${hppc.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${jupiter.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-params</artifactId>
+                <version>${jupiter.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${jupiter.version}</version>
+            </dependency>
+
+
         </dependencies>
     </dependencyManagement>
 

From 2162ca72440f75b3207b75149b981afc27913106 Mon Sep 17 00:00:00 2001
From: Takara Baumbach <takara.baumbach@heigit.org>
Date: Tue, 30 Jul 2024 18:16:09 +0200
Subject: [PATCH 2/2] chore: changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 878d74bc96..80e28f3458 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,8 +45,9 @@ RELEASING:
 ## [unreleased]
 
 ### Added
-- updated dependencies: spring, swagger, geotools etc. ([#1827](https://github.com/GIScience/openrouteservice/pull/1827))
 ### Changed
+- updated dependencies: guava, commons, rest-assured etc. ([#1831](https://github.com/GIScience/openrouteservice/pull/1831))
+- updated dependencies: spring, swagger, geotools etc. ([#1827](https://github.com/GIScience/openrouteservice/pull/1827))
 ### Deprecated
 ### Removed
 ### Fixed