You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tika.apache.org by ta...@apache.org on 2018/09/14 16:24:12 UTC

[tika] branch branch_1x updated: fix conflict

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


The following commit(s) were added to refs/heads/branch_1x by this push:
     new af04995  fix conflict
af04995 is described below

commit af04995bafa4666b5d8f6a3f8c67ecbf033babff
Author: TALLISON <ta...@apache.org>
AuthorDate: Fri Sep 14 12:23:56 2018 -0400

    fix conflict
---
 tika-dl/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index 37d4966..f7d6104 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -281,6 +281,10 @@
           <groupId>joda-time</groupId>
           <artifactId>joda-time</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.woodstox</groupId>
+          <artifactId>stax2-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>