This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/branch_3x by this push:
new 1ce686bb8 TIKA-4488: update testcontainers to v2
1ce686bb8 is described below
commit 1ce686bb89ce354f2dd8e4be1281cc1c1f58086e
Author: Tilman Hausherr <[email protected]>
AuthorDate: Sat Oct 18 17:51:06 2025 +0200
TIKA-4488: update testcontainers to v2
---
.../apache/tika/pipes/s3/tests/S3PipeIntegrationTest.java | 4 ++--
tika-parent/pom.xml | 14 +++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git
a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/S3PipeIntegrationTest.java
b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/S3PipeIntegrationTest.java
index 6ed4e24b5..6cd221f9a 100644
---
a/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/S3PipeIntegrationTest.java
+++
b/tika-integration-tests/tika-pipes-s3-integration-tests/src/test/java/org/apache/tika/pipes/s3/tests/S3PipeIntegrationTest.java
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.ComposeContainer;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.shaded.org.hamcrest.MatcherAssert;
import org.testcontainers.shaded.org.hamcrest.Matchers;
@@ -63,7 +63,7 @@ class S3PipeIntegrationTest {
private static final Logger LOG =
LoggerFactory.getLogger(S3PipeIntegrationTest.class);
public static final int MAX_STARTUP_TIMEOUT = 120;
- private static final DockerComposeContainer<?> minioContainer = new
DockerComposeContainer<>(
+ private static final ComposeContainer minioContainer = new
ComposeContainer(
new
File("src/test/resources/docker-compose.yml")).withStartupTimeout(
Duration.of(MAX_STARTUP_TIMEOUT, ChronoUnit.SECONDS))
.withExposedService("minio-service", 9000);
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 8f80725b7..dcca63afc 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -439,7 +439,8 @@
<spring.version>5.3.39</spring.version>
<sqlite.version>3.50.3.0</sqlite.version>
<stax.ex.version>2.1.0</stax.ex.version>
- <testcontainers.version>1.21.3</testcontainers.version>
+ <testcontainers.version>2.0.1</testcontainers.version>
+ <testcontainersv1.version>1.21.3</testcontainersv1.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parent -->
<tukaani.version>1.10</tukaani.version>
<twelvemonkeys.version>3.12.0</twelvemonkeys.version>
@@ -557,6 +558,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <!-- missing in testcontainers-bom 2.* -->
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${testcontainersv1.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>kafka</artifactId>
+ <version>${testcontainersv1.version}</version>
+ </dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
