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
commit 7fd2825613bce5fd741a0126de8d812a316389ba Merge: 555706b bf81347 Author: tallison <[email protected]> AuthorDate: Tue Dec 8 10:05:16 2020 -0500 Merge remote-tracking branch 'origin/main' into main # Conflicts: # tika-bundles/tika-bundle-classic/pom.xml tika-bundles/tika-bundle-classic/pom.xml | 8 ++++++++ tika-core/src/main/java/org/apache/tika/utils/CompareUtils.java | 4 ++-- .../main/java/org/apache/tika/server/resource/TikaResource.java | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --cc tika-bundles/tika-bundle-classic/pom.xml index 3fd80bd,7055c69..d7b75e8 --- a/tika-bundles/tika-bundle-classic/pom.xml +++ b/tika-bundles/tika-bundle-classic/pom.xml @@@ -180,7 -186,8 +186,9 @@@ org.apache.tika.parser.internal.Activator </Bundle-Activator> <Embed-Dependency>*;scope=compile;artifactId=tika-parsers-classic-package| + javax.activation| + xerces| + xercesImpl| commons-compress| xz| commons-codec|
