This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-2725
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-2725 by this push:
new 1f8f576 fix conflict
1f8f576 is described below
commit 1f8f576f96d846d824ad4f8de013425b34d836dc
Author: TALLISON <[email protected]>
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 62c03b6..4888811 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>
