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 2022/05/23 13:07:11 UTC
[tika] branch branch_1x updated (9a5afd26f -> a454caf5f)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
from 9a5afd26f TIKA-3770: update jackson
new 9e70418b7 TIKA-3770 -- general upgrades for 1.28.3
new fb721d6d8 Merge remote-tracking branch 'origin/branch_1x' into branch_1x
new a454caf5f TIKA-3770 -- general upgrades for 1.28.3
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-nlp/pom.xml | 2 +-
tika-parent/pom.xml | 1 -
tika-parsers/pom.xml | 4 ++--
tika-translate/pom.xml | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
[tika] 01/03: TIKA-3770 -- general upgrades for 1.28.3
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 9e70418b78c0b7c02ad112f143c40498da72f3f7
Author: tallison <ta...@apache.org>
AuthorDate: Wed May 18 10:10:27 2022 -0400
TIKA-3770 -- general upgrades for 1.28.3
---
tika-bundle/pom.xml | 4 ++--
tika-example/pom.xml | 2 +-
tika-nlp/pom.xml | 2 +-
tika-parent/pom.xml | 3 +--
tika-parsers/pom.xml | 6 +++---
tika-server/pom.xml | 2 +-
tika-translate/pom.xml | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 86b3dc991..8b962e273 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
- <version>1.6.0</version>
+ <version>1.6.1</version>
<scope>test</scope>
</dependency>
@@ -166,7 +166,7 @@
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
- <version>2.0.0</version>
+ <version>2.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index 8a0e5990d..21dd53c8f 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>5.3.19</version>
+ <version>5.3.20</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index ea1868a00..d1be8a351 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -203,7 +203,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 9d9994c98..68d8cde55 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -283,8 +283,7 @@
<cxf.version>3.5.2</cxf.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j2.version>2.17.2</log4j2.version>
- <jackson.version>2.13.2</jackson.version>
- <jackson.databind.version>2.13.2.2</jackson.databind.version>
+ <jackson.version>2.13.3</jackson.version>
<!-- when this is next upgraded, see if we can get rid of
javax.activation dependency in tika-server.
Until then, DO NOT go above 2.x unless you know what you're doing.
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index fdcb1d705..62c4c7e0b 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -170,7 +170,7 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
- <version>1.5.2-2</version>
+ <version>1.5.2-3</version>
<scope>provided</scope>
</dependency>
@@ -879,7 +879,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -900,7 +900,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index 25fb3f92d..76d3906cd 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -29,7 +29,7 @@
<url>http://tika.apache.org/</url>
<properties>
- <cxf.micrometer.version>1.8.5</cxf.micrometer.version>
+ <cxf.micrometer.version>1.9.0</cxf.micrometer.version>
<micrometer-extras.version>0.2.2</micrometer-extras.version>
</properties>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 79bbbb6cf..ee37f9bd9 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
</dependency>
<!-- Test dependencies -->
[tika] 03/03: TIKA-3770 -- general upgrades for 1.28.3
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit a454caf5f37e26f40a828ed9b235e1e7620c32fc
Author: tallison <ta...@apache.org>
AuthorDate: Mon May 23 09:07:00 2022 -0400
TIKA-3770 -- general upgrades for 1.28.3
---
tika-parsers/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 811732bfb..ad4d4cb92 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -50,7 +50,7 @@
<pdfbox.version>2.0.26</pdfbox.version>
<jempbox.version>1.8.16</jempbox.version>
<netcdf-java.version>4.5.5</netcdf-java.version>
- <sis.version>1.1</sis.version>
+ <sis.version>1.2</sis.version>
<parso.version>2.0.14</parso.version>
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
<bouncycastle.version>1.70</bouncycastle.version>
[tika] 02/03: Merge remote-tracking branch 'origin/branch_1x' into branch_1x
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit fb721d6d87d062b663a497531642da3544f01647
Merge: 9e70418b7 9a5afd26f
Author: tallison <ta...@apache.org>
AuthorDate: Mon May 23 08:59:09 2022 -0400
Merge remote-tracking branch 'origin/branch_1x' into branch_1x
# Conflicts:
# tika-parent/pom.xml
tika-bundle/pom.xml | 2 +-
tika-parent/pom.xml | 31 +-
tika-parsers/pom.xml | 7 +-
.../apache/tika/parser/mail/RFC822ParserTest.java | 1422 ++++++++++----------
4 files changed, 734 insertions(+), 728 deletions(-)