[tika] branch main updated: TIKA-3244 -- general upgrades -- revert zstd

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/main by this push:
     new ccd3651  TIKA-3244 -- general upgrades -- revert zstd
ccd3651 is described below

commit ccd365123969bfc2c8a70f8b2bf25ad8e13b3d10
Author: tallison <ta...@apache.org>
AuthorDate: Fri Dec 18 15:13:49 2020 -0500

    TIKA-3244 -- general upgrades -- revert zstd
---
 tika-core/src/main/java/org/apache/tika/fork/ForkClient.java        | 2 +-
 tika-core/src/main/java/org/apache/tika/fork/ForkParser.java        | 6 +++---
 .../src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java   | 2 +-
 tika-parent/pom.xml                                                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
index 15c31fd..ed3c76a 100644
--- a/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
@@ -67,7 +67,7 @@ class ForkClient {
     /**
      *
      * @param tikaDir directory containing jars from which to start the child server and load the Parser
-     * @param parserFactoryFactory factory to send to child process to build parser upon arrival
+     * @param parserFactoryFactory factory to send to forked process to build parser upon arrival
      * @param classLoader class loader to use for non-parser resource (content-handler, etc.)
      * @param java java commandline to use for the commandline server
      * @throws IOException
diff --git a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
index ac043e7..6092951 100644
--- a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
+++ b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
@@ -80,7 +80,7 @@ public class ForkParser extends AbstractParser implements Closeable
     private int maxFilesProcessedPerClient = -1;
 
     /**
-     * If you have a directory with, say, tike-app.jar and you want the child process/server to build a parser
+     * If you have a directory with, say, tike-app.jar and you want the forked process/server to build a parser
      * and run it from that -- so that you can keep all of those dependencies out of your client code, use
      * this initializer.
      *
@@ -99,8 +99,8 @@ public class ForkParser extends AbstractParser implements Closeable
      * <b>EXPERT</b>
      * @param tikaBin directory containing the tika-app.jar or similar -- full jar including tika-core and all
      *                desired parsers and dependencies
-     * @param parserFactoryFactory -- the factory to use to generate the parser factory in the child process/server
-     * @param classLoader to use for all classes besides the parser in the child process/server
+     * @param parserFactoryFactory -- the factory to use to generate the parser factory in the forked process/server
+     * @param classLoader to use for all classes besides the parser in the forked process/server
      */
     public ForkParser(Path tikaBin, ParserFactoryFactory parserFactoryFactory, ClassLoader classLoader) {
         parser = null;
diff --git a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
index 3b4108c..1f999bf 100644
--- a/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
+++ b/tika-core/src/test/java/org/apache/tika/fork/ForkParserTikaBinTest.java
@@ -74,7 +74,7 @@ public class ForkParserTikaBinTest extends TikaTest {
             addClasses(jarOs, classPath, ci -> ci.getPackageName().startsWith("org.apache.commons.io"));
             //exclude TypeDetectionBenchmark because it is not serializable
             //exclude UpperCasingContentHandler because we want to test that
-            //we can serialize it from the parent process into the child process
+            //we can serialize it from the parent process into the forked process
             addClasses(jarOs, classPath, ci ->
                     ci.getPackageName().startsWith("org.apache.tika")
                             && (!ci.getName().contains("TypeDetectionBenchmark"))
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 494d57a..50686fa 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -351,7 +351,7 @@
     <vorbis.version>0.8</vorbis.version>
     <xerces.version>2.12.0</xerces.version>
     <xmpcore.version>6.1.11</xmpcore.version>
-    <zstd.version>1.4.7-1</zstd.version>
+    <zstd.version>1.4.5-12</zstd.version>
   </properties>
 
   <dependencyManagement>