diff --git a/pom.xml b/pom.xml index aabb1bc0e..446827770 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.scireum sirius-parent - 11.2.0 + 11.5.0 sirius-db DEVELOPMENT-SNAPSHOT @@ -19,7 +19,7 @@ http://www.sirius-lib.net - dev-40.0.0 + dev-42.0.0 @@ -45,12 +45,12 @@ org.apache.commons commons-dbcp2 - 2.9.0 + 2.11.0 org.mongodb mongodb-driver-sync - 4.7.1 + 4.11.1 redis.clients @@ -67,19 +67,12 @@ org.elasticsearch.client elasticsearch-rest-client - 8.4.1 + 8.11.2 - - - org.apache.httpcomponents - httpclient - 4.5.13 - - org.mariadb.jdbc mariadb-java-client - 3.0.6 + 3.3.1 test diff --git a/src/main/java/sirius/db/jdbc/Database.java b/src/main/java/sirius/db/jdbc/Database.java index 0214a5ae5..9b153e5fe 100644 --- a/src/main/java/sirius/db/jdbc/Database.java +++ b/src/main/java/sirius/db/jdbc/Database.java @@ -353,7 +353,7 @@ private void initialize() { ds.setMaxIdle(maxIdle); ds.setTestOnBorrow(testOnBorrow); ds.setValidationQuery(validationQuery); - ds.setMaxWaitMillis(1000); + ds.setMaxWait(Duration.ofSeconds(1)); } } diff --git a/src/test/kotlin/sirius/db/testutil/MongoMocks.kt b/src/test/kotlin/sirius/db/testutil/MongoMocks.kt index 47ed42f65..1a40414d8 100644 --- a/src/test/kotlin/sirius/db/testutil/MongoMocks.kt +++ b/src/test/kotlin/sirius/db/testutil/MongoMocks.kt @@ -19,9 +19,6 @@ import sirius.db.mongo.types.MongoRef class MongoMocks { companion object { /** - * Wrap an entity as a MongoRef - * @param entity which is to be wrapped - */ /** * Wrap an entity as a MongoRef * @param entity which is to be wrapped */