Update dependencies, fixes #4112

fix tika test dependencies fix tika test
apache · Sep 24, 2024 · 27e7163 · 27e7163
1 parent d0cb0de
commit 27e7163
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 10 deletions.
diff --git a/integration-tests/mdi/datasets/golden-apache-tika.csv b/integration-tests/mdi/datasets/golden-apache-tika.csv
@@ -60,7 +60,7 @@ fileSize,filename,rowNumber,shortFilename,extension,path,hiddenFlag,lastModifica
 80356,zip:s3:///apache-hop/tika-test-files.zip!/testFITS_ShorterHeader.fits,59,testFITS_ShorterHeader.fits,fits,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testFITS_ShorterHeader.fits,zip:s3:///apache-hop/tika-test-files.zip!/,207-131-225-53-126-239-184-189-241-84-40-80-214-109-128-7-214-32-228-5-11-87-21-220-131-244-169-33-211-108-233-206-71-208-209-60-93-133-242-176-255-131-24-210-135-126-236-47-99-185-49-189-71-65-122-129-165-56-50-122-249-39-218-62
 10604,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.flac,60,testFLAC.flac,flac,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.flac,zip:s3:///apache-hop/tika-test-files.zip!/,227-49-249-48-235-120-105-82-204-38-8-248-62-22-86-119-208-12-184-221-250-91-172-139-81-27-236-183-78-178-126-34-236-230-240-66-73-38-69-167-48-244-147-173-43-135-74-47-110-245-78-231-143-75-19-99-29-60-126-245-23-2-76-182
 10820,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.oga,61,testFLAC.oga,oga,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.oga,zip:s3:///apache-hop/tika-test-files.zip!/,227-49-249-48-235-120-105-82-204-38-8-248-62-22-86-119-208-12-184-221-250-91-172-139-81-27-236-183-78-178-126-34-236-230-240-66-73-38-69-167-48-244-147-173-43-135-74-47-110-245-78-231-143-75-19-99-29-60-126-245-23-2-76-182
-94090,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,62,testFOXMAIL.box,box,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,zip:s3:///apache-hop/tika-test-files.zip!/,46-64-236-126-236-135-226-177-72-223-226-185-103-92-22-129-55-177-89-64-214-247-42-132-71-144-100-202-97-137-98-156-195-220-195-0-6-253-167-241-52-21-35-133-152-159-162-239-227-19-5-215-188-82-41-103-125-218-172-3-123-81-157-176
+94090,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,62,testFOXMAIL.box,box,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,zip:s3:///apache-hop/tika-test-files.zip!/,207-131-225-53-126-239-184-189-241-84-40-80-214-109-128-7-214-32-228-5-11-87-21-220-131-244-169-33-211-108-233-206-71-208-209-60-93-133-242-176-255-131-24-210-135-126-236-47-99-185-49-189-71-65-122-129-165-56-50-122-249-39-218-62
 6369,zip:s3:///apache-hop/tika-test-files.zip!/testFreeBSD-x86-64,63,testFreeBSD-x86-64,,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testFreeBSD-x86-64,zip:s3:///apache-hop/tika-test-files.zip!/,207-131-225-53-126-239-184-189-241-84-40-80-214-109-128-7-214-32-228-5-11-87-21-220-131-244-169-33-211-108-233-206-71-208-209-60-93-133-242-176-255-131-24-210-135-126-236-47-99-185-49-189-71-65-122-129-165-56-50-122-249-39-218-62
 128,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZd.dot,64,testGRAPHVIZd.dot,dot,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZd.dot,zip:s3:///apache-hop/tika-test-files.zip!/,68-213-78-217-184-109-154-184-235-39-233-147-155-109-11-191-106-89-110-191-189-251-23-88-161-102-87-114-5-46-72-84-116-0-163-79-245-120-40-144-252-90-100-239-204-182-139-145-94-97-65-73-226-140-12-77-136-103-71-55-250-185-15-52
 213,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZdc.dot,65,testGRAPHVIZdc.dot,dot,zip:s3:///apache-hop/tika-test-files.zip!/,false,Fri Dec 03 15:28:10 CET 2021,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZdc.dot,zip:s3:///apache-hop/tika-test-files.zip!/,162-140-115-248-34-247-62-171-16-22-100-48-240-5-53-157-230-193-12-185-35-203-83-182-54-30-18-248-145-15-110-21-49-219-108-248-35-65-120-176-9-160-232-6-200-7-20-33-210-194-244-120-162-158-135-242-248-80-69-118-207-102-57-194

