diff --git a/dependencies/hudi-flink-bundle_2.11.txt b/dependencies/hudi-flink-bundle_2.11.txt
index 4414594ac..9252d0a4f 100644
--- a/dependencies/hudi-flink-bundle_2.11.txt
+++ b/dependencies/hudi-flink-bundle_2.11.txt
@@ -116,7 +116,6 @@ 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-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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
diff --git a/dependencies/hudi-flink-bundle_2.12.txt b/dependencies/hudi-flink-bundle_2.12.txt
index 8f62f450d..84eacdc84 100644
--- a/dependencies/hudi-flink-bundle_2.12.txt
+++ b/dependencies/hudi-flink-bundle_2.12.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
@@ -108,6 +108,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
@@ -115,9 +116,7 @@ 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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
@@ -133,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
@@ -164,10 +163,10 @@ htrace-core/org.apache.htrace/3.1.0-incubating//htrace-core-3.1.0-incubating.jar
httpclient/org.apache.httpcomponents/4.4.1//httpclient-4.4.1.jar
httpcore/org.apache.httpcomponents/4.4.1//httpcore-4.4.1.jar
ivy/org.apache.ivy/2.4.0//ivy-2.4.0.jar
-jackson-annotations/com.fasterxml.jackson.core/2.10.0//jackson-annotations-2.10.0.jar
+jackson-annotations/com.fasterxml.jackson.core/2.6.7//jackson-annotations-2.6.7.jar
jackson-core-asl/org.codehaus.jackson/1.9.13//jackson-core-asl-1.9.13.jar
-jackson-core/com.fasterxml.jackson.core/2.10.0//jackson-core-2.10.0.jar
-jackson-databind/com.fasterxml.jackson.core/2.10.0//jackson-databind-2.10.0.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
diff --git a/dependencies/hudi-hive-sync-bundle.txt b/dependencies/hudi-hive-sync-bundle.txt
index f80ee31f0..3c3c23002 100644
--- a/dependencies/hudi-hive-sync-bundle.txt
+++ b/dependencies/hudi-hive-sync-bundle.txt
@@ -57,7 +57,6 @@ 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-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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
@@ -101,8 +100,6 @@ jersey-json/com.sun.jersey/1.9//jersey-json-1.9.jar
jersey-server/com.sun.jersey/1.9//jersey-server-1.9.jar
jets3t/net.java.dev.jets3t/0.9.0//jets3t-0.9.0.jar
jettison/org.codehaus.jettison/1.1//jettison-1.1.jar
-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
junit/junit/4.12//junit-4.12.jar
@@ -112,7 +109,6 @@ log4j/log4j/1.2.17//log4j-1.2.17.jar
metrics-core/com.yammer.metrics/2.2.0//metrics-core-2.2.0.jar
minlog/com.esotericsoftware/1.3.0//minlog-1.3.0.jar
netty-all/io.netty/4.0.23.Final//netty-all-4.0.23.Final.jar
-netty/io.netty/3.6.2.Final//netty-3.6.2.Final.jar
objenesis/org.objenesis/2.5.1//objenesis-2.5.1.jar
orc-core/org.apache.orc/1.6.0/nohive/orc-core-1.6.0-nohive.jar
orc-shims/org.apache.orc/1.6.0//orc-shims-1.6.0.jar
@@ -126,7 +122,6 @@ 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
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.6.1//slf4j-log4j12-1.6.1.jar
snappy-java/org.xerial.snappy/1.1.1.3//snappy-java-1.1.1.3.jar
diff --git a/dependencies/hudi-integ-test-bundle.txt b/dependencies/hudi-integ-test-bundle.txt
index 12cac70db..8e3fc3afe 100644
--- a/dependencies/hudi-integ-test-bundle.txt
+++ b/dependencies/hudi-integ-test-bundle.txt
@@ -15,7 +15,6 @@
# limitations under the License.
#
-../va.JavaVirtualMachines.jdk1.8.0_211.jdk.Contents.Home.jre/lib//tools.jar
HikariCP/com.zaxxer/2.5.1//HikariCP-2.5.1.jar
RoaringBitmap/org.roaringbitmap/0.7.45//RoaringBitmap-0.7.45.jar
ST4/org.antlr/4.0.4//ST4-4.0.4.jar
@@ -47,14 +46,17 @@ avro-mapred/org.apache.avro/1.8.2/hadoop2/avro-mapred-1.8.2-hadoop2.jar
avro/org.apache.avro/1.8.2//avro-1.8.2.jar
aws-java-sdk-core/com.amazonaws/1.12.22//aws-java-sdk-core-1.12.22.jar
aws-java-sdk-sqs/com.amazonaws/1.12.22//aws-java-sdk-sqs-1.12.22.jar
-bijection-avro_2.11/com.twitter/0.9.3//bijection-avro_2.11-0.9.3.jar
-bijection-core_2.11/com.twitter/0.9.3//bijection-core_2.11-0.9.3.jar
+bijection-avro_2.11/com.twitter/0.9.7//bijection-avro_2.11-0.9.7.jar
+bijection-avro_2.12/com.twitter/0.9.3//bijection-avro_2.12-0.9.3.jar
+bijection-core_2.11/com.twitter/0.9.7//bijection-core_2.11-0.9.7.jar
+bijection-core_2.12/com.twitter/0.9.3//bijection-core_2.12-0.9.3.jar
bonecp/com.jolbox/0.8.0.RELEASE//bonecp-0.8.0.RELEASE.jar
calcite-core/org.apache.calcite/1.10.0//calcite-core-1.10.0.jar
calcite-druid/org.apache.calcite/1.10.0//calcite-druid-1.10.0.jar
calcite-linq4j/org.apache.calcite/1.10.0//calcite-linq4j-1.10.0.jar
chill-java/com.twitter/0.9.3//chill-java-0.9.3.jar
chill_2.11/com.twitter/0.9.3//chill_2.11-0.9.3.jar
+chill_2.12/com.twitter/0.9.3//chill_2.12-0.9.3.jar
common-config/io.confluent/5.3.4//common-config-5.3.4.jar
common-utils/io.confluent/5.3.4//common-utils-5.3.4.jar
commons-beanutils-core/commons-beanutils/1.8.0//commons-beanutils-core-1.8.0.jar
@@ -170,6 +172,7 @@ 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-module-paranamer/com.fasterxml.jackson.module/2.7.9//jackson-module-paranamer-2.7.9.jar
jackson-module-scala_2.11/com.fasterxml.jackson.module/2.6.7.1//jackson-module-scala_2.11-2.6.7.1.jar
+jackson-module-scala_2.12/com.fasterxml.jackson.module/2.6.7.1//jackson-module-scala_2.12-2.6.7.1.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
janino/org.codehaus.janino/2.7.6//janino-2.7.6.jar
@@ -226,9 +229,13 @@ jpam/net.sf.jpam/1.1//jpam-1.1.jar
jsch/com.jcraft/0.1.42//jsch-0.1.42.jar
json/com.tdunning/1.8//json-1.8.jar
json4s-ast_2.11/org.json4s/3.5.3//json4s-ast_2.11-3.5.3.jar
+json4s-ast_2.12/org.json4s/3.5.3//json4s-ast_2.12-3.5.3.jar
json4s-core_2.11/org.json4s/3.5.3//json4s-core_2.11-3.5.3.jar
+json4s-core_2.12/org.json4s/3.5.3//json4s-core_2.12-3.5.3.jar
json4s-jackson_2.11/org.json4s/3.5.3//json4s-jackson_2.11-3.5.3.jar
+json4s-jackson_2.12/org.json4s/3.5.3//json4s-jackson_2.12-3.5.3.jar
json4s-scalap_2.11/org.json4s/3.5.3//json4s-scalap_2.11-3.5.3.jar
+json4s-scalap_2.12/org.json4s/3.5.3//json4s-scalap_2.12-3.5.3.jar
jsp-api/javax.servlet.jsp/2.1//jsp-api-2.1.jar
jsp-api/javax.servlet/2.0//jsp-api-2.0.jar
jsr305/com.google.code.findbugs/3.0.0//jsr305-3.0.0.jar
@@ -283,11 +290,11 @@ protobuf-java/com.google.protobuf/2.5.0//protobuf-java-2.5.0.jar
py4j/net.sf.py4j/0.10.7//py4j-0.10.7.jar
pyrolite/net.razorvine/4.13//pyrolite-4.13.jar
rocksdbjni/org.rocksdb/5.17.2//rocksdbjni-5.17.2.jar
-scala-library/org.scala-lang/2.11.8//scala-library-2.11.8.jar
-scala-parser-combinators_2.11/org.scala-lang.modules/1.1.0//scala-parser-combinators_2.11-1.1.0.jar
-scala-reflect/org.scala-lang/2.11.8//scala-reflect-2.11.8.jar
+scala-library/org.scala-lang/2.12.1//scala-library-2.12.1.jar
+scala-parser-combinators_2.12/org.scala-lang.modules/1.1.0//scala-parser-combinators_2.12-1.1.0.jar
+scala-reflect/org.scala-lang/2.12.1//scala-reflect-2.12.1.jar
scala-xml_2.11/org.scala-lang.modules/1.0.6//scala-xml_2.11-1.0.6.jar
-scalac-scoverage-runtime_2.11/org.scoverage/1.3.0//scalac-scoverage-runtime_2.11-1.3.0.jar
+scala-xml_2.12/org.scala-lang.modules/1.0.6//scala-xml_2.12-1.0.6.jar
servlet-api/javax.servlet/2.5//servlet-api-2.5.jar
servlet-api/org.mortbay.jetty/2.5-20081211//servlet-api-2.5-20081211.jar
shims/org.roaringbitmap/0.7.45//shims-0.7.45.jar
@@ -301,19 +308,28 @@ slf4j-log4j12/org.slf4j/1.7.10//slf4j-log4j12-1.7.10.jar
slider-core/org.apache.slider/0.90.2-incubating//slider-core-0.90.2-incubating.jar
snakeyaml/org.yaml/1.15//snakeyaml-1.15.jar
snappy-java/org.xerial.snappy/1.1.7.3//snappy-java-1.1.7.3.jar
-spark-catalyst_2.11/org.apache.spark/2.4.4//spark-catalyst_2.11-2.4.4.jar
+spark-catalyst_2.12/org.apache.spark/2.4.4//spark-catalyst_2.12-2.4.4.jar
spark-core_2.11/org.apache.spark/2.4.4//spark-core_2.11-2.4.4.jar
+spark-core_2.12/org.apache.spark/2.4.4//spark-core_2.12-2.4.4.jar
spark-kvstore_2.11/org.apache.spark/2.4.4//spark-kvstore_2.11-2.4.4.jar
+spark-kvstore_2.12/org.apache.spark/2.4.4//spark-kvstore_2.12-2.4.4.jar
spark-launcher_2.11/org.apache.spark/2.4.4//spark-launcher_2.11-2.4.4.jar
+spark-launcher_2.12/org.apache.spark/2.4.4//spark-launcher_2.12-2.4.4.jar
spark-network-common_2.11/org.apache.spark/2.4.4//spark-network-common_2.11-2.4.4.jar
+spark-network-common_2.12/org.apache.spark/2.4.4//spark-network-common_2.12-2.4.4.jar
spark-network-shuffle_2.11/org.apache.spark/2.4.4//spark-network-shuffle_2.11-2.4.4.jar
-spark-sketch_2.11/org.apache.spark/2.4.4//spark-sketch_2.11-2.4.4.jar
-spark-sql_2.11/org.apache.spark/2.4.4//spark-sql_2.11-2.4.4.jar
+spark-network-shuffle_2.12/org.apache.spark/2.4.4//spark-network-shuffle_2.12-2.4.4.jar
+spark-sketch_2.12/org.apache.spark/2.4.4//spark-sketch_2.12-2.4.4.jar
+spark-sql_2.12/org.apache.spark/2.4.4//spark-sql_2.12-2.4.4.jar
spark-streaming-kafka-0-10_2.11/org.apache.spark/2.4.4//spark-streaming-kafka-0-10_2.11-2.4.4.jar
spark-streaming-kafka-0-10_2.11/org.apache.spark/2.4.4/tests/spark-streaming-kafka-0-10_2.11-2.4.4-tests.jar
+spark-streaming-kafka-0-10_2.12/org.apache.spark/2.4.4//spark-streaming-kafka-0-10_2.12-2.4.4.jar
spark-streaming_2.11/org.apache.spark/2.4.4//spark-streaming_2.11-2.4.4.jar
+spark-streaming_2.12/org.apache.spark/2.4.4//spark-streaming_2.12-2.4.4.jar
spark-tags_2.11/org.apache.spark/2.4.4//spark-tags_2.11-2.4.4.jar
+spark-tags_2.12/org.apache.spark/2.4.4//spark-tags_2.12-2.4.4.jar
spark-unsafe_2.11/org.apache.spark/2.4.4//spark-unsafe_2.11-2.4.4.jar
+spark-unsafe_2.12/org.apache.spark/2.4.4//spark-unsafe_2.12-2.4.4.jar
stax-api/stax/1.0.1//stax-api-1.0.1.jar
stream/com.clearspring.analytics/2.7.0//stream-2.7.0.jar
stringtemplate/org.antlr/4.0.2//stringtemplate-4.0.2.jar
diff --git a/dependencies/hudi-kafka-connect-bundle.txt b/dependencies/hudi-kafka-connect-bundle.txt
index 2c80186fd..c46a2a10b 100644
--- a/dependencies/hudi-kafka-connect-bundle.txt
+++ b/dependencies/hudi-kafka-connect-bundle.txt
@@ -100,7 +100,6 @@ 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-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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
diff --git a/dependencies/hudi-spark-bundle_2.11.txt b/dependencies/hudi-spark-bundle_2.11.txt
index 543b0df65..3627d5a5f 100644
--- a/dependencies/hudi-spark-bundle_2.11.txt
+++ b/dependencies/hudi-spark-bundle_2.11.txt
@@ -82,7 +82,6 @@ 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-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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
diff --git a/dependencies/hudi-spark-bundle_2.12.txt b/dependencies/hudi-spark-bundle_2.12.txt
index 9ec8db5ff..f89827c6c 100644
--- a/dependencies/hudi-spark-bundle_2.12.txt
+++ b/dependencies/hudi-spark-bundle_2.12.txt
@@ -81,9 +81,7 @@ 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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
@@ -232,7 +230,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.12/org.apache.spark/2.4.4//spark-avro_2.12-2.4.4.jar
diff --git a/dependencies/hudi-spark3-bundle_2.12.txt b/dependencies/hudi-spark3-bundle_2.12.txt
index 9eca77f3f..13615da53 100644
--- a/dependencies/hudi-spark3-bundle_2.12.txt
+++ b/dependencies/hudi-spark3-bundle_2.12.txt
@@ -81,9 +81,7 @@ 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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
@@ -232,7 +230,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.12/org.apache.spark/3.0.0//spark-avro_2.12-3.0.0.jar
diff --git a/dependencies/hudi-utilities-bundle_2.11.txt b/dependencies/hudi-utilities-bundle_2.11.txt
index 3749da1da..673108541 100644
--- a/dependencies/hudi-utilities-bundle_2.11.txt
+++ b/dependencies/hudi-utilities-bundle_2.11.txt
@@ -97,7 +97,6 @@ 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-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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
diff --git a/dependencies/hudi-utilities-bundle_2.12.txt b/dependencies/hudi-utilities-bundle_2.12.txt
index 540c8b40b..673108541 100644
--- a/dependencies/hudi-utilities-bundle_2.12.txt
+++ b/dependencies/hudi-utilities-bundle_2.12.txt
@@ -96,9 +96,7 @@ 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
hadoop-mapreduce-client-common/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-common-2.7.3.jar
hadoop-mapreduce-client-core/org.apache.hadoop/2.7.3//hadoop-mapreduce-client-core-2.7.3.jar
@@ -149,10 +147,10 @@ httpclient/org.apache.httpcomponents/4.4.1//httpclient-4.4.1.jar
httpcore/org.apache.httpcomponents/4.4.1//httpcore-4.4.1.jar
ion-java/software.amazon.ion/1.0.2//ion-java-1.0.2.jar
ivy/org.apache.ivy/2.4.0//ivy-2.4.0.jar
-jackson-annotations/com.fasterxml.jackson.core/2.10.0//jackson-annotations-2.10.0.jar
+jackson-annotations/com.fasterxml.jackson.core/2.6.7//jackson-annotations-2.6.7.jar
jackson-core-asl/org.codehaus.jackson/1.9.13//jackson-core-asl-1.9.13.jar
-jackson-core/com.fasterxml.jackson.core/2.10.0//jackson-core-2.10.0.jar
-jackson-databind/com.fasterxml.jackson.core/2.10.0//jackson-databind-2.10.0.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-dataformat-cbor/com.fasterxml.jackson.dataformat/2.12.3//jackson-dataformat-cbor-2.12.3.jar
jackson-dataformat-csv/com.fasterxml.jackson.dataformat/2.6.7//jackson-dataformat-csv-2.6.7.jar
jackson-jaxrs/org.codehaus.jackson/1.9.13//jackson-jaxrs-1.9.13.jar
@@ -280,7 +278,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 537bf8a17..c67621fbb 100644
--- a/hudi-client/hudi-client-common/pom.xml
+++ b/hudi-client/hudi-client-common/pom.xml
@@ -110,6 +110,7 @@
org.apache.hadoop
hadoop-hdfs
tests
+ test
diff --git a/hudi-client/hudi-java-client/pom.xml b/hudi-client/hudi-java-client/pom.xml
index 8dfb476f0..af97f68f3 100644
--- a/hudi-client/hudi-java-client/pom.xml
+++ b/hudi-client/hudi-java-client/pom.xml
@@ -121,6 +121,28 @@
junit-platform-commons
test
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ tests
+ test
+
+
+
+ org.mortbay.jetty
+ *
+
+
+ javax.servlet.jsp
+ *
+
+
+ javax.servlet
+ *
+
+
+
diff --git a/hudi-integ-test/pom.xml b/hudi-integ-test/pom.xml
index e0026e438..c697d6cc0 100644
--- a/hudi-integ-test/pom.xml
+++ b/hudi-integ-test/pom.xml
@@ -304,6 +304,7 @@
org.apache.hadoop
hadoop-hdfs
tests
+ test
javax.servlet
diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml
index c4fe1d109..e7f521156 100644
--- a/hudi-spark-datasource/hudi-spark/pom.xml
+++ b/hudi-spark-datasource/hudi-spark/pom.xml
@@ -503,5 +503,27 @@
test
+
+ org.apache.hadoop
+ hadoop-hdfs
+ tests
+ test
+
+
+
+ org.mortbay.jetty
+ *
+
+
+ javax.servlet.jsp
+ *
+
+
+ javax.servlet
+ *
+
+
+
+
diff --git a/hudi-sync/hudi-hive-sync/pom.xml b/hudi-sync/hudi-hive-sync/pom.xml
index 358a78489..a094b5d13 100644
--- a/hudi-sync/hudi-hive-sync/pom.xml
+++ b/hudi-sync/hudi-hive-sync/pom.xml
@@ -96,6 +96,7 @@
org.apache.hadoop
hadoop-hdfs
tests
+ test
diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml
index 3207fb894..7518e7b44 100644
--- a/packaging/hudi-integ-test-bundle/pom.xml
+++ b/packaging/hudi-integ-test-bundle/pom.xml
@@ -353,6 +353,7 @@
org.apache.hadoop
hadoop-hdfs
tests
+ test
org.apache.hadoop
diff --git a/pom.xml b/pom.xml
index dcfe6cfa3..c146cb565 100644
--- a/pom.xml
+++ b/pom.xml
@@ -783,6 +783,7 @@
org.apache.hadoop
hadoop-hdfs
tests
+ test
${hadoop.version}