This is an automated email from the ASF dual-hosted git repository. joscorbe pushed a commit to branch rc-1.72 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1e465c0ba8b8e68dbf9c85cfcac120c353d9cbf2 Author: Jose Cordero <corde...@adobe.com> AuthorDate: Sun Nov 10 14:19:54 2024 +0100 Revert "OAK-11259: bump testcontainers to v1.20.3 / toxiproxy v2.11.0 (#1857)" This reverts commit ced612c200d33fd41cc699819f0164bbaba48d4b. --- oak-parent/pom.xml | 2 +- .../document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java | 2 +- .../jackrabbit/oak/plugins/index/elastic/ElasticReliabilityTest.java | 2 +- .../oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml index 125f268413..333545e6bf 100644 --- a/oak-parent/pom.xml +++ b/oak-parent/pom.xml @@ -66,7 +66,7 @@ <tika.version>1.28.5</tika.version> <derby.version>10.15.2.0</derby.version> <jackson.version>2.17.2</jackson.version> - <testcontainers.version>1.20.3</testcontainers.version> + <testcontainers.version>1.20.1</testcontainers.version> <pax-exam.version>4.13.1</pax-exam.version> <groovy.version>3.0.22</groovy.version> <!-- determines the bytecode version (i.e. the minimum JRE required to run the build artifact) --> diff --git a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java index b0eab4972b..9e0a554d2f 100644 --- a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java +++ b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedMongoConnectionFailureIT.java @@ -72,7 +72,7 @@ import static org.apache.jackrabbit.oak.index.indexer.document.flatfile.pipeline public class PipelinedMongoConnectionFailureIT { private static final Logger LOG = LoggerFactory.getLogger(PipelinedMongoConnectionFailureIT.class); - private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.11.0"); + private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.9.0"); // We cannot use the MongoDockerRule/MongoConnectionFactory because they don't allow customizing the docker network // used to launch the Mongo container. private static final int MONGODB_DEFAULT_PORT = 27017; diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilityTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilityTest.java index 714734af79..b6b66b8893 100644 --- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilityTest.java +++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilityTest.java @@ -49,7 +49,7 @@ public class ElasticReliabilityTest extends ElasticAbstractQueryTest { @Rule public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.11.0"); + private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.9.0"); private ToxiproxyContainer toxiproxy; diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java index d8b5477070..8807dc90ef 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/LeaseUpdateSocketTimeoutIT.java @@ -53,7 +53,7 @@ import static org.junit.Assume.assumeTrue; public class LeaseUpdateSocketTimeoutIT { - private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.11.0"); + private static final DockerImageName TOXIPROXY_IMAGE = DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.9.0"); private static final int MONGODB_DEFAULT_PORT = 27017;