diff --git a/integration-tests/transforms/datasets/golden-apache-tika.csv b/integration-tests/transforms/datasets/golden-apache-tika.csv
@@ -60,7 +60,7 @@ fileSize,filename,rowNumber,shortFilename,extension,path,hiddenFlag,uri,rootUri,
 80356,zip:s3:///apache-hop/tika-test-files.zip!/testFITS_ShorterHeader.fits,59,testFITS_ShorterHeader.fits,fits,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testFITS_ShorterHeader.fits,zip:s3:///apache-hop/tika-test-files.zip!/,207-131-225-53-126-239-184-189-241-84-40-80-214-109-128-7-214-32-228-5-11-87-21-220-131-244-169-33-211-108-233-206-71-208-209-60-93-133-242-176-255-131-24-210-135-126-236-47-99-185-49-189-71-65-122-129-165-56-50-122-249-39-218-62
 10604,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.flac,60,testFLAC.flac,flac,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.flac,zip:s3:///apache-hop/tika-test-files.zip!/,227-49-249-48-235-120-105-82-204-38-8-248-62-22-86-119-208-12-184-221-250-91-172-139-81-27-236-183-78-178-126-34-236-230-240-66-73-38-69-167-48-244-147-173-43-135-74-47-110-245-78-231-143-75-19-99-29-60-126-245-23-2-76-182
 10820,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.oga,61,testFLAC.oga,oga,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testFLAC.oga,zip:s3:///apache-hop/tika-test-files.zip!/,227-49-249-48-235-120-105-82-204-38-8-248-62-22-86-119-208-12-184-221-250-91-172-139-81-27-236-183-78-178-126-34-236-230-240-66-73-38-69-167-48-244-147-173-43-135-74-47-110-245-78-231-143-75-19-99-29-60-126-245-23-2-76-182
-94090,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,62,testFOXMAIL.box,box,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,zip:s3:///apache-hop/tika-test-files.zip!/,46-64-236-126-236-135-226-177-72-223-226-185-103-92-22-129-55-177-89-64-214-247-42-132-71-144-100-202-97-137-98-156-195-220-195-0-6-253-167-241-52-21-35-133-152-159-162-239-227-19-5-215-188-82-41-103-125-218-172-3-123-81-157-176
+94090,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,62,testFOXMAIL.box,box,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testFOXMAIL.box,zip:s3:///apache-hop/tika-test-files.zip!/,207-131-225-53-126-239-184-189-241-84-40-80-214-109-128-7-214-32-228-5-11-87-21-220-131-244-169-33-211-108-233-206-71-208-209-60-93-133-242-176-255-131-24-210-135-126-236-47-99-185-49-189-71-65-122-129-165-56-50-122-249-39-218-62
 6369,zip:s3:///apache-hop/tika-test-files.zip!/testFreeBSD-x86-64,63,testFreeBSD-x86-64,,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testFreeBSD-x86-64,zip:s3:///apache-hop/tika-test-files.zip!/,207-131-225-53-126-239-184-189-241-84-40-80-214-109-128-7-214-32-228-5-11-87-21-220-131-244-169-33-211-108-233-206-71-208-209-60-93-133-242-176-255-131-24-210-135-126-236-47-99-185-49-189-71-65-122-129-165-56-50-122-249-39-218-62
 128,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZd.dot,64,testGRAPHVIZd.dot,dot,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZd.dot,zip:s3:///apache-hop/tika-test-files.zip!/,68-213-78-217-184-109-154-184-235-39-233-147-155-109-11-191-106-89-110-191-189-251-23-88-161-102-87-114-5-46-72-84-116-0-163-79-245-120-40-144-252-90-100-239-204-182-139-145-94-97-65-73-226-140-12-77-136-103-71-55-250-185-15-52
 213,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZdc.dot,65,testGRAPHVIZdc.dot,dot,zip:s3:///apache-hop/tika-test-files.zip!/,false,zip:s3:///apache-hop/tika-test-files.zip!/testGRAPHVIZdc.dot,zip:s3:///apache-hop/tika-test-files.zip!/,162-140-115-248-34-247-62-171-16-22-100-48-240-5-53-157-230-193-12-185-35-203-83-182-54-30-18-248-145-15-110-21-49-219-108-248-35-65-120-176-9-160-232-6-200-7-20-33-210-194-244-120-162-158-135-242-248-80-69-118-207-102-57-194

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -114,7 +114,7 @@
         <perfmark.version>0.26.0</perfmark.version>
         <picocli-version>4.6.3</picocli-version>
         <poi.version>5.3.0</poi.version>
