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/09/15 12:09:30 UTC
[tika] branch TIKA-3948 updated: [TIKA-3948] switching to the SNAPSHOT version of apache.sis (#1342)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3948
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/TIKA-3948 by this push:
new 3ef1c94bb [TIKA-3948] switching to the SNAPSHOT version of apache.sis (#1342)
3ef1c94bb is described below
commit 3ef1c94bb750012a9c6d9ebc28aafb24392ef6cf
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Sep 15 19:09:24 2023 +0700
[TIKA-3948] switching to the SNAPSHOT version of apache.sis (#1342)
* [TIKA-3948] switching to the SNAPSHOT version of apache.sis; some checkstyle errors are fixed; Code clean-up, Java heap for tests is increased
---
tika-parent/pom.xml | 7 +++----
.../tika-parser-scientific-module/pom.xml | 20 --------------------
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index efb1c1f75..6f144e279 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -338,12 +338,11 @@
<jackson.version>2.15.2</jackson.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<javax.jcr.version>2.0</javax.jcr.version>
- <javax.rest.version>2.1.1</javax.rest.version>
<jaxb.version>4.0.3</jaxb.version>
<jbig2.version>3.0.4</jbig2.version>
<jdom2.version>2.0.6.1</jdom2.version>
<jempbox.version>1.8.17</jempbox.version>
- <jetty.version>11.0.15</jetty.version>
+ <jetty.version>11.0.16</jetty.version>
<jhighlight.version>1.1.0</jhighlight.version>
<jna.version>5.13.0</jna.version>
<json.simple.version>1.1.1</json.simple.version>
@@ -375,7 +374,7 @@
<reactor.netty.version>1.1.11</reactor.netty.version>
<rome.version>2.1.0</rome.version>
<scm.version>2.0.1</scm.version>
- <sis.version>1.3</sis.version>
+ <sis.version>1.4-SNAPSHOT</sis.version>
<slf4j.version>2.0.9</slf4j.version>
<solrj.version>8.11.2</solrj.version>
<!-- NOTE: Spring 6 requires jdk17 -->
@@ -1103,7 +1102,7 @@
<version>${maven.surefire.version}
</version> <!-- versions greater than this don't like System.exit calls in tika-batch -->
<configuration>
- <argLine>-Xmx3072m -Djava.awt.headless=true</argLine>
+ <argLine>-Xmx4g -Djava.awt.headless=true</argLine>
</configuration>
</plugin>
<plugin>
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 b88ab4b46..42fc28c64 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
@@ -44,31 +44,11 @@
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-netcdf</artifactId>
<version>${sis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <!-- brings 2.3.3 -->
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-metadata</artifactId>
<version>${sis.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <!-- brings 2.3.3 -->
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- <!-- Old API required by org.apache.sis -->
</dependency>
<dependency>
<groupId>org.opengis</groupId>