You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/07/28 15:03:16 UTC
[tika] 01/03: TIKA-3499 push junit-vintage-engine into the modules
that have not yet been migrated to junit5 for easier module-wise migration.
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
commit 4cf71e3f5afbf512ac54270efba084ff05a6c202
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 09:34:57 2021 -0400
TIKA-3499 push junit-vintage-engine into the modules that have not yet been migrated to junit5 for easier module-wise migration.
---
tika-app/pom.xml | 8 +++++++-
tika-batch/pom.xml | 13 +------------
tika-bundles/pom.xml | 9 +++++++++
tika-eval/pom.xml | 9 +++++++++
tika-example/pom.xml | 8 +++++++-
tika-fuzzing/pom.xml | 7 +++++++
tika-integration-tests/pom.xml | 7 +++++++
tika-java7/pom.xml | 7 +++++++
tika-langdetect/pom.xml | 7 +++++++
tika-parent/pom.xml | 7 -------
tika-pipes/pom.xml | 9 +++++++++
tika-serialization/pom.xml | 8 +++++++-
tika-server/pom.xml | 10 +++++++++-
tika-translate/pom.xml | 7 +++++++
tika-xmp/pom.xml | 7 +++++++
15 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/tika-app/pom.xml b/tika-app/pom.xml
index a6cf171..8b25e8f 100644
--- a/tika-app/pom.xml
+++ b/tika-app/pom.xml
@@ -84,7 +84,13 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
-
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml
index bfc1008..e7b51f1 100644
--- a/tika-batch/pom.xml
+++ b/tika-batch/pom.xml
@@ -64,18 +64,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
diff --git a/tika-bundles/pom.xml b/tika-bundles/pom.xml
index eb87885..8640396 100644
--- a/tika-bundles/pom.xml
+++ b/tika-bundles/pom.xml
@@ -35,4 +35,13 @@
<modules>
<module>tika-bundle-standard</module>
</modules>
+ <dependencies>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 15c1ea6..bcc54ae 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -38,6 +38,15 @@
<module>tika-eval-app</module>
</modules>
+ <dependencies>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index 5a6e90a..89d1360 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -160,7 +160,13 @@
</exclusion>
</exclusions>
</dependency>
-
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<description>This module contains examples of how to use Apache Tika.</description>
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index ee5d28f..d38c337 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -79,5 +79,12 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/tika-integration-tests/pom.xml b/tika-integration-tests/pom.xml
index 6caba1d..d8a5e97 100644
--- a/tika-integration-tests/pom.xml
+++ b/tika-integration-tests/pom.xml
@@ -55,5 +55,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/tika-java7/pom.xml b/tika-java7/pom.xml
index dbd6b71..2d88b21 100644
--- a/tika-java7/pom.xml
+++ b/tika-java7/pom.xml
@@ -91,6 +91,13 @@
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<description>Java-7 reliant components, including FileTypeDetector implementations</description>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index 903a6fd..9b9aee0 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -47,6 +47,13 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 12fd55f..dfab532 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -380,13 +380,6 @@
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index 6f3bc52..3bb13ea 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -36,6 +36,15 @@
<module>tika-pipes-iterators</module>
</modules>
+ <dependencies>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
diff --git a/tika-serialization/pom.xml b/tika-serialization/pom.xml
index 885cddb..f530be6 100644
--- a/tika-serialization/pom.xml
+++ b/tika-serialization/pom.xml
@@ -62,7 +62,13 @@
<version>${jackson.version}</version>
</dependency>
-
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 4059b40..2579ee6 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -33,6 +33,15 @@
<name>Apache Tika server module</name>
<url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <dependencies>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -66,6 +75,5 @@
</executions>
</plugin>
</plugins>
-
</build>
</project>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 82a699d..cba3ed7 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -118,6 +118,13 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index 0bb8dcf..c6b4002 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -99,6 +99,13 @@
<artifactId>xmpcore</artifactId>
<version>${xmpcore.version}</version>
</dependency>
+ <!-- after we migrate everything to junit5, we can get rid of this -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit5.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<description>Converts Tika metadata to XMP</description>