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 2018/03/28 16:43:16 UTC
[tika] branch branch_1x updated: fix cherry-pick conflict
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
The following commit(s) were added to refs/heads/branch_1x by this push:
new 029715d fix cherry-pick conflict
029715d is described below
commit 029715d334ee8a53b703d0cc8a5b884c42c6c142
Author: tballison <ta...@mitre.org>
AuthorDate: Wed Mar 28 10:25:22 2018 -0400
fix cherry-pick conflict
---
tika-parsers/pom.xml | 16 +++++-----------
.../java/org/apache/tika/parser/image/ImageParser.java | 10 ++++------
.../main/java/org/apache/tika/parser/pdf/PDFParser.java | 7 -------
3 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 053a216..a3e9e4d 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -42,7 +42,7 @@
<tukaani.version>1.8</tukaani.version>
<mime4j.version>0.8.1</mime4j.version>
<vorbis.version>0.8</vorbis.version>
- <pdfbox.version>2.0.8</pdfbox.version>
+ <pdfbox.version>2.0.9</pdfbox.version>
<jempbox.version>1.8.13</jempbox.version>
<netcdf-java.version>4.5.5</netcdf-java.version>
<sis.version>0.8</sis.version>
@@ -678,18 +678,12 @@
<artifactId>jackson-core</artifactId>
<version>2.9.4</version>
</dependency>
-
- <!-- Java ImageIO plugin for JBIG2 support (often used in PDF)
- This jbig2 dep is not distributed with Tika due to licensing
- issue (GPLV3). That's why it is included here as "test".
- https://github.com/levigo/jbig2-imageio
- -->
<dependency>
- <groupId>com.levigo.jbig2</groupId>
- <artifactId>levigo-jbig2-imageio</artifactId>
- <version>1.6.5</version>
- <scope>test</scope>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>jbig2-imageio</artifactId>
+ <version>3.0.0</version>
</dependency>
+
<!-- jai-imageio-core is allowed since LEGAL-304 -->
<dependency>
<groupId>com.github.jai-imageio</groupId>
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
index c9d8def..dd96690 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/image/ImageParser.java
@@ -66,12 +66,10 @@ public class ImageParser extends AbstractParser {
MediaType.image("png"),
MediaType.image("vnd.wap.wbmp"),
MediaType.image("x-icon"),
- MediaType.image("x-xcf")));
- try {
- Class.forName("com.levigo.jbig2.JBIG2ImageReader");
- TMP_SUPPORTED.add(MediaType.image("x-jbig2"));
- } catch (ClassNotFoundException e) {
- }
+ MediaType.image("x-xcf"),
+ MediaType.image("x-jbig2")));
+ //add try/catch class.forName() for image types relying on
+ //provided dependencies
}
private static final Set<MediaType> SUPPORTED_TYPES =
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
index 4d5202d..b69274e 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/pdf/PDFParser.java
@@ -767,13 +767,6 @@ public class PDFParser extends AbstractParser implements Initializable {
}
StringBuilder sb = new StringBuilder();
try {
- Class.forName("com.levigo.jbig2.JBIG2ImageReader");
- } catch (ClassNotFoundException e) {
- sb.append("JBIG2ImageReader not loaded. jbig2 files will be ignored\n");
- sb.append("See https://pdfbox.apache.org/2.0/dependencies.html#jai-image-io\n");
- sb.append("for optional dependencies.\n");
- }
- try {
Class.forName("com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriter");
} catch (ClassNotFoundException e) {
sb.append("TIFFImageWriter not loaded. tiff files will not be processed\n");
--
To stop receiving notification emails like this one, please contact
tallison@apache.org.