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 2022/03/25 13:23:02 UTC
[tika] branch main updated: TIKA-3707 -- bump azure-storage-blob version
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 d6aa60f TIKA-3707 -- bump azure-storage-blob version
d6aa60f is described below
commit d6aa60f16e0db7bdf4a9bc7f1392c5a5b485db77
Author: tallison <ta...@apache.org>
AuthorDate: Fri Mar 25 09:22:45 2022 -0400
TIKA-3707 -- bump azure-storage-blob version
---
tika-parent/pom.xml | 7 --
tika-pipes/pom.xml | 83 ++++++++++++++++++++++
.../tika-emitters/tika-emitter-az-blob/pom.xml | 12 ++++
.../tika-fetchers/tika-fetcher-az-blob/pom.xml | 12 ++++
.../tika-pipes-iterator-az-blob/pom.xml | 12 ++++
5 files changed, 119 insertions(+), 7 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 04148f1..e9f7579 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -398,13 +398,6 @@
<version>0.9.1.2</version>
</dependency>
<dependency>
- <groupId>com.azure</groupId>
- <artifactId>azure-storage-blob</artifactId>
- <!-- 12.15.0 introduces reams of convergence errors with
- all sorts of netty components -->
- <version>12.14.4</version>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
diff --git a/tika-pipes/pom.xml b/tika-pipes/pom.xml
index b06ed3a..4c86a25 100644
--- a/tika-pipes/pom.xml
+++ b/tika-pipes/pom.xml
@@ -29,6 +29,10 @@
<url>https://tika.apache.org/</url>
<packaging>pom</packaging>
+ <properties>
+ <netty.version>4.1.73.Final</netty.version>
+ </properties>
+
<modules>
<module>tika-httpclient-commons</module>
<module>tika-fetchers</module>
@@ -36,6 +40,85 @@
<module>tika-pipes-iterators</module>
</modules>
+ <dependencyManagement>
+ <!-- this is caused by convergence errors in
+ azure-storage-blob 12.15.0 and its dependencies.
+ Hopefully, we can get rid of this all with the
+ next upgrade.
+
+ maven enforcer, for reasons unknown, is not
+ seeing netty-transport-native-epoll here, and it
+ has to be excluded from azure-storage-blob
+ in the submodules.
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>com.azure</groupId>
+ <artifactId>azure-storage-blob</artifactId>
+ <version>12.15.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-tcnative-classes</artifactId>
+ <version>2.0.47.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<plugins>
<plugin>
diff --git a/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml b/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
index 1857fe6..e25710d 100644
--- a/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
+++ b/tika-pipes/tika-emitters/tika-emitter-az-blob/pom.xml
@@ -46,6 +46,18 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
+ <!-- not clear why enforcer is not seeing this
+ in the dependency management section in tika-pipes -->
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
</dependency>
</dependencies>
diff --git a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
index 4fe59c8..b520720 100644
--- a/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
+++ b/tika-pipes/tika-fetchers/tika-fetcher-az-blob/pom.xml
@@ -38,6 +38,18 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
+ <!-- not clear why enforcer is not seeing this
+ in the dependency management section in tika-pipes -->
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
index cc9fb00..5edffdd 100644
--- a/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
+++ b/tika-pipes/tika-pipes-iterators/tika-pipes-iterator-az-blob/pom.xml
@@ -41,6 +41,18 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
+ <!-- not clear why enforcer is not seeing this
+ in the dependency management section in tika-pipes -->
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
</dependency>
</dependencies>
<build>