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:17 UTC
[tika] 02/03: TIKA-3502 general upgrades for 2.0.1
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 />