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 c6f2d14fa TIKA-4166: add comment, remove entry that is no longer needed
c6f2d14fa is described below
commit c6f2d14fa710ca58ccb740d6dfad6a0b3bae0899
Author: Tilman Hausherr <[email protected]>
AuthorDate: Mon May 20 12:59:43 2024 +0200
TIKA-4166: add comment, remove entry that is no longer needed
---
tika-parent/pom.xml | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index ab4833d3d..8ece79074 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -1015,13 +1015,6 @@
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
- <!-- convergence problems in Apache Tika Azure Blob fetcher,
- might be removed after update of azure-storage-blob higher than
12.25.1 -->
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>4.2.2</version>
- </dependency>
<!-- because of convergence problems with jaxb 2.0.4, because cxf 4.0.3
uses an older version -->
<dependency>
<groupId>org.eclipse.angus</groupId>
@@ -1038,6 +1031,8 @@
<artifactId>hdf5-platform</artifactId>
<version>${hdf5.version}</version>
</dependency>
+ <!-- avoid convergence problems related to
+ google-cloud-storage:2.38.0 (2.26.1) and gson:2.11.0 (2.27.0) -->
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
