You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2022/06/10 06:23:03 UTC
[tika] branch main updated: TIKA-3751: remove netty, update zookeeper somewhat
This is an automated email from the ASF dual-hosted git repository.
tilman 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 330dff3f8 TIKA-3751: remove netty, update zookeeper somewhat
330dff3f8 is described below
commit 330dff3f88c39f32c5dda8515911b8ea6d20637e
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Fri Jun 10 08:22:52 2022 +0200
TIKA-3751: remove netty, update zookeeper somewhat
---
.../tika-parsers-ml/tika-age-recogniser/pom.xml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
index 5be50042e..42e3fddbb 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -127,17 +127,14 @@
</dependency>
<!-- avoid conflicts because of age-predictor-api -->
- <!-- can't update zookeeper higher than 3.4.14 without getting dependency convergence errors -->
+ <!-- can't update zookeeper higher than 3.5.10 without getting dependency convergence errors -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.14</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.10.6.Final</version>
+ <version>3.5.10</version>
</dependency>
+ <!-- netty dependency removed, either it isn't needed,
+ or our test coverage isn't good enough -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
@@ -162,6 +159,12 @@
<groupId>edu.usc.ir</groupId>
<artifactId>age-predictor-api</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Test dependencies -->
<dependency>