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 5b8cf39b9 TIKA-3795: update lucene, solr, netty; move netty version to
parent
5b8cf39b9 is described below
commit 5b8cf39b9c89ad4a978b2f76008dc060ea64a32f
Author: Tilman Hausherr <[email protected]>
AuthorDate: Sat Jun 18 16:18:01 2022 +0200
TIKA-3795: update lucene, solr, netty; move netty version to parent
---
tika-parent/pom.xml | 16 +++++++++++-----
tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml | 6 ++++++
tika-pipes/pom.xml | 4 ----
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 559f7e1e5..33801bf80 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -347,7 +347,7 @@
<log4j2.version>2.17.2</log4j2.version>
<lombok.version>1.18.20</lombok.version>
<!-- lucene >= 9.x requires Java 11 -->
- <lucene.version>8.11.1</lucene.version>
+ <lucene.version>8.11.2</lucene.version>
<metadata.extractor.version>2.18.0</metadata.extractor.version>
<microsoft.translator.version>0.6.2</microsoft.translator.version>
<!-- 0.8.6 is built with java 11 and does not work with Java 8 -->
@@ -373,7 +373,7 @@
<sis.version>1.2</sis.version>
<!-- we'll need to stay on 1.7 until we're java modularized ? -->
<slf4j.version>1.7.36</slf4j.version>
- <solrj.version>8.11.1</solrj.version>
+ <solrj.version>8.11.2</solrj.version>
<spring.version>5.3.21</spring.version>
<sqlite.version>3.36.0.3</sqlite.version>
<tagsoup.version>1.2.1</tagsoup.version>
@@ -387,6 +387,7 @@
<xerces.version>2.12.2</xerces.version>
<xmpcore.version>6.1.11</xmpcore.version>
<zstd.version>1.5.2-3</zstd.version>
+ <netty.version>4.1.78.Final</netty.version>
</properties>
<dependencyManagement>
@@ -495,12 +496,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>4.1.77.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.77.Final</version>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>it.unimi.dsi</groupId>
@@ -789,7 +795,7 @@
<exclude>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>4.1.77.Final</version>
+ <version>${netty.version}</version>
</exclude>
<exclude>
<!-- the most recent cve in sonatype for this artifact is 2.11.0,
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 1d8ef88ee..b9cc5a4e5 100644
--- a/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-age-recogniser/pom.xml
@@ -131,6 +131,12 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.8.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- netty dependency removed, either it isn't needed,
or our test coverage isn't good enough -->
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index b88de89ad..559c7af66 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -29,10 +29,6 @@
<url>https://tika.apache.org/</url>
<packaging>pom</packaging>
- <properties>
- <netty.version>4.1.77.Final</netty.version>
- </properties>
-
<modules>
<module>tika-httpclient-commons</module>
<module>tika-fetchers</module>
