TIKA-1285 -- upgrade to PDFBox 2.0.0

Author: tballison

CHANGES.txt

@@ -1,5 +1,11 @@
 Release 1.13 - ???
 
+  * Upgrade to PDFBox 2.0.0 (TIKA-1285). MAJOR CHANGES in PDFParser:
+    * The classic sequential parser is no longer available.
+    * Tiff files are no longer extracted by default.  See
+      https://pdfbox.apache.org/2.0/dependencies.html#optional-components
+      for optional components to process Tiff files.
+
   * Add XMPMM support to PDFParser and JpegParser via Jempbox (TIKA-1894).
 
   * Move serialization of TikaConfig to tika-core and enable dumping

tika-bundle/pom.xml

@@ -127,7 +127,7 @@
               tika-parsers;inline=true,
               commons-compress, xz, commons-codec, commons-csv,
               commons-io, commons-exec, junrar,
-              pdfbox,fontbox,jempbox,bcmail-jdk15on,bcprov-jdk15on,bcpkix-jdk15on,
+              pdfbox,pdfbox-tools,pdfbox-debugger,fontbox,jempbox,bcmail-jdk15on,bcprov-jdk15on,bcpkix-jdk15on,
               poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas,
               curvesapi,
               xmlbeans,

tika-parsers/pom.xml

@@ -42,7 +42,8 @@
     <tukaani.version>1.5</tukaani.version>
     <mime4j.version>0.7.2</mime4j.version>
     <vorbis.version>0.8</vorbis.version>
-    <pdfbox.version>1.8.11</pdfbox.version>
+    <pdfbox.version>2.0.0</pdfbox.version>
+    <jempbox.version>1.8.11</jempbox.version>
     <netcdf-java.version>4.5.5</netcdf-java.version>
     <cxf.version>3.0.3</cxf.version>
     <sis.version>0.6</sis.version>
@@ -133,6 +134,16 @@
       <artifactId>pdfbox</artifactId>
       <version>${pdfbox.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.pdfbox</groupId>
+      <artifactId>pdfbox-tools</artifactId>
+      <version>${pdfbox.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pdfbox</groupId>
+      <artifactId>jempbox</artifactId>
+      <version>${jempbox.version}</version>
+    </dependency>
     <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
          as optional, but we prefer to have them always to avoid
          problems with encrypted PDFs. -->
@@ -298,7 +309,15 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-
+    <!-- Copied from PDFBox:
+    For legal reasons (incompatible license), jai-imageio-core is to be used
+    only in the tests and may not be distributed. See also LEGAL-195 -->
+    <dependency>
+      <groupId>com.github.jai-imageio</groupId>
+      <artifactId>jai-imageio-core</artifactId>
+      <version>1.3.1</version>
+      <scope>test</scope>
+    </dependency>
     <!-- edu.ucar dependencies -->
     <dependency>
       <groupId>edu.ucar</groupId>

tika-parsers/src/main/java/org/apache/tika/parser/font/AdobeFontMetricParser.java

@@ -18,12 +18,13 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.fontbox.afm.AFMParser;
-import org.apache.fontbox.afm.FontMetric;
+import org.apache.fontbox.afm.FontMetrics;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.Property;
@@ -67,16 +68,19 @@ public Set<MediaType> getSupportedTypes( ParseContext context ) {
     public void parse(InputStream stream, ContentHandler handler,
                       Metadata metadata, ParseContext context)
                       throws IOException, SAXException, TikaException { 
-       FontMetric fontMetrics;
+       FontMetrics fontMetrics;
        AFMParser  parser      = new AFMParser( stream );
 
        // Have FontBox process the file
-       parser.parse();
-       fontMetrics = parser.getResult();
+       fontMetrics = parser.parse();
 
        // Get the comments in the file to display in xhtml
-       List<String> comments = fontMetrics.getComments();
-
+       List<String> unModifiableComments = fontMetrics.getComments();
+       //have to copy because we modify list in extractCreationDate
+       List<String> comments = new ArrayList<>();
+        for (String comment : unModifiableComments) {
+            comments.add(comment);
+        }
        // Get the creation date
        extractCreationDate( metadata, comments );
 

tika-parsers/src/main/java/org/apache/tika/parser/font/TrueTypeParser.java

@@ -64,9 +64,9 @@ public void parse(
         TrueTypeFont font;
         TTFParser parser = new TTFParser();
         if (tis != null && tis.hasFile()) {
-            font = parser.parseTTF(tis.getFile());
+            font = parser.parse(tis.getFile());
         } else {
-            font = parser.parseTTF(stream);
+            font = parser.parse(stream);
         }
 
         // Report the details of the font