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 7b0055e rat check and dependency updates in prep for 2.0.0-BETA
release
7b0055e is described below
commit 7b0055e0866e49ab60d9dc7e103175b47d58ad24
Author: tallison <[email protected]>
AuthorDate: Wed May 19 09:45:55 2021 -0400
rat check and dependency updates in prep for 2.0.0-BETA release
---
.github/pull_request_template.md | 19 ++++++++++
pom.xml | 2 +-
tika-bundles/tika-bundle-standard/pom.xml | 14 --------
tika-langdetect/tika-langdetect-lingo24/pom.xml | 4 ---
tika-langdetect/tika-langdetect-mitll-text/pom.xml | 4 ---
tika-langdetect/tika-langdetect-tika/pom.xml | 14 ++++++++
.../org/apache/tika/langdetect/tika/fa.ngp | 14 ++++++++
tika-parent/pom.xml | 38 ++++++++++----------
.../tika-parser-scientific-module/pom.xml | 11 ++++++
.../tika-parsers-ml/tika-parser-nlp-module/pom.xml | 8 -----
.../src/test/resources/tika-config-solr-urls.xml | 19 ++++++++++
tika-server/tika-server-core/pom.xml | 12 -------
tika-translate/pom.xml | 42 ----------------------
13 files changed, 97 insertions(+), 104 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 778692e..e0092ac 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,3 +1,22 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
Thanks for your contribution to [Apache Tika](https://tika.apache.org/)! Your
help is appreciated!
Before opening the pull request, please verify that
diff --git a/pom.xml b/pom.xml
index d0e43d4..92ac030 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
<module>tika-batch</module>
<module>tika-langdetect</module>
<module>tika-app</module>
- <module>tika-server</module>
<module>tika-pipes</module>
+ <module>tika-server</module>
<module>tika-eval</module>
<module>tika-fuzzing</module>
<module>tika-translate</module>
diff --git a/tika-bundles/tika-bundle-standard/pom.xml
b/tika-bundles/tika-bundle-standard/pom.xml
index 8e34faa..7c4f2a0 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -160,25 +160,11 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>3.0.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>1.2.16</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>txw2</artifactId>
- <version>${jaxb.version}</version>
- <scope>test</scope>
- </dependency>
-
-
</dependencies>
<build>
diff --git a/tika-langdetect/tika-langdetect-lingo24/pom.xml
b/tika-langdetect/tika-langdetect-lingo24/pom.xml
index 4c3dc14..a74ed14 100644
--- a/tika-langdetect/tika-langdetect-lingo24/pom.xml
+++ b/tika-langdetect/tika-langdetect-lingo24/pom.xml
@@ -54,10 +54,6 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tika-langdetect/tika-langdetect-mitll-text/pom.xml
b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
index b1c58a6..398deb3 100644
--- a/tika-langdetect/tika-langdetect-mitll-text/pom.xml
+++ b/tika-langdetect/tika-langdetect-mitll-text/pom.xml
@@ -58,10 +58,6 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
diff --git a/tika-langdetect/tika-langdetect-tika/pom.xml
b/tika-langdetect/tika-langdetect-tika/pom.xml
index 1d763ba..4c5ed0a 100644
--- a/tika-langdetect/tika-langdetect-tika/pom.xml
+++ b/tika-langdetect/tika-langdetect-tika/pom.xml
@@ -69,4 +69,18 @@
<type>test-jar</type>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+
<exclude>src/test/resources/org/apache/tika/langdetect/tika/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git
a/tika-langdetect/tika-langdetect-tika/src/main/resources/org/apache/tika/langdetect/tika/fa.ngp
b/tika-langdetect/tika-langdetect-tika/src/main/resources/org/apache/tika/langdetect/tika/fa.ngp
index e86e27e..f599635 100644
---
a/tika-langdetect/tika-langdetect-tika/src/main/resources/org/apache/tika/langdetect/tika/fa.ngp
+++
b/tika-langdetect/tika-langdetect-tika/src/main/resources/org/apache/tika/langdetect/tika/fa.ngp
@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# NgramProfile generated at Sun Jun 15 15:17:44 IRDT 2014 for Apache Tika
Language Identification
ان_ 34459
ند_ 15773
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 3907ce9..daa9b92 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -279,7 +279,7 @@
<rat.version>0.13</rat.version>
<!-- dependency versions -->
- <aws.version>1.11.1018</aws.version>
+ <aws.version>1.11.1021</aws.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
<bouncycastle.version>1.68</bouncycastle.version>
@@ -292,7 +292,7 @@
<commons.csv.version>1.8</commons.csv.version>
<commons.exec.version>1.3</commons.exec.version>
<commons.io.version>2.8.0</commons.io.version>
- <commons.lang3.version>3.11</commons.lang3.version>
+ <commons.lang3.version>3.12.0</commons.lang3.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.math3.version>3.6.1</commons.math3.version>
<ctakes.version>4.0.0.1</ctakes.version>
@@ -301,7 +301,7 @@
<dl4j.version>1.0.0-beta6</dl4j.version>
<geoapi.version>3.0.1</geoapi.version>
<gson.version>2.8.6</gson.version>
- <guava.version>30.1-jre</guava.version>
+ <guava.version>30.1.1-jre</guava.version>
<h2.version>1.4.200</h2.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
<httpcore.version>4.4.14</httpcore.version>
@@ -309,34 +309,34 @@
<isoparser.version>1.9.41.6</isoparser.version>
<jackcess.version>4.0.0</jackcess.version>
<jackcess.encrypt.version>4.0.1</jackcess.encrypt.version>
- <jackrabbit.version>2.21.5</jackrabbit.version>
- <jackson.version>2.12.1</jackson.version>
+ <jackrabbit.version>2.21.6</jackrabbit.version>
+ <jackson.version>2.12.3</jackson.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<javax.jcr.version>2.0</javax.jcr.version>
<javax.rest.version>2.1.1</javax.rest.version>
- <jaxb.version>2.3.3</jaxb.version>
+ <jaxb.version>2.3.4</jaxb.version>
<jbig2.version>3.0.3</jbig2.version>
<jdom2.version>2.0.6</jdom2.version>
<jempbox.version>1.8.16</jempbox.version>
- <jetty.version>9.4.40.v20210413</jetty.version>
+ <jetty.version>9.4.41.v20210516</jetty.version>
<jhighlight.version>1.0.3</jhighlight.version>
<jna.version>5.8.0</jna.version>
- <joda.time.version>2.10.9</joda.time.version>
+ <joda.time.version>2.10.10</joda.time.version>
<json.simple.version>1.1.1</json.simple.version>
<juniversalchardet.version>1.0.3</juniversalchardet.version>
<junrar.version>7.4.0</junrar.version>
<libpst.version>0.9.3</libpst.version>
<log4j2.version>2.14.1</log4j2.version>
- <lombok.version>1.18.16</lombok.version>
- <lucene.version>8.7.0</lucene.version>
+ <lombok.version>1.18.20</lombok.version>
+ <lucene.version>8.8.2</lucene.version>
<metadata.extractor.version>2.15.0.1</metadata.extractor.version>
<microsoft.translator.version>0.6.2</microsoft.translator.version>
- <mime4j.version>0.8.3</mime4j.version>
+ <mime4j.version>0.8.4</mime4j.version>
<mockito.version>3.7.7</mockito.version>
<netcdf-java.version>4.5.5</netcdf-java.version>
<opencsv.version>2.3</opencsv.version>
<pdfbox.version>2.0.23</pdfbox.version>
- <objenesis.version>3.1</objenesis.version>
+ <objenesis.version>3.2</objenesis.version>
<openjson.version>1.0.12</openjson.version>
<opennlp.version>1.9.3</opennlp.version>
<optimaize.version>0.6</optimaize.version>
@@ -349,19 +349,19 @@
<!-- we'll need to stay on 1.7 until we're java modularized ? -->
<slf4j.version>1.7.30</slf4j.version>
<solrj.version>8.8.2</solrj.version>
- <spring.version>5.3.3</spring.version>
+ <spring.version>5.3.7</spring.version>
<sqlite.version>3.34.0</sqlite.version>
<tagsoup.version>1.2.1</tagsoup.version>
<test.containers.version>1.15.2</test.containers.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
- <tukaani.version>1.8</tukaani.version>
- <twelvemonkeys.version>3.6.1</twelvemonkeys.version>
- <uima.version>3.1.1</uima.version>
- <uimafit.version>3.1.0</uimafit.version>
+ <tukaani.version>1.9</tukaani.version>
+ <twelvemonkeys.version>3.7.0</twelvemonkeys.version>
+ <uima.version>3.2.0</uima.version>
+ <uimafit.version>3.2.0</uimafit.version>
<vorbis.version>0.8</vorbis.version>
<xerces.version>2.12.1</xerces.version>
<xmpcore.version>6.1.11</xmpcore.version>
- <zstd.version>1.4.8-1</zstd.version>
+ <zstd.version>1.4.9-5</zstd.version>
</properties>
<dependencyManagement>
@@ -379,7 +379,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
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 1239e68..167aebf 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
@@ -236,6 +236,17 @@ May the gods of dependency management fix this in the
future.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${rat.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>src/test/resources/test-documents/**</exclude>
+ <exclude>src/test/resources/ground-truth/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
index a873324..ed2e1a1 100644
--- a/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-parser-nlp-module/pom.xml
@@ -184,17 +184,9 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-solr-urls.xml
b/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-solr-urls.xml
index 0fcb1e7..121185b 100644
---
a/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-solr-urls.xml
+++
b/tika-pipes/tika-pipes-integration-tests/src/test/resources/tika-config-solr-urls.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<properties>
<parsers>
<parser class="org.apache.tika.parser.DefaultParser">
diff --git a/tika-server/tika-server-core/pom.xml
b/tika-server/tika-server-core/pom.xml
index 5b60a59..decb6a3 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -78,17 +78,9 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -164,10 +156,6 @@
<!-- logging -->
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index ba31ed5..e5ec0c3 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -81,58 +81,22 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
- <exclusions>
- <!-- exclude because, as of 2.9.5, jaxb-annotations
- is bringing in 2.9.0 of core's annotations
- -->
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
<exclusions>
- <!-- exclude because, as of 2.9.5, jaxrs-json-provider
- is bringing in 2.9.0 of core's annotations
- -->
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
<exclusion>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -144,12 +108,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Test dependencies -->
