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:15 UTC
[tika] branch main updated (9a6dbed -> 35ecfdc)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 9a6dbed TIKA-3502: update commons-io and spring
new 4cf71e3 TIKA-3499 push junit-vintage-engine into the modules that have not yet been migrated to junit5 for easier module-wise migration.
new bb0fbe6 TIKA-3502 general upgrades for 2.0.1
new 35ecfdc Merge remote-tracking branch 'origin/main' into main
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tika-app/pom.xml | 8 +++++++-
tika-batch/pom.xml | 13 +------------
tika-bundles/pom.xml | 9 +++++++++
tika-bundles/tika-bundle-standard/pom.xml | 6 ------
tika-core/pom.xml | 3 +--
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 | 30 ++++++++++++++----------------
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 +++++++
17 files changed, 115 insertions(+), 40 deletions(-)
[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.
Posted by ta...@apache.org.
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>
[tika] 03/03: Merge remote-tracking branch 'origin/main' into main
Posted by ta...@apache.org.
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 35ecfdca91b5df9c46d23177156c2a634bd72a8e
Merge: bb0fbe6 9a6dbed
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 11:03:05 2021 -0400
Merge remote-tracking branch 'origin/main' into main
tika-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc tika-parent/pom.xml
index a0aa307,0b912cf..e28501c
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@@ -355,9 -350,9 +355,9 @@@
<rome.version>1.16.0</rome.version>
<sis.version>1.0</sis.version>
<!-- we'll need to stay on 1.7 until we're java modularized ? -->
- <slf4j.version>1.7.31</slf4j.version>
+ <slf4j.version>1.7.32</slf4j.version>
<solrj.version>8.9.0</solrj.version>
- <spring.version>5.3.8</spring.version>
+ <spring.version>5.3.9</spring.version>
<sqlite.version>3.36.0.1</sqlite.version>
<tagsoup.version>1.2.1</tagsoup.version>
<test.containers.version>1.15.2</test.containers.version>
[tika] 02/03: TIKA-3502 general upgrades for 2.0.1
Posted by ta...@apache.org.
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 bb0fbe6399abeb0a8bb9752b5f9f392b8c81c44e
Author: tallison <ta...@apache.org>
AuthorDate: Wed Jul 28 11:02:50 2021 -0400
TIKA-3502 general upgrades for 2.0.1
---
tika-bundles/tika-bundle-standard/pom.xml | 6 ------
tika-core/pom.xml | 3 +--
tika-parent/pom.xml | 25 +++++++++++++++----------
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index c9225b0..ce144a9 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -41,12 +41,6 @@
</description>
<url>https://tika.apache.org/</url>
- <properties>
- <!-- some conflict with slf4j with 4.12.0
- causes failure in testForkParser -->
- <pax.exam.version>4.11.0</pax.exam.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tika-core/pom.xml b/tika-core/pom.xml
index 571d73a..cb457e2 100644
--- a/tika-core/pom.xml
+++ b/tika-core/pom.xml
@@ -74,11 +74,10 @@
<version>${guava.version}</version>
<scope>test</scope>
</dependency>
- <!-- versions > 0.4.0 require java > 8 -->
<dependency>
<groupId>com.martensigwart</groupId>
<artifactId>fakeload</artifactId>
- <version>0.4.0</version>
+ <version>${fakeload.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index dfab532..a0aa307 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version> <!-- fails with 22 and 23 in tika-eval-core -->
+ <version>24</version> <!-- fails with 22 and 23 in tika-eval-core -->
<relativePath />
</parent>
@@ -259,16 +259,16 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
<!-- plugin versions -->
<checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
<forbiddenapis.version>3.1</forbiddenapis.version>
<groovy.maven.version>2.1.1</groovy.maven.version>
<maven.antrun.version>1.8</maven.antrun.version>
<maven.assembly.version>3.3.0</maven.assembly.version>
- <maven.bundle.version>5.1.1</maven.bundle.version>
+ <maven.bundle.version>5.1.2</maven.bundle.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
- <maven.failsafe.version>2.22.2</maven.failsafe.version>
+ <maven.failsafe.version>3.0.0-M5</maven.failsafe.version>
<maven.javadoc.version>3.2.0</maven.javadoc.version>
<maven.jar.version>3.2.0</maven.jar.version>
<maven.scr.version>1.26.4</maven.scr.version>
@@ -278,8 +278,8 @@
<rat.version>0.13</rat.version>
<!-- dependency versions -->
- <aws.s3.version>1.12.22</aws.s3.version>
- <aws.transcribe.version>1.12.22</aws.transcribe.version>
+ <aws.s3.version>1.12.34</aws.s3.version>
+ <aws.transcribe.version>1.12.34</aws.transcribe.version>
<asm.version>9.2</asm.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
@@ -292,7 +292,7 @@
<commons.compress.version>1.21</commons.compress.version>
<commons.csv.version>1.8</commons.csv.version>
<commons.exec.version>1.3</commons.exec.version>
- <commons.io.version>2.10.0</commons.io.version>
+ <commons.io.version>2.11.0</commons.io.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.math3.version>3.6.1</commons.math3.version>
@@ -300,6 +300,8 @@
<cxf.version>3.4.4</cxf.version>
<ddplist.version>1.23</ddplist.version>
<dl4j.version>1.0.0-beta6</dl4j.version>
+ <!-- fakeload versions > 0.4.0 require java > 8 -->
+ <fakeload.version>0.4.0</fakeload.version>
<geoapi.version>3.0.1</geoapi.version>
<gson.version>2.8.7</gson.version>
<guava.version>30.1.1-jre</guava.version>
@@ -343,6 +345,9 @@
<optimaize.version>0.6</optimaize.version>
<osgi.core.version>6.0.0</osgi.core.version>
<parso.version>2.0.14</parso.version>
+ <!-- some conflict with slf4j with >= 4.12.0
+ causes failure in testForkParser -->
+ <pax.exam.version>4.11.0</pax.exam.version>
<pdfbox.version>2.0.24</pdfbox.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
<poi.version>4.1.2</poi.version>
@@ -350,7 +355,7 @@
<rome.version>1.16.0</rome.version>
<sis.version>1.0</sis.version>
<!-- we'll need to stay on 1.7 until we're java modularized ? -->
- <slf4j.version>1.7.31</slf4j.version>
+ <slf4j.version>1.7.32</slf4j.version>
<solrj.version>8.9.0</solrj.version>
<spring.version>5.3.8</spring.version>
<sqlite.version>3.36.0.1</sqlite.version>
@@ -364,7 +369,7 @@
<vorbis.version>0.8</vorbis.version>
<xerces.version>2.12.1</xerces.version>
<xmpcore.version>6.1.11</xmpcore.version>
- <zstd.version>1.5.0-2</zstd.version>
+ <zstd.version>1.5.0-4</zstd.version>
</properties>
<dependencies>
@@ -565,7 +570,7 @@
<version>3.0.0-M3</version>
<executions>
<execution>
- <id>enforce</id>
+ <id>enforce-maven</id>
<configuration>
<rules>
<dependencyConvergence />