Merge remote-tracking branch 'origin/branch_2x' into branch_2x

apache · May 1, 2024 · 77a3d06 · 77a3d06
2 parents b0f3be8 + 6602caf
commit 77a3d06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
@@ -299,15 +299,15 @@
     <maven.scr.version>1.26.4</maven.scr.version>
     <maven.failsafe.version>3.2.5</maven.failsafe.version>
     <maven.surefire.version>3.2.5</maven.surefire.version>
-    <maven.shade.version>3.5.2</maven.shade.version>
+    <maven.shade.version>3.5.3</maven.shade.version>
     <maven.project.info.reports.version>3.5.0</maven.project.info.reports.version>
     <!-- need above java 8 for 10.[0-2] -->
     <puppycrawl.version>9.3</puppycrawl.version>
     <rat.version>0.16.1</rat.version>
 
     <!-- dependency versions -->
     <google.cloud.version>2.37.0</google.cloud.version>
-    <aws.version>1.12.705</aws.version>
+    <aws.version>1.12.710</aws.version>
     <!-- WARNING: when you upgrade asm make sure that you update the
         OpCode in the initializer in org.apache.tika.parser.asm.XHTMLClassVisitor
         See TIKA-2992.
@@ -319,7 +319,7 @@
     <!-- NOTE: sync brotli version with commons-compress-->
     <brotli.version>0.1.2</brotli.version>
     <commons.cli.version>1.7.0</commons.cli.version>
-    <commons.codec.version>1.16.1</commons.codec.version>
+    <commons.codec.version>1.17.0</commons.codec.version>
     <commons.collections4.version>4.4</commons.collections4.version>
     <commons.compress.version>1.26.1</commons.compress.version>
     <commons.csv.version>1.10.0</commons.csv.version>
@@ -407,7 +407,7 @@
     <vorbis.version>0.8</vorbis.version>
     <xerces.version>2.12.2</xerces.version>
     <xmpcore.version>6.1.11</xmpcore.version>
-    <zstd.version>1.5.6-2</zstd.version>
+    <zstd.version>1.5.6-3</zstd.version>
     <kafka.version>3.7.0</kafka.version>
     <netty.version>4.1.109.Final</netty.version>
     <snappy.java.version>1.1.10.5</snappy.java.version>
@@ -487,7 +487,7 @@
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-storage-blob</artifactId>
-        <version>12.25.3</version>
+        <version>12.25.4</version>
       </dependency>
       <dependency>
         <groupId>com.azure</groupId>

diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml
@@ -295,7 +295,7 @@
           <plugin>
             <groupId>com.qmino</groupId>
             <artifactId>miredot-plugin</artifactId>
-            <version>2.4.4-Java11</version>
+            <version>2.4.5-Java11</version>
             <executions>
               <execution>
                 <goals>