Merge remote-tracking branch 'origin/master'

Author: tballison

tika-core/src/main/java/org/apache/tika/config/TikaConfig.java

@@ -846,16 +846,18 @@ ConfigurableThreadPoolExecutor createDefault(MimeTypes mimeTypes, ServiceLoader
         @Override
         ConfigurableThreadPoolExecutor decorate(ConfigurableThreadPoolExecutor created, Element element)
                 throws IOException, TikaException {
-            Element coreThreadElement = getChild(element, "core-threads");
-            if(coreThreadElement != null)
-            {
-                created.setCorePoolSize(Integer.parseInt(getText(coreThreadElement)));
-            }
+            
             Element maxThreadElement = getChild(element, "max-threads");
             if(maxThreadElement != null)
             {
                 created.setMaximumPoolSize(Integer.parseInt(getText(maxThreadElement)));
             }
+            
+            Element coreThreadElement = getChild(element, "core-threads");
+            if(coreThreadElement != null)
+            {
+                created.setCorePoolSize(Integer.parseInt(getText(coreThreadElement)));
+            }
             return created;
         }
 

tika-core/src/main/java/org/apache/tika/parser/external/ExternalParser.java

@@ -160,7 +160,13 @@ private void parse(
         File output = null;
 
         // Build our command
-        String[] cmd = command[0].split(" ");
+        String[] cmd;
+        if (command.length == 1) {
+            cmd = command[0].split(" ");
+        } else {
+            cmd = new String[command.length];
+            System.arraycopy(command, 0, cmd, 0, command.length);
+        }
         for(int i=0; i<cmd.length; i++) {
            if(cmd[i].indexOf(INPUT_FILE_TOKEN) != -1) {
               cmd[i] = cmd[i].replace(INPUT_FILE_TOKEN, stream.getFile().getPath());

tika-parent/pom.xml

@@ -409,6 +409,23 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>doclint-java8-disable</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalparam>-Xdoclint:none</additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <scm>