#1650 update dependencies

eclipse-ditto · Jun 24, 2024 · 49b206e · 49b206e
1 parent cc94005
commit 49b206e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -36,8 +36,8 @@
 
         <!-- ### Compile dependencies versions -->
         <minimal-json.version>0.9.5</minimal-json.version>
-        <jackson-bom.version>2.16.1</jackson-bom.version>
-        <json-schema-validator.version>1.4.0</json-schema-validator.version>
+        <jackson-bom.version>2.17.1</jackson-bom.version>
+        <json-schema-validator.version>1.4.2</json-schema-validator.version>
         <typesafe-config.version>1.4.3</typesafe-config.version>
         <ssl-config-core.version>0.6.1</ssl-config-core.version>
         <kafka-client.version>3.6.1</kafka-client.version>
@@ -60,7 +60,7 @@
         <!-- Keep these version consistent with pekko-persistence-mongodb.version's build.sbt -->
         <mongo-java-driver.version>5.1.1</mongo-java-driver.version>
 
-        <jjwt.version>0.12.5</jjwt.version>
+        <jjwt.version>0.12.6</jjwt.version>
         <asm.version>9.2</asm.version>
         <qpid-jms-client.version>1.11.0</qpid-jms-client.version>
         <pjfanning-pekko-rabbitmq.version>7.0.0</pjfanning-pekko-rabbitmq.version>

diff --git a/...ils/test/src/test/java/org/eclipse/ditto/internal/utils/test/docker/ContainerFactory.java b/...ils/test/src/test/java/org/eclipse/ditto/internal/utils/test/docker/ContainerFactory.java
@@ -15,6 +15,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -49,7 +50,8 @@ public abstract class ContainerFactory implements Closeable {
     protected ContainerFactory(final String imageIdentifier, final int... ports) {
         this.imageIdentifier = imageIdentifier;
         this.ports = ports;
-        final String dockerHost = OsDetector.isWindows() ? WINDOWS_DOCKER_HOST : UNIX_DOCKER_HOST;
+        final String dockerHost = Objects.requireNonNullElseGet(System.getenv("DOCKER_HOST"),
+                () -> OsDetector.isWindows() ? WINDOWS_DOCKER_HOST : UNIX_DOCKER_HOST);
         LOGGER.info("Connecting to docker daemon on <{}>.", dockerHost);
         final DefaultDockerClientConfig config =
                 DefaultDockerClientConfig.createDefaultConfigBuilder().withDockerHost(dockerHost).build();

diff --git a/policies/service/pom.xml b/policies/service/pom.xml
@@ -140,19 +140,12 @@
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-pekko</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-base-model</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-base-service</artifactId>

diff --git a/wot/validation/src/main/java/org/eclipse/ditto/wot/validation/JsonSchemaTools.java b/wot/validation/src/main/java/org/eclipse/ditto/wot/validation/JsonSchemaTools.java
@@ -62,8 +62,9 @@ final class JsonSchemaTools {
         final var cborFactoryLoader = CborFactoryLoader.getInstance();
         cborFactory = cborFactoryLoader.getCborFactoryOrThrow();
         jacksonCborMapper = new CBORMapper();
-        schemaValidatorsConfig = new SchemaValidatorsConfig();
-        schemaValidatorsConfig.setPathType(PathType.JSON_POINTER);
+        schemaValidatorsConfig = SchemaValidatorsConfig.builder()
+                .pathType(PathType.JSON_POINTER)
+                .build();
     }
 
     JsonSchema extractFromSingleDataSchema(final SingleDataSchema dataSchema,