This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 3f15e82bb4 TIKA-4615 -- rm junit 4 and update testcontainers (#2517)
3f15e82bb4 is described below
commit 3f15e82bb40183d576bcfbae62e9ba6d955b7fab
Author: Tim Allison <[email protected]>
AuthorDate: Thu Jan 8 19:28:54 2026 -0500
TIKA-4615 -- rm junit 4 and update testcontainers (#2517)
---
tika-bundles/tika-bundle-standard/pom.xml | 1 -
tika-e2e-tests/pom.xml | 2 +-
tika-e2e-tests/tika-grpc/pom.xml | 2 +-
.../tika-pipes-kafka-integration-tests/pom.xml | 4 ++--
.../pom.xml | 2 +-
.../tika-pipes-s3-integration-tests/pom.xml | 2 +-
.../tika-pipes-solr-integration-tests/pom.xml | 2 +-
tika-parent/pom.xml | 24 ++++++++--------------
8 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/tika-bundles/tika-bundle-standard/pom.xml
b/tika-bundles/tika-bundle-standard/pom.xml
index cb34aab4c8..711f0db01c 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -40,7 +40,6 @@
from the tika-parsers component.
</description>
<url>https://tika.apache.org/</url>
- <!-- pax doesn't yet work with junit4; checkstyle forbids junit4. -->
<properties>
<checkstyle.skip>true</checkstyle.skip>
</properties>
diff --git a/tika-e2e-tests/pom.xml b/tika-e2e-tests/pom.xml
index 54f06c403f..4f21daee6b 100644
--- a/tika-e2e-tests/pom.xml
+++ b/tika-e2e-tests/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tika-e2e-tests/tika-grpc/pom.xml b/tika-e2e-tests/tika-grpc/pom.xml
index 7148c37b84..85ba1e5404 100644
--- a/tika-e2e-tests/tika-grpc/pom.xml
+++ b/tika-e2e-tests/tika-grpc/pom.xml
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
diff --git a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
index deff5b9be3..07bc148130 100644
--- a/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-kafka-integration-tests/pom.xml
@@ -36,12 +36,12 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
+ <artifactId>testcontainers-kafka</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
index 3172aabd39..5b8ffc0e08 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/pom.xml
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
index a4b6c43801..ed40e08366 100644
--- a/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-s3-integration-tests/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
index 7288da1197..4d585f4e49 100644
--- a/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
+++ b/tika-integration-tests/tika-pipes-solr-integration-tests/pom.xml
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index f0be342562..6402b53238 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -398,8 +398,7 @@
<json.simple.version>1.1.1</json.simple.version>
<jsoup.version>1.22.1</jsoup.version>
<jsr305.version>3.0.2</jsr305.version>
- <junit4.version>4.13.2</junit4.version>
- <junit5.version>6.1.0-M1</junit5.version>
+ <junit6.version>6.1.0-M1</junit6.version>
<juniversalchardet.version>2.5.0</juniversalchardet.version>
<junrar.version>7.5.7</junrar.version>
<jwarc.version>0.33.0</jwarc.version>
@@ -442,7 +441,6 @@
<sqlite.version>3.51.1.0</sqlite.version>
<stax.ex.version>2.1.0</stax.ex.version>
<testcontainers.version>2.0.3</testcontainers.version>
- <testcontainersv1.version>1.21.4</testcontainersv1.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parent -->
<tukaani.version>1.11</tukaani.version>
<twelvemonkeys.version>3.13.0</twelvemonkeys.version>
@@ -547,7 +545,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
- <version>${junit5.version}</version>
+ <version>${junit6.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -591,16 +589,15 @@
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
- <!-- missing in testcontainers-bom 2.* -->
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${testcontainersv1.version}</version>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
+ <version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
- <version>${testcontainersv1.version}</version>
+ <artifactId>testcontainers-kafka</artifactId>
+ <version>${testcontainers.version}</version>
</dependency>
<dependency>
@@ -828,20 +825,15 @@
<artifactId>joda-time</artifactId>
<version>2.14.0</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit4.version}</version>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>${junit5.version}</version>
+ <version>${junit6.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>${junit5.version}</version>
+ <version>${junit6.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
