This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tika.git
commit f9dcd2073d8984d52105fda1299facf84a683f60 Author: TALLISON <talli...@apache.org> AuthorDate: Thu Dec 13 10:22:01 2018 -0500 handful of dependency upgrades --- tika-example/pom.xml | 6 ++++++ tika-parsers/pom.xml | 11 +++++++++++ tika-server/pom.xml | 6 ++++++ 3 files changed, 23 insertions(+) diff --git a/tika-example/pom.xml b/tika-example/pom.xml index bfd3892..7bf2ef4 100644 --- a/tika-example/pom.xml +++ b/tika-example/pom.xml @@ -61,6 +61,12 @@ <groupId>org.apache.tika</groupId> <artifactId>tika-translate</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml index dace1b9..230ff1b 100644 --- a/tika-parsers/pom.xml +++ b/tika-parsers/pom.xml @@ -104,6 +104,11 @@ <artifactId>commons-lang3</artifactId> <version>${commons.lang3.version}</version> </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + <version>1.3.2</version> + </dependency> <!-- Externally Maintained Parsers --> <dependency> @@ -368,6 +373,12 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- TIKA-2021: Tesseract OCR Parser dependencies, used for executing image processing script --> diff --git a/tika-server/pom.xml b/tika-server/pom.xml index abf23fa..6c4a800 100644 --- a/tika-server/pom.xml +++ b/tika-server/pom.xml @@ -74,6 +74,12 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>${cxf.version}</version> + <exclusions> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cxf</groupId>