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:35 UTC
[tika] branch master updated (d71d71d -> 77153d5)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git.
from d71d71d bump spring to avoid vulnerable code: https://ossindex.sonatype.org/vuln/fe1be8c0-575d-49bc-906d-582e1dd589dd
new 6378e96 Upgrade to POI 4.1.2 (TIKA-3047).
new f0dffa9 Upgrade to PDFBox 2.0.19 (TIKA-3033).
new 77153d5 TIKA-2952 -- Upgrade metadata-extractor to 2.13.0
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:
CHANGES.txt | 6 +++++-
tika-bundle/pom.xml | 3 +++
tika-parent/pom.xml | 2 +-
tika-parsers/pom.xml | 12 ++++++++----
.../microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java | 2 +-
tika-xmp/pom.xml | 6 +++---
6 files changed, 21 insertions(+), 10 deletions(-)
[tika] 01/03: Upgrade to POI 4.1.2 (TIKA-3047).
Posted by ta...@apache.org.
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 6378e9617b66c4618d78651112c9b201ee5779f9
Author: tallison <ta...@apache.org>
AuthorDate: Mon Feb 24 11:56:45 2020 -0500
Upgrade to POI 4.1.2 (TIKA-3047).
---
CHANGES.txt | 1 +
tika-bundle/pom.xml | 1 +
tika-parent/pom.xml | 2 +-
.../tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index b80b750..c2b2f1e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 2.0.0 - ???
Other changes
Release 1.24 - ???
+ * 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 0710ea8..6d0d96a 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -255,6 +255,7 @@
com.sun.msv.datatype;resolution:=optional,
com.sun.msv.datatype.xsd;resolution:=optional,
com.sun.tools.javadoc;resolution:=optional,
+ com.zaxxer.sparsebits;resolution:=optional,
edu.mit.ll.mitie;resolution:=optional,
edu.stanford.nlp.*;resolution:=optional,
edu.wisc.ssec.mcidas;resolution:=optional,
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 1c7e41e..9b2815c 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -334,7 +334,7 @@
<maven.shade.version>3.2.1</maven.shade.version>
<rat.version>0.13</rat.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
- <poi.version>4.1.1</poi.version>
+ <poi.version>4.1.2</poi.version>
<commons.compress.version>1.19</commons.compress.version>
<commons.io.version>2.6</commons.io.version>
<commons.lang3.version>3.9</commons.lang3.version>
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java
index 6ed1be7..fe5d1de 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/xwpf/XWPFEventBasedWordExtractor.java
@@ -235,7 +235,7 @@ public class XWPFEventBasedWordExtractor extends POIXMLTextExtractor {
}
return new XWPFNumbering(numberingPart);
}
- } catch (IOException | OpenXML4JException e) {
+ } catch (OpenXML4JException e) {
LOG.warn("Couldn't load numbering", e);
}
return null;
[tika] 03/03: TIKA-2952 -- Upgrade metadata-extractor to 2.13.0
Posted by ta...@apache.org.
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>
[tika] 02/03: Upgrade to PDFBox 2.0.19 (TIKA-3033).
Posted by ta...@apache.org.
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 f0dffa9b6420d5dbfda219ebfcd7413ab0068ac3
Author: tallison <ta...@apache.org>
AuthorDate: Mon Feb 24 12:00:56 2020 -0500
Upgrade to PDFBox 2.0.19 (TIKA-3033).
---
CHANGES.txt | 2 +-
tika-parsers/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index c2b2f1e..ef4cf2d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,7 +15,7 @@ Release 1.24 - ???
* Extract inline images that rely on the DCT filter from PDFs (TIKA-3041).
- * Upgrade to PDFBox 2.0.18 (TIKA-3021).
+ * Upgrade to PDFBox 2.0.19 (TIKA-3033).
* Fix bug in ASM parser configuration (TIKA-2992).
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 5468449..ee11821 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -43,7 +43,7 @@
<brotli.version>0.1.2</brotli.version>
<mime4j.version>0.8.3</mime4j.version>
<vorbis.version>0.8</vorbis.version>
- <pdfbox.version>2.0.18</pdfbox.version>
+ <pdfbox.version>2.0.19</pdfbox.version>
<jempbox.version>1.8.16</jempbox.version>
<netcdf-java.version>4.5.5</netcdf-java.version>
<sis.version>1.0</sis.version>
@@ -880,7 +880,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>jbig2-imageio</artifactId>
- <version>3.0.2</version>
+ <version>3.0.3</version>
</dependency>
<!-- jai-imageio-core is allowed since LEGAL-304 -->