This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit cf0348d7fee819296628281e50cec117d5a74471 Author: tballison <talli...@mitre.org> AuthorDate: Tue Mar 6 19:52:39 2018 -0500 TIKA-2598 -- unbreak the build (sorry!), fix problems after tika-app --- tika-batch/pom.xml | 2 +- tika-bundle/pom.xml | 23 +++++++++ tika-dl/pom.xml | 63 ++++++++++++++++++++++++ tika-example/pom.xml | 30 +++++++++++- tika-nlp/pom.xml | 127 ++++++++++++++++++++++++++++++++++++++++++++++++- tika-translate/pom.xml | 11 +++++ 6 files changed, 252 insertions(+), 4 deletions(-) diff --git a/tika-batch/pom.xml b/tika-batch/pom.xml index dd883e0..e71320b 100644 --- a/tika-batch/pom.xml +++ b/tika-batch/pom.xml @@ -35,7 +35,7 @@ <url>http://tika.apache.org/</url> <properties> - <cli.version>1.3.1</cli.version> + <cli.version>1.4</cli.version> </properties> <dependencies> diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml index 6ba9338..e16b5b0 100644 --- a/tika-bundle/pom.xml +++ b/tika-bundle/pom.xml @@ -72,6 +72,28 @@ <groupId>org.ops4j.pax.exam</groupId> <artifactId>pax-exam-container-native</artifactId> <version>${pax.exam.version}</version> + <exclusions> + <exclusion> + <groupId>org.ops4j.base</groupId> + <artifactId>ops4j-base-util-property</artifactId> + </exclusion> + <exclusion> + <groupId>org.ops4j.base</groupId> + <artifactId>ops4j-base-lang</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.base</groupId> + <artifactId>ops4j-base-util-property</artifactId> + <version>1.5.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ops4j.base</groupId> + <artifactId>ops4j-base-lang</artifactId> + <version>1.5.0</version> <scope>test</scope> </dependency> <dependency> @@ -206,6 +228,7 @@ android.util;resolution:=optional, com.adobe.xmp;resolution:=optional, com.adobe.xmp.properties;resolution:=optional, + com.github.luben.zstd;resolution:=optional, com.github.openjson;resolution:=optional, com.google.protobuf;resolution:=optional, com.ibm.icu.text;resolution:=optional, diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml index ee20ef5..29f8542 100644 --- a/tika-dl/pom.xml +++ b/tika-dl/pom.xml @@ -46,6 +46,12 @@ <artifactId>tika-parsers</artifactId> <version>${project.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> @@ -64,9 +70,34 @@ <groupId>org.json</groupId> <artifactId>json</artifactId> </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>org.deeplearning4j</groupId> + <artifactId>deeplearning4j-modelimport</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> </exclusions> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + <version>3.4.1</version> + </dependency> + <dependency> <groupId>org.deeplearning4j</groupId> <artifactId>deeplearning4j-modelimport</artifactId> <version>${dl4j.model.version}</version> @@ -75,17 +106,49 @@ <groupId>org.deeplearning4j</groupId> <artifactId>deeplearning4j-keras</artifactId> </exclusion> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + </exclusion> + <exclusion> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.datavec</groupId> <artifactId>datavec-data-image</artifactId> <version>${dl4j.version}</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math3</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nd4j</groupId> <artifactId>nd4j-native-platform</artifactId> <version>${dl4j.version}</version> + <exclusions> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/tika-example/pom.xml b/tika-example/pom.xml index aa2c208..be2b6ac 100644 --- a/tika-example/pom.xml +++ b/tika-example/pom.xml @@ -90,11 +90,39 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-server</artifactId> <version>2.3.6</version> + <exclusions> + <exclusion> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-core</artifactId> <version>2.3.6</version> + <exclusions> + <exclusion> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.lucene</groupId> @@ -109,7 +137,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>3.0.2.RELEASE</version> + <version>3.2.16.RELEASE</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml index f0a6059..7b59e25 100644 --- a/tika-nlp/pom.xml +++ b/tika-nlp/pom.xml @@ -64,8 +64,131 @@ <groupId>edu.usc.ir</groupId> <artifactId>age-predictor-api</artifactId> <version>1.0</version> + <exclusions> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> + <groupId>commons-compress</groupId> + <artifactId>commons-compress</artifactId> + </exclusion> + <exclusion> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + <exclusion> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer</artifactId> + </exclusion> + <exclusion> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + </exclusion> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + </exclusion> + <exclusion> + <groupId>org.scalamacros</groupId> + <artifactId>quasiquotes_2.10</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.scalamacros</groupId> + <artifactId>quasiquotes_2.10</artifactId> + <version>2.0.0-M8</version> + <exclusions> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + </exclusion> + <exclusion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.10.6</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <version>2.10.6</version> + </dependency> + <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>com.thoughtworks.paranamer</groupId> + <artifactId>paranamer</artifactId> + <version>2.6</version> + </dependency> + <dependency> + <groupId>org.xerial.snappy</groupId> + <artifactId>snappy-java</artifactId> + <version>1.1.2.4</version> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>1.9.13</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.6.5</version> </dependency> - <!-- Test dependencies --> <dependency> <groupId>junit</groupId> @@ -74,7 +197,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.7</version> + <version>2.15.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml index c6aa7e5..b8e6919 100644 --- a/tika-translate/pom.xml +++ b/tika-translate/pom.xml @@ -50,6 +50,17 @@ <artifactId>microsoft-translator-java-api</artifactId> <version>0.6.2</version> <type>jar</type> + <exclusions> + <exclusion> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1.1</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> -- To stop receiving notification emails like this one, please contact talli...@apache.org.