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/12/03 15:10:49 UTC

[tika] 04/04: TIKA-2751 -- Upgrade to POI 4.0.1

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

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

commit cd51d93355bfadd39012f4fd99654ac9d94450dd
Author: TALLISON <ta...@apache.org>
AuthorDate: Mon Dec 3 09:40:36 2018 -0500

    TIKA-2751 -- Upgrade to POI 4.0.1
---
 CHANGES.txt          | 2 ++
 tika-bundle/pom.xml  | 1 +
 tika-eval/pom.xml    | 4 ----
 tika-nlp/pom.xml     | 4 ++++
 tika-parent/pom.xml  | 1 +
 tika-parsers/pom.xml | 1 -
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 92e2956..e33f0f5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ Release 2.0.0 - ???
 
 Release 1.20 - ???
 
+   * Upgrade to POI 4.0.1 (TIKA-2751).
+
    * Integrate/parameterize new angles handling in
      PDFBox (TIKA-2779).
 
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index b17b953..2833400 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -289,6 +289,7 @@
 
               org.apache.commons.math3.exception;resolution:=optional,
               org.apache.commons.math3.linear;resolution:=optional,
+              org.apache.commons.math3.stat.regression;resolution:=optional,
               org.apache.commons.vfs2;resolution:=optional,
               org.apache.commons.vfs2.provider;resolution:=optional,
               org.apache.commons.vfs2.util;resolution:=optional,
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index c5db36a..262910e 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -34,10 +34,6 @@
     <name>Apache Tika eval</name>
     <url>http://tika.apache.org/</url>
 
-    <properties>
-        <poi.version>4.0.0</poi.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index 70a391b..8b97180 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -128,6 +128,10 @@
           <groupId>javax.annotation</groupId>
           <artifactId>javax.annotation-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-math3</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 800ba9a..7f20f01 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -318,6 +318,7 @@
     <maven.shade.version>3.2.0</maven.shade.version>
     <rat.version>0.12</rat.version>
     <!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
+    <poi.version>4.0.1</poi.version>
     <commons.compress.version>1.18</commons.compress.version>
     <commons.io.version>2.6</commons.io.version>
     <commons.lang3.version>3.8.1</commons.lang3.version>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index c0a7fb4..b6bed3d 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -35,7 +35,6 @@
   <url>http://tika.apache.org/</url>
 
   <properties>
-    <poi.version>4.0.0</poi.version>
     <!-- NOTE: sync codec version with POI -->
     <codec.version>1.11</codec.version>
     <!-- NOTE: sync tukaani version with commons-compress in tika-parent-->