-        <protobuf.version>3.25.2</protobuf.version>
+        <protobuf-java.version>3.25.5</protobuf-java.version>
         <rhino.version>1.7.14</rhino.version>
         <scala.version>2.12.17</scala.version>
         <slf4j.version>2.0.4</slf4j.version>
@@ -126,7 +126,6 @@
         <xerces.version>2.12.2</xerces.version>
         <xml-apis-ext.version>1.3.04</xml-apis-ext.version>
         <xmlunit.version>1.5</xmlunit.version>
-        <zookeeper.version>3.8.4</zookeeper.version>
     </properties>
 
     <dependencyManagement>
@@ -251,6 +250,16 @@
                 <artifactId>guava</artifactId>
                 <version>${guava.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf-java.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>${protobuf-java.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.googlecode.json-simple</groupId>
                 <artifactId>json-simple</artifactId>

diff --git a/plugins/databases/clickhouse/pom.xml b/plugins/databases/clickhouse/pom.xml
@@ -29,7 +29,7 @@
     <name>Hop Plugins Databases ClickHouse</name>
 
     <properties>
-        <clickhouse.jdbc.version>0.6.2</clickhouse.jdbc.version>
+        <clickhouse.jdbc.version>0.6.5</clickhouse.jdbc.version>
     </properties>
 
     <dependencies>

diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml
@@ -87,6 +87,14 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java-util</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>commons-codec</groupId>
                     <artifactId>*</artifactId>
@@ -137,6 +145,14 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>failureaccess</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java-util</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>*</artifactId>
@@ -147,6 +163,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.beam</groupId>
             <artifactId>beam-runners-direct-java</artifactId>
@@ -193,6 +217,14 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java-util</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.twitter</groupId>
                     <artifactId>chill-java</artifactId>
@@ -303,6 +335,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>listenablefuture</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>commons-codec</groupId>
                     <artifactId>*</artifactId>
@@ -687,6 +723,14 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java-util</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.avro</groupId>
                     <artifactId>*</artifactId>
@@ -749,6 +793,10 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>commons-codec</groupId>
                     <artifactId>commons-codec</artifactId>
@@ -830,6 +878,10 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.woodstox</groupId>
+                    <artifactId>woodstox-core</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
@@ -838,6 +890,14 @@
                     <groupId>com.google.guava</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.nimbusds</groupId>
+                    <artifactId>nimbus-jose-jwt</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>commons-beanutils</groupId>
                     <artifactId>commons-beanutils</artifactId>
@@ -862,6 +922,14 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-net</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
@@ -906,10 +974,18 @@
                     <groupId>org.apache.hive</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.htrace</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.httpcomponents</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.jackson</groupId>
+                    <artifactId>jackson-mapper-asl</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
                     <artifactId>*</artifactId>
@@ -1007,6 +1083,10 @@
             <version>${spark.version}</version>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
                     <artifactId>log4j-1.2-api</artifactId>

diff --git a/plugins/engines/beam/src/assembly/assembly.xml b/plugins/engines/beam/src/assembly/assembly.xml
@@ -50,6 +50,8 @@
                 <exclude>org.apache.hadoop:*:jar</exclude>
                 <exclude>org.apache.hadoop.thirdparty:*:jar</exclude>
                 <exclude>org.yaml:snakeyaml:jar</exclude>
+                <exclude>com.google.protobuf:protobuf-java:jar</exclude>
+                <exclude>com.google.protobuf:protobuf-java-util:jar</exclude>
             </excludes>
             <outputDirectory>lib/beam</outputDirectory>
         </dependencySet>
@@ -59,6 +61,8 @@
                 <include>org.apache.hadoop:*:jar</include>
                 <include>org.apache.hadoop.thirdparty:*:jar</include>
                 <include>org.yaml:snakeyaml:jar</include>
+                <include>com.google.protobuf:protobuf-java:jar</include>
+                <include>com.google.protobuf:protobuf-java-util:jar</include>
             </includes>
             <outputDirectory>lib/core</outputDirectory>
         </dependencySet>

diff --git a/plugins/tech/cassandra/pom.xml b/plugins/tech/cassandra/pom.xml
@@ -72,6 +72,14 @@
             <artifactId>cassandra-all</artifactId>
             <version>${cassandra-all.version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-core</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>*</artifactId>