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
commit b213fb3b5a50faf93e0da92b10adfa0d06d41f46 Merge: 8053e31 a366813 Author: TALLISON <[email protected]> AuthorDate: Tue Sep 18 14:07:37 2018 -0400 Merge remote-tracking branch 'origin/branch_1x' into branch_1x # Conflicts: # CHANGES.txt # tika-core/src/main/java/org/apache/tika/fork/ForkParser.java CHANGES.txt | 4 +--- pom.xml | 2 +- tika-app/pom.xml | 2 +- tika-batch/pom.xml | 2 +- tika-bundle/pom.xml | 12 +++++++++++- tika-core/pom.xml | 2 +- .../src/main/java/org/apache/tika/fork/ForkParser.java | 2 +- .../main/java/org/apache/tika/utils/ProcessUtils.java | 16 ++++++++++++++++ .../org/apache/tika/fork/UpperCasingContentHandler.java | 16 ++++++++++++++++ .../tika/fork/unusedpackage/ClassInUnusedPackage.java | 16 ++++++++++++++++ tika-dl/pom.xml | 6 +++++- tika-eval/pom.xml | 2 +- tika-example/pom.xml | 2 +- tika-java7/pom.xml | 2 +- tika-langdetect/pom.xml | 2 +- tika-nlp/pom.xml | 2 +- tika-parent/pom.xml | 4 ++-- tika-parsers/pom.xml | 2 +- tika-serialization/pom.xml | 2 +- tika-server/pom.xml | 2 +- tika-translate/pom.xml | 2 +- tika-xmp/pom.xml | 2 +- 22 files changed, 82 insertions(+), 22 deletions(-) diff --cc tika-core/src/main/java/org/apache/tika/fork/ForkParser.java index c6412d5,a37aed4..f1e5152 --- a/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java +++ b/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java @@@ -212,7 -212,7 +212,7 @@@ public class ForkParser extends Abstrac * This sends the objects to the server for parsing, and the server via * the proxies acts on the handler as if it were updating it directly. * <p> - * If using a {@link org.apache.tika.parser.RecursiveParserWrapper}, there are two options: - * If using a {@link RecursiveParserWrapper}, there are two options: ++ * If using a RecursiveParserWrapper, there are two options: * </p> * <p> * <ol>
