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 2020/02/24 17:20:38 UTC
[tika] 03/03: TIKA-2952 -- Upgrade metadata-extractor to 2.13.0
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 77153d585cdb1e6ba8a5df125a923020c4b9eb28
Author: tallison <ta...@apache.org>
AuthorDate: Mon Feb 24 12:20:08 2020 -0500
TIKA-2952 -- Upgrade metadata-extractor to 2.13.0
---
CHANGES.txt | 3 +++
tika-bundle/pom.xml | 2 ++
tika-parsers/pom.xml | 8 ++++++--
tika-xmp/pom.xml | 6 +++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index ef4cf2d..798529a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ Release 2.0.0 - ???
Other changes
Release 1.24 - ???
+
+ * Upgrade metadata-extractor to 2.13.0 (TIKA-2952).
+
* Upgrade to POI 4.1.2 (TIKA-3047).
* Extract XMP from PSD files (TIKA-3050).
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 6d0d96a..c5e7844 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -236,6 +236,8 @@
org.apache.tika.fork,
android.util;resolution:=optional,
com.adobe.xmp;resolution:=optional,
+ com.adobe.xmp.impl;resolution:=optional,
+ com.adobe.xmp.options;resolution:=optional,
com.adobe.xmp.properties;resolution:=optional,
com.github.luben.zstd;resolution:=optional,
com.github.openjson;resolution:=optional,
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index ee11821..3a1a6c3 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -313,10 +313,14 @@
<artifactId>isoparser</artifactId>
<version>1.1.22</version>
</dependency>
+ <!-- this is a fork of com.drewnoakes
+ metadata extractor that shade/relocates com.adobe.internal
+ to com.adobe for backwards compatibility
+ -->
<dependency>
- <groupId>com.drewnoakes</groupId>
+ <groupId>org.tallison</groupId>
<artifactId>metadata-extractor</artifactId>
- <version>2.11.0</version>
+ <version>2.13.0</version>
</dependency>
<dependency>
<groupId>de.l3s.boilerpipe</groupId>
diff --git a/tika-xmp/pom.xml b/tika-xmp/pom.xml
index 3067af3..7bdfe64 100644
--- a/tika-xmp/pom.xml
+++ b/tika-xmp/pom.xml
@@ -90,9 +90,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.adobe.xmp</groupId>
- <artifactId>xmpcore</artifactId>
- <version>5.1.3</version>
+ <groupId>org.tallison.xmp</groupId>
+ <artifactId>xmpcore-shaded</artifactId>
+ <version>6.1.10</version>
</dependency>
<dependency>
<groupId>junit</groupId>