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 2020/09/01 17:35:50 UTC
[tika] branch main updated: TIKA-3179 -- Fix parent information in
tika-parsers-extended TIKA-3183 -- alphabetize/normalize properties
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 9405c5f TIKA-3179 -- Fix parent information in tika-parsers-extended TIKA-3183 -- alphabetize/normalize properties
9405c5f is described below
commit 9405c5f5d153d85639c131889712c35e05bf4b13
Author: tallison <ta...@apache.org>
AuthorDate: Tue Sep 1 13:35:31 2020 -0400
TIKA-3179 -- Fix parent information in tika-parsers-extended
TIKA-3183 -- alphabetize/normalize properties
---
tika-eval/pom.xml | 2 +-
tika-fuzzing/pom.xml | 2 +-
tika-parent/pom.xml | 114 +++++++++++----------
tika-parsers-advanced/tika-dl/pom.xml | 6 --
.../tika-parser-advancedmedia-module/pom.xml | 2 +-
.../tika-parser-nlp-module/pom.xml | 2 +-
tika-parsers-extended/pom.xml | 3 +-
.../tika-parser-scientific-module/pom.xml | 4 +-
tika-parsers/tika-parser-digest-commons/pom.xml | 2 +-
tika-parsers/tika-parser-html-module/pom.xml | 2 +-
tika-parsers/tika-parser-microsoft-module/pom.xml | 2 +-
tika-parsers/tika-parser-pkg-module/pom.xml | 2 +-
tika-parsers/tika-parser-text-module/pom.xml | 2 +-
tika-parsers/tika-parser-xml-module/pom.xml | 2 +-
tika-server/pom.xml | 2 +-
15 files changed, 74 insertions(+), 75 deletions(-)
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 31cdb74..cbb356c 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${cli.version}</version>
+ <version>${commons.cli.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/tika-fuzzing/pom.xml b/tika-fuzzing/pom.xml
index 19c89ed..daf43ad 100644
--- a/tika-fuzzing/pom.xml
+++ b/tika-fuzzing/pom.xml
@@ -20,7 +20,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${cli.version}</version>
+ <version>${commons.cli.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 318f95a..02a1be8 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -259,6 +259,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+
<!-- plugin versions -->
<forbiddenapis.version>3.0.1</forbiddenapis.version>
<groovy.maven.version>2.1</groovy.maven.version>
@@ -271,76 +272,79 @@
<maven.surefire.version>3.0.0-M4</maven.surefire.version>
<maven.shade.version>3.2.1</maven.shade.version>
<rat.version>0.13</rat.version>
- <!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
- <poi.version>4.1.2</poi.version>
+
+ <!-- dependency versions -->
+ <boilerpipe.version>1.1.0</boilerpipe.version>
+ <!-- used by POI, PDFBox and Jackcess ...try to sync -->
+ <bouncycastle.version>1.65</bouncycastle.version>
+ <!-- NOTE: sync brotli version with commons-compress-->
+ <brotli.version>0.1.2</brotli.version>
+ <commons.cli.version>1.4</commons.cli.version>
+ <commons.codec.version>1.13</commons.codec.version>
+ <commons.collections4.version>4.4</commons.collections4.version>
<commons.compress.version>1.20</commons.compress.version>
+ <commons.csv.version>1.8</commons.csv.version>
+ <commons.exec.version>1.3</commons.exec.version>
<commons.io.version>2.7</commons.io.version>
<commons.lang3.version>3.10</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</ctakes.version>
+ <cxf.version>3.3.7</cxf.version>
+ <ddplist.version>1.23</ddplist.version>
+ <dl4j.version>1.0.0-beta6</dl4j.version>
+ <geoapi.version>3.0.1</geoapi.version>
<gson.version>2.8.6</gson.version>
<guava.version>29.0-jre</guava.version>
- <osgi.core.version>6.0.0</osgi.core.version>
- <log4j.version>1.2.17</log4j.version>
- <cxf.version>3.3.7</cxf.version>
- <slf4j.version>1.7.28</slf4j.version>
- <jackson.version>2.11.0</jackson.version>
- <jaxb.version>2.3.3</jaxb.version>
- <cli.version>1.4</cli.version>
- <lucene.version>8.5.1</lucene.version>
- <mockito.version>3.3.3</mockito.version>
- <opennlp.version>1.9.2</opennlp.version>
+ <h2.version>1.4.200</h2.version>
<httpcomponents.version>4.5.12</httpcomponents.version>
- <commons.exec.version>1.3</commons.exec.version>
+ <imageio.version>1.4.0</imageio.version>
+ <isoparser.version>1.9.41.2</isoparser.version>
+ <jackrabbit.version>2.21.1</jackrabbit.version>
+ <jackson.version>2.11.0</jackson.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
- <codec.version>1.13</codec.version>
- <json.simple.version>1.1.1</json.simple.version>
- <openjson.version>1.0.12</openjson.version>
- <vorbis.version>0.8</vorbis.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>
+ <jbig2.version>3.0.3</jbig2.version>
+ <jdom2.version>2.0.6</jdom2.version>
<jempbox.version>1.8.16</jempbox.version>
+ <jhighlight.version>1.0.3</jhighlight.version>
+ <joda.time.version>2.10.5</joda.time.version>
+ <json.simple.version>1.1.1</json.simple.version>
+ <juniversalchardet.version>1.0.3</juniversalchardet.version>
+ <libpst.version>0.9.3</libpst.version>
+ <log4j.version>1.2.17</log4j.version>
+ <lombok.version>1.18.12</lombok.version>
+ <lucene.version>8.5.1</lucene.version>
+ <metadata.extractor.version>2.14.0</metadata.extractor.version>
+ <microsoft.translator.version>0.6.2</microsoft.translator.version>
<mime4j.version>0.8.3</mime4j.version>
+ <mockito.version>3.3.3</mockito.version>
+ <netcdf-java.version>4.5.5</netcdf-java.version>
+ <opencsv.version>2.3</opencsv.version>
<pdfbox.version>2.0.21</pdfbox.version>
- <jempbox.version>1.8.16</jempbox.version>
- <tagsoup.version>1.2.1</tagsoup.version>
- <commons.logging.version>1.2</commons.logging.version>
- <commons.collections4.version>4.4</commons.collections4.version>
- <commons.csv.version>1.8</commons.csv.version>
- <!-- used by POI, PDFBox and Jackcess ...try to sync -->
- <bouncycastle.version>1.65</bouncycastle.version>
- <!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
- <tukaani.version>1.8</tukaani.version>
- <!-- NOTE: sync brotli version with commons-compress in tika-parent-->
- <brotli.version>0.1.2</brotli.version>
+ <objenesis.version>3.1</objenesis.version>
+ <openjson.version>1.0.12</openjson.version>
+ <opennlp.version>1.9.2</opennlp.version>
+ <optimaize.version>0.6</optimaize.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
<parso.version>2.0.11</parso.version>
- <xerces.version>2.12.0</xerces.version>
- <juniversalchardet.version>1.0.3</juniversalchardet.version>
- <netcdf-java.version>4.5.5</netcdf-java.version>
- <sis.version>1.0</sis.version>
- <geoapi.version>3.0.1</geoapi.version>
+ <!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
+ <poi.version>4.1.2</poi.version>
<rome.version>1.13.1</rome.version>
- <jdom2.version>2.0.6</jdom2.version>
- <imageio.version>1.4.0</imageio.version>
- <jbig2.version>3.0.3</jbig2.version>
- <metadata.extractor.version>2.14.0</metadata.extractor.version>
- <boilerpipe.version>1.1.0</boilerpipe.version>
- <sqlite.version>3.31.1</sqlite.version>
- <jhighlight.version>1.0.3</jhighlight.version>
- <isoparser.version>1.9.41.2</isoparser.version>
- <ddplist.version>1.23</ddplist.version>
- <optimaize.version>0.6</optimaize.version>
- <javax.jcr.version>2.0</javax.jcr.version>
- <jackrabbit.version>2.21.1</jackrabbit.version>
+ <sis.version>1.0</sis.version>
+ <slf4j.version>1.7.28</slf4j.version>
<spring.version>5.2.7.RELEASE</spring.version>
- <commons.math3.version>3.6.1</commons.math3.version>
- <h2.version>1.4.200</h2.version>
- <objenesis.version>3.1</objenesis.version>
- <lombok.version>1.18.12</lombok.version>
- <joda.time.version>2.10.5</joda.time.version>
- <javax.rest.version>2.1.1</javax.rest.version>
- <ctakes.version>4.0.0</ctakes.version>
+ <sqlite.version>3.31.1</sqlite.version>
+ <tagsoup.version>1.2.1</tagsoup.version>
+ <!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
+ <tukaani.version>1.8</tukaani.version>
+ <twelvemonkeys.version>3.5</twelvemonkeys.version>
<uima.version>3.1.0</uima.version>
- <opencsv.version>2.3</opencsv.version>
- <microsoft.translator.version>0.6.2</microsoft.translator.version>
+ <vorbis.version>0.8</vorbis.version>
+ <xerces.version>2.12.0</xerces.version>
<xmpcore.version>6.1.10</xmpcore.version>
- <libpst.version>0.9.3</libpst.version>
</properties>
<dependencyManagement>
diff --git a/tika-parsers-advanced/tika-dl/pom.xml b/tika-parsers-advanced/tika-dl/pom.xml
index b48f66a..8fc75ad 100644
--- a/tika-parsers-advanced/tika-dl/pom.xml
+++ b/tika-parsers-advanced/tika-dl/pom.xml
@@ -33,12 +33,6 @@
<name>Apache Tika Deep Learning (powered by DL4J)</name>
<url>http://maven.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dl4j.version>1.0.0-beta6</dl4j.version>
- <twelvemonkeys.version>3.5</twelvemonkeys.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml b/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
index 514bc4b..066b43e 100644
--- a/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
+++ b/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/tika-parsers-advanced/tika-parser-nlp-module/pom.xml b/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
index dea93c5..f35a377 100644
--- a/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
@@ -209,7 +209,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/tika-parsers-extended/pom.xml b/tika-parsers-extended/pom.xml
index e17b43b..354c685 100644
--- a/tika-parsers-extended/pom.xml
+++ b/tika-parsers-extended/pom.xml
@@ -3,9 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika</artifactId>
<groupId>org.apache.tika</groupId>
+ <artifactId>tika-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
+ <relativePath>../tika-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers-extended/tika-parser-scientific-module/pom.xml
index 5d374d4..7262422 100644
--- a/tika-parsers-extended/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>tika-parser-modules</artifactId>
+ <artifactId>tika-parsers-extended</artifactId>
<groupId>org.apache.tika</groupId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -94,7 +94,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
diff --git a/tika-parsers/tika-parser-digest-commons/pom.xml b/tika-parsers/tika-parser-digest-commons/pom.xml
index d1f7df2..eebebc4 100644
--- a/tika-parsers/tika-parser-digest-commons/pom.xml
+++ b/tika-parsers/tika-parser-digest-commons/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/tika-parsers/tika-parser-html-module/pom.xml b/tika-parsers/tika-parser-html-module/pom.xml
index 9a464ea..d279612 100644
--- a/tika-parsers/tika-parser-html-module/pom.xml
+++ b/tika-parsers/tika-parser-html-module/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/tika-parsers/tika-parser-microsoft-module/pom.xml b/tika-parsers/tika-parser-microsoft-module/pom.xml
index e76c2d6..8a32527 100644
--- a/tika-parsers/tika-parser-microsoft-module/pom.xml
+++ b/tika-parsers/tika-parser-microsoft-module/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/tika-parsers/tika-parser-pkg-module/pom.xml b/tika-parsers/tika-parser-pkg-module/pom.xml
index f0c6092..542119e 100644
--- a/tika-parsers/tika-parser-pkg-module/pom.xml
+++ b/tika-parsers/tika-parser-pkg-module/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/tika-parsers/tika-parser-text-module/pom.xml b/tika-parsers/tika-parser-text-module/pom.xml
index fe99ada..5aa75e7 100644
--- a/tika-parsers/tika-parser-text-module/pom.xml
+++ b/tika-parsers/tika-parser-text-module/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/tika-parsers/tika-parser-xml-module/pom.xml b/tika-parsers/tika-parser-xml-module/pom.xml
index 5a0958b..1639376 100644
--- a/tika-parsers/tika-parser-xml-module/pom.xml
+++ b/tika-parsers/tika-parser-xml-module/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
diff --git a/tika-server/pom.xml b/tika-server/pom.xml
index f88379f..59404d4 100644
--- a/tika-server/pom.xml
+++ b/tika-server/pom.xml
@@ -111,7 +111,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>${cli.version}</version>
+ <version>${commons.cli.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>