This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-12041-for-1.22 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 3009a54d3c2bc01a1fe24f70fcf392fb904ac3ba Author: Julian Reschke <[email protected]> AuthorDate: Thu Feb 19 14:26:16 2026 +0100 OAK-12041 - bump testcontainers to v1.21.4 --- oak-parent/pom.xml | 2 +- .../org/apache/jackrabbit/oak/plugins/document/MongoUtils.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 0b3042ff32..1ec34360fa 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -69,7 +69,7 @@ <guava.osgi.import>com.google.common.*;version="[15.0,20)"</guava.osgi.import> <derby.version>10.14.2.0</derby.version> <jackson.version>2.16.2</jackson.version> - <testcontainers.version>1.19.7</testcontainers.version> + <testcontainers.version>1.21.4</testcontainers.version> <groovy.version>2.5.23</groovy.version> <netty.version>4.1.131.Final</netty.version> <aws.sdk.version>2.34.1</aws.sdk.version> diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java index 3178590eab..ee79d838fc 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoUtils.java @@ -55,6 +55,7 @@ public class MongoUtils { public static final String URL = createMongoURL(); + // return private static String createMongoURL() { // first try configured URL String mongoUrl = System.getProperty("mongo.url"); @@ -62,11 +63,15 @@ public class MongoUtils { mongoUrl = "mongodb://" + HOST + ":" + PORT + "/" + DB + "?" + OPTIONS; } // check if we can connect + LOG.info("Checking MongoDB URL: {}", mongoUrl); MongoConnection c = getConnectionByURL(mongoUrl); if (c != null) { c.close(); + LOG.info("Successfully checked MongoDB URL: {}", mongoUrl); return mongoUrl; } + LOG.warn("Check failed for MongoDB URL: {}", mongoUrl); + // fallback to docker based MongoDB if available MongoDockerRule dockerRule = new MongoDockerRule(); if (MongoDockerRule.isDockerAvailable()) { @@ -78,11 +83,16 @@ public class MongoUtils { port.set(dockerRule.getPort()); } }, Description.EMPTY).evaluate(); + LOG.info("Docker is available on port: {}", port.get()); mongoUrl = "mongodb://localhost:" + port.get() + "/" + DB + "?" + OPTIONS; + LOG.info("Falling back to Docker based MongoDB URL {}", mongoUrl); } catch (Throwable t) { LOG.warn("Unable to get MongoDB port from Docker", t); } + } else { + LOG.info("Docker image is not available"); } + return mongoUrl; }
