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 2023/02/06 16:08:07 UTC

[tika] branch main updated: TIKA-3967 bump geoapi (#941)

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


The following commit(s) were added to refs/heads/main by this push:
     new 248b79b4a TIKA-3967 bump geoapi (#941)
248b79b4a is described below

commit 248b79b4ad7d9218cd1b166de647584ab7bd5658
Author: Tim Allison <ta...@apache.org>
AuthorDate: Mon Feb 6 11:07:59 2023 -0500

    TIKA-3967 bump geoapi (#941)
    
    * TIKA-3967 -- upgrade geoapi and fix convergence errors; Tilman found that 2.1 is the latest version that works
---
 tika-parent/pom.xml                                          | 12 +++++++++++-
 .../tika-parser-scientific-module/pom.xml                    |  5 ++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 5be4bebea..67915f0d6 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -330,7 +330,6 @@
     <dl4j.version>1.0.0-M2</dl4j.version>
     <!-- fakeload versions &gt; 0.4.0 require java > 8 -->
     <fakeload.version>0.4.0</fakeload.version>
-    <geoapi.version>3.0.1</geoapi.version>
     <guava.version>31.1-jre</guava.version>
     <httpcomponents.version>4.5.14</httpcomponents.version>
     <httpcore.version>4.4.16</httpcore.version>
@@ -678,6 +677,12 @@
         <artifactId>javax.annotation-api</artifactId>
         <version>${javax.annotation.version}</version>
       </dependency>
+      <!-- can't upgrade higher until geoapi does because of changes in classes after 2.1 -->
+      <dependency>
+        <groupId>javax.measure</groupId>
+        <artifactId>unit-api</artifactId>
+        <version>2.1</version>
+      </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>javax.ws.rs-api</artifactId>
@@ -857,6 +862,11 @@
         <artifactId>jwarc</artifactId>
         <version>0.21.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.opengis</groupId>
+        <artifactId>geoapi</artifactId>
+        <version>3.0.2</version>
+      </dependency>
       <dependency>
         <groupId>org.ops4j.base</groupId>
         <artifactId>ops4j-base-lang</artifactId>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
index a3ef60ae0..384871d69 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -53,7 +53,10 @@
     <dependency>
       <groupId>org.opengis</groupId>
       <artifactId>geoapi</artifactId>
-      <version>${geoapi.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.measure</groupId>
+      <artifactId>unit-api</artifactId>
     </dependency>
     <!-- edu.ucar dependencies -->
     <dependency>