You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by vi...@apache.org on 2021/10/25 05:45:38 UTC
[hudi] branch master updated: [HUDI-2600] Remove duplicated
hadoop-common with tests classifier exists in bundles (#3847)
This is an automated email from the ASF dual-hosted git repository.
vinoyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 220bf6a [HUDI-2600] Remove duplicated hadoop-common with tests classifier exists in bundles (#3847)
220bf6a is described below
commit 220bf6a7e6f5cdf0efbbbee9df6852a8b2288570
Author: vinoyang <ya...@gmail.com>
AuthorDate: Mon Oct 25 13:45:28 2021 +0800
[HUDI-2600] Remove duplicated hadoop-common with tests classifier exists in bundles (#3847)
---
dependencies/hudi-flink-bundle_2.11.txt | 6 +++---
dependencies/hudi-hive-sync-bundle.txt | 7 +------
dependencies/hudi-kafka-connect-bundle.txt | 3 +--
dependencies/hudi-spark-bundle_2.11.txt | 3 +--
dependencies/hudi-timeline-server-bundle.txt | 1 -
dependencies/hudi-utilities-bundle_2.11.txt | 3 +--
hudi-client/hudi-client-common/pom.xml | 1 +
hudi-sync/hudi-hive-sync/pom.xml | 1 +
hudi-timeline-service/pom.xml | 1 +
9 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/dependencies/hudi-flink-bundle_2.11.txt b/dependencies/hudi-flink-bundle_2.11.txt
index b97995c..4414594 100644
--- a/dependencies/hudi-flink-bundle_2.11.txt
+++ b/dependencies/hudi-flink-bundle_2.11.txt
@@ -64,7 +64,7 @@ commons-lang/commons-lang/2.6//commons-lang-2.6.jar
commons-lang3/org.apache.commons/3.1//commons-lang3-3.1.jar
commons-logging/commons-logging/1.2//commons-logging-1.2.jar
commons-math/org.apache.commons/2.2//commons-math-2.2.jar
-commons-math3/org.apache.commons/3.1.1//commons-math3-3.1.1.jar
+commons-math3/org.apache.commons/3.5//commons-math3-3.5.jar
commons-net/commons-net/3.1//commons-net-3.1.jar
commons-pool/commons-pool/1.6//commons-pool-1.6.jar
config/com.typesafe/1.3.3//config-1.3.3.jar
@@ -107,6 +107,7 @@ force-shading/org.apache.flink/1.13.1//force-shading-1.13.1.jar
grizzled-slf4j_2.11/org.clapper/1.3.2//grizzled-slf4j_2.11-1.3.2.jar
groovy-all/org.codehaus.groovy/2.4.4//groovy-all-2.4.4.jar
gson/com.google.code.gson/2.3.1//gson-2.3.1.jar
+guava/com.google.guava/12.0.1//guava-12.0.1.jar
guice-assistedinject/com.google.inject.extensions/3.0//guice-assistedinject-3.0.jar
guice-servlet/com.google.inject.extensions/3.0//guice-servlet-3.0.jar
guice/com.google.inject/3.0//guice-3.0.jar
@@ -114,7 +115,6 @@ hadoop-annotations/org.apache.hadoop/2.7.3//hadoop-annotations-2.7.3.jar
hadoop-auth/org.apache.hadoop/2.7.3//hadoop-auth-2.7.3.jar
hadoop-client/org.apache.hadoop/2.7.3//hadoop-client-2.7.3.jar
hadoop-common/org.apache.hadoop/2.7.3//hadoop-common-2.7.3.jar
-hadoop-common/org.apache.hadoop/2.7.3/tests/hadoop-common-2.7.3-tests.jar
hadoop-hdfs/org.apache.hadoop/2.7.3//hadoop-hdfs-2.7.3.jar
hadoop-hdfs/org.apache.hadoop/2.7.3/tests/hadoop-hdfs-2.7.3-tests.jar
hadoop-mapreduce-client-app/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-app-2.7.3.jar
@@ -132,7 +132,7 @@ hadoop-yarn-server-resourcemanager/org.apache.hadoop/2.7.2//hadoop-yarn-server-r
hadoop-yarn-server-web-proxy/org.apache.hadoop/2.7.2//hadoop-yarn-server-web-proxy-2.7.2.jar
hamcrest-core/org.hamcrest/1.3//hamcrest-core-1.3.jar
hbase-annotations/org.apache.hbase/1.2.3//hbase-annotations-1.2.3.jar
-hbase-client/org.apache.hbase/1.1.1//hbase-client-1.1.1.jar
+hbase-client/org.apache.hbase/1.2.3//hbase-client-1.2.3.jar
hbase-common/org.apache.hbase/1.2.3//hbase-common-1.2.3.jar
hbase-common/org.apache.hbase/1.2.3/tests/hbase-common-1.2.3-tests.jar
hbase-hadoop-compat/org.apache.hbase/1.2.3//hbase-hadoop-compat-1.2.3.jar
diff --git a/dependencies/hudi-hive-sync-bundle.txt b/dependencies/hudi-hive-sync-bundle.txt
index aefcfbb..f80ee31 100644
--- a/dependencies/hudi-hive-sync-bundle.txt
+++ b/dependencies/hudi-hive-sync-bundle.txt
@@ -56,7 +56,6 @@ hadoop-annotations/org.apache.hadoop/2.7.3//hadoop-annotations-2.7.3.jar
hadoop-auth/org.apache.hadoop/2.7.3//hadoop-auth-2.7.3.jar
hadoop-client/org.apache.hadoop/2.7.3//hadoop-client-2.7.3.jar
hadoop-common/org.apache.hadoop/2.7.3//hadoop-common-2.7.3.jar
-hadoop-common/org.apache.hadoop/2.7.3/tests/hadoop-common-2.7.3-tests.jar
hadoop-hdfs/org.apache.hadoop/2.7.3//hadoop-hdfs-2.7.3.jar
hadoop-hdfs/org.apache.hadoop/2.7.3/tests/hadoop-hdfs-2.7.3-tests.jar
hadoop-mapreduce-client-app/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-app-2.7.3.jar
@@ -87,9 +86,7 @@ jackson-annotations/com.fasterxml.jackson.core/2.6.7//jackson-annotations-2.6.7.
jackson-core-asl/org.codehaus.jackson/1.9.13//jackson-core-asl-1.9.13.jar
jackson-core/com.fasterxml.jackson.core/2.6.7//jackson-core-2.6.7.jar
jackson-databind/com.fasterxml.jackson.core/2.6.7.3//jackson-databind-2.6.7.3.jar
-jackson-jaxrs/org.codehaus.jackson/1.9.13//jackson-jaxrs-1.9.13.jar
jackson-mapper-asl/org.codehaus.jackson/1.9.13//jackson-mapper-asl-1.9.13.jar
-jackson-xc/org.codehaus.jackson/1.9.13//jackson-xc-1.9.13.jar
jamon-runtime/org.jamon/2.4.1//jamon-runtime-2.4.1.jar
java-xmlbuilder/com.jamesmurty.utils/0.4//java-xmlbuilder-0.4.jar
javax.inject/javax.inject/1//javax.inject-1.jar
@@ -108,8 +105,6 @@ jetty-util/org.mortbay.jetty/6.1.26//jetty-util-6.1.26.jar
jetty/org.mortbay.jetty/6.1.26//jetty-6.1.26.jar
joni/org.jruby.joni/2.1.2//joni-2.1.2.jar
jsch/com.jcraft/0.1.42//jsch-0.1.42.jar
-jsp-api/javax.servlet.jsp/2.1//jsp-api-2.1.jar
-jsr305/com.google.code.findbugs/3.0.0//jsr305-3.0.0.jar
junit/junit/4.12//junit-4.12.jar
kryo-shaded/com.esotericsoftware/4.0.2//kryo-shaded-4.0.2.jar
leveldbjni-all/org.fusesource.leveldbjni/1.8//leveldbjni-all-1.8.jar
@@ -133,7 +128,7 @@ protobuf-java/com.google.protobuf/2.5.0//protobuf-java-2.5.0.jar
rocksdbjni/org.rocksdb/5.17.2//rocksdbjni-5.17.2.jar
servlet-api/javax.servlet/2.5//servlet-api-2.5.jar
slf4j-api/org.slf4j/1.7.7//slf4j-api-1.7.7.jar
-slf4j-log4j12/org.slf4j/1.7.10//slf4j-log4j12-1.7.10.jar
+slf4j-log4j12/org.slf4j/1.6.1//slf4j-log4j12-1.6.1.jar
snappy-java/org.xerial.snappy/1.1.1.3//snappy-java-1.1.1.3.jar
xercesImpl/xerces/2.9.1//xercesImpl-2.9.1.jar
xml-apis/xml-apis/1.3.04//xml-apis-1.3.04.jar
diff --git a/dependencies/hudi-kafka-connect-bundle.txt b/dependencies/hudi-kafka-connect-bundle.txt
index 0a239b5..2c80186 100644
--- a/dependencies/hudi-kafka-connect-bundle.txt
+++ b/dependencies/hudi-kafka-connect-bundle.txt
@@ -99,7 +99,6 @@ hadoop-annotations/org.apache.hadoop/2.7.3//hadoop-annotations-2.7.3.jar
hadoop-auth/org.apache.hadoop/2.7.3//hadoop-auth-2.7.3.jar
hadoop-client/org.apache.hadoop/2.7.3//hadoop-client-2.7.3.jar
hadoop-common/org.apache.hadoop/2.7.3//hadoop-common-2.7.3.jar
-hadoop-common/org.apache.hadoop/2.7.3/tests/hadoop-common-2.7.3-tests.jar
hadoop-hdfs/org.apache.hadoop/2.7.3//hadoop-hdfs-2.7.3.jar
hadoop-hdfs/org.apache.hadoop/2.7.3/tests/hadoop-hdfs-2.7.3-tests.jar
hadoop-mapreduce-client-app/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-app-2.7.3.jar
@@ -224,7 +223,7 @@ parquet-encoding/org.apache.parquet/1.10.1//parquet-encoding-1.10.1.jar
parquet-format/org.apache.parquet/2.4.0//parquet-format-2.4.0.jar
parquet-hadoop/org.apache.parquet/1.10.1//parquet-hadoop-1.10.1.jar
parquet-jackson/org.apache.parquet/1.10.1//parquet-jackson-1.10.1.jar
-protobuf-java/com.google.protobuf/2.5.0//protobuf-java-2.5.0.jar
+protobuf-java/com.google.protobuf/3.17.3//protobuf-java-3.17.3.jar
py4j/net.sf.py4j/0.10.7//py4j-0.10.7.jar
pyrolite/net.razorvine/4.13//pyrolite-4.13.jar
reactive-streams/org.reactivestreams/1.0.2//reactive-streams-1.0.2.jar
diff --git a/dependencies/hudi-spark-bundle_2.11.txt b/dependencies/hudi-spark-bundle_2.11.txt
index 6c0e91d..543b0df 100644
--- a/dependencies/hudi-spark-bundle_2.11.txt
+++ b/dependencies/hudi-spark-bundle_2.11.txt
@@ -81,7 +81,6 @@ hadoop-annotations/org.apache.hadoop/2.7.3//hadoop-annotations-2.7.3.jar
hadoop-auth/org.apache.hadoop/2.7.3//hadoop-auth-2.7.3.jar
hadoop-client/org.apache.hadoop/2.7.3//hadoop-client-2.7.3.jar
hadoop-common/org.apache.hadoop/2.7.3//hadoop-common-2.7.3.jar
-hadoop-common/org.apache.hadoop/2.7.3/tests/hadoop-common-2.7.3-tests.jar
hadoop-hdfs/org.apache.hadoop/2.7.3//hadoop-hdfs-2.7.3.jar
hadoop-hdfs/org.apache.hadoop/2.7.3/tests/hadoop-hdfs-2.7.3-tests.jar
hadoop-mapreduce-client-app/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-app-2.7.3.jar
@@ -232,7 +231,7 @@ simpleclient_dropwizard/io.prometheus/0.8.0//simpleclient_dropwizard-0.8.0.jar
simpleclient_httpserver/io.prometheus/0.8.0//simpleclient_httpserver-0.8.0.jar
simpleclient_pushgateway/io.prometheus/0.8.0//simpleclient_pushgateway-0.8.0.jar
slf4j-api/org.slf4j/1.7.10//slf4j-api-1.7.10.jar
-slf4j-log4j12/org.slf4j/1.7.10//slf4j-log4j12-1.7.10.jar
+slf4j-log4j12/org.slf4j/1.6.1//slf4j-log4j12-1.6.1.jar
slider-core/org.apache.slider/0.90.2-incubating//slider-core-0.90.2-incubating.jar
snappy-java/org.xerial.snappy/1.1.2.6//snappy-java-1.1.2.6.jar
spark-avro_2.11/org.apache.spark/2.4.4//spark-avro_2.11-2.4.4.jar
diff --git a/dependencies/hudi-timeline-server-bundle.txt b/dependencies/hudi-timeline-server-bundle.txt
index b3ee776..e60d4c2 100644
--- a/dependencies/hudi-timeline-server-bundle.txt
+++ b/dependencies/hudi-timeline-server-bundle.txt
@@ -51,7 +51,6 @@ hadoop-annotations/org.apache.hadoop/2.7.3//hadoop-annotations-2.7.3.jar
hadoop-auth/org.apache.hadoop/2.7.3//hadoop-auth-2.7.3.jar
hadoop-client/org.apache.hadoop/2.7.3//hadoop-client-2.7.3.jar
hadoop-common/org.apache.hadoop/2.7.3//hadoop-common-2.7.3.jar
-hadoop-common/org.apache.hadoop/2.7.3/tests/hadoop-common-2.7.3-tests.jar
hadoop-hdfs/org.apache.hadoop/2.7.3//hadoop-hdfs-2.7.3.jar
hadoop-mapreduce-client-app/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-app-2.7.3.jar
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
diff --git a/dependencies/hudi-utilities-bundle_2.11.txt b/dependencies/hudi-utilities-bundle_2.11.txt
index 9e18881..3749da1 100644
--- a/dependencies/hudi-utilities-bundle_2.11.txt
+++ b/dependencies/hudi-utilities-bundle_2.11.txt
@@ -96,7 +96,6 @@ hadoop-annotations/org.apache.hadoop/2.7.3//hadoop-annotations-2.7.3.jar
hadoop-auth/org.apache.hadoop/2.7.3//hadoop-auth-2.7.3.jar
hadoop-client/org.apache.hadoop/2.7.3//hadoop-client-2.7.3.jar
hadoop-common/org.apache.hadoop/2.7.3//hadoop-common-2.7.3.jar
-hadoop-common/org.apache.hadoop/2.7.3/tests/hadoop-common-2.7.3-tests.jar
hadoop-hdfs/org.apache.hadoop/2.7.3//hadoop-hdfs-2.7.3.jar
hadoop-hdfs/org.apache.hadoop/2.7.3/tests/hadoop-hdfs-2.7.3-tests.jar
hadoop-mapreduce-client-app/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-app-2.7.3.jar
@@ -280,7 +279,7 @@ simpleclient_dropwizard/io.prometheus/0.8.0//simpleclient_dropwizard-0.8.0.jar
simpleclient_httpserver/io.prometheus/0.8.0//simpleclient_httpserver-0.8.0.jar
simpleclient_pushgateway/io.prometheus/0.8.0//simpleclient_pushgateway-0.8.0.jar
slf4j-api/org.slf4j/1.7.15//slf4j-api-1.7.15.jar
-slf4j-log4j12/org.slf4j/1.7.10//slf4j-log4j12-1.7.10.jar
+slf4j-log4j12/org.slf4j/1.6.1//slf4j-log4j12-1.6.1.jar
slider-core/org.apache.slider/0.90.2-incubating//slider-core-0.90.2-incubating.jar
snappy-java/org.xerial.snappy/1.1.7.1//snappy-java-1.1.7.1.jar
spark-core_2.11/org.apache.spark/2.4.4//spark-core_2.11-2.4.4.jar
diff --git a/hudi-client/hudi-client-common/pom.xml b/hudi-client/hudi-client-common/pom.xml
index e2b0eb8..537bf8a 100644
--- a/hudi-client/hudi-client-common/pom.xml
+++ b/hudi-client/hudi-client-common/pom.xml
@@ -130,6 +130,7 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
diff --git a/hudi-sync/hudi-hive-sync/pom.xml b/hudi-sync/hudi-hive-sync/pom.xml
index 8f4feda..358a784 100644
--- a/hudi-sync/hudi-hive-sync/pom.xml
+++ b/hudi-sync/hudi-hive-sync/pom.xml
@@ -90,6 +90,7 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml
index ec65996..011cf8d 100644
--- a/hudi-timeline-service/pom.xml
+++ b/hudi-timeline-service/pom.xml
@@ -143,6 +143,7 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<classifier>tests</classifier>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>