diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/HiveUtil.java b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/HiveUtil.java
index d0eaff806..4b4a44aa6 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/HiveUtil.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/HiveUtil.java
@@ -38,11 +38,8 @@ public class HiveUtil {
     }
   }
 
-  private static Connection connection;
-
   private static Connection getConnection(String jdbcUrl, String user, String pass) throws SQLException {
-    connection = DriverManager.getConnection(jdbcUrl, user, pass);
-    return connection;
+    return DriverManager.getConnection(jdbcUrl, user, pass);
   }
 
   public static long countRecords(String jdbcUrl, HoodieTableMetaClient source, String dbName, String user, String pass)
diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java
index 8dc221648..06e06af0a 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/utils/SparkUtil.java
@@ -43,7 +43,7 @@ public class SparkUtil {
     SparkLauncher sparkLauncher = new SparkLauncher().setAppResource(currentJar)
         .setMainClass(SparkMain.class.getName());
 
-    if (!StringUtils.isEmpty(propertiesFile)) {
+    if (!StringUtils.isNullOrEmpty(propertiesFile)) {
       sparkLauncher.setPropertiesFile(propertiesFile);
     }
 
diff --git a/hudi-common/src/main/java/org/apache/hudi/common/util/StringUtils.java b/hudi-common/src/main/java/org/apache/hudi/common/util/StringUtils.java
index 5fd45b8c3..a4169b6b2 100644
--- a/hudi-common/src/main/java/org/apache/hudi/common/util/StringUtils.java
+++ b/hudi-common/src/main/java/org/apache/hudi/common/util/StringUtils.java
@@ -62,7 +62,7 @@ public class StringUtils {
     return sb.toString();
   }
 
-  public static boolean isEmpty(String str) {
+  public static boolean isNullOrEmpty(String str) {
     return str == null || str.length() == 0;
   }
 }
diff --git a/hudi-hive/run_sync_tool.sh b/hudi-hive/run_sync_tool.sh
index 60cc661ff..81b01d309 100755
--- a/hudi-hive/run_sync_tool.sh
+++ b/hudi-hive/run_sync_tool.sh
@@ -49,7 +49,7 @@ if [ -z "${HIVE_JDBC}" ]; then
   HIVE_JDBC=`ls ${HIVE_HOME}/lib/hive-jdbc-*.jar | grep -v handler | tr '\n' ':'`
 fi
 HIVE_JACKSON=`ls ${HIVE_HOME}/lib/jackson-*.jar | tr '\n' ':'`
-HIVE_JARS=$HIVE_METASTORE:$HIVE_SERVICE:$HIVE_EXEC:$HIVE_SERVICE:$HIVE_JDBC:$HIVE_JACKSON
+HIVE_JARS=$HIVE_METASTORE:$HIVE_SERVICE:$HIVE_EXEC:$HIVE_JDBC:$HIVE_JACKSON
 
 HADOOP_HIVE_JARS=${HIVE_JARS}:${HADOOP_HOME}/share/hadoop/common/*:${HADOOP_HOME}/share/hadoop/mapreduce/*:${HADOOP_HOME}/share/hadoop/hdfs/*:${HADOOP_HOME}/share/hadoop/common/lib/*:${HADOOP_HOME}/share/hadoop/hdfs/lib/*
 
diff --git a/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java b/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
index 92667d8ce..533c29b5e 100644
--- a/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
+++ b/hudi-hive/src/main/java/org/apache/hudi/hive/HoodieHiveClient.java
@@ -33,7 +33,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import jline.internal.Log;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.conf.HiveConf;
@@ -474,7 +473,7 @@ public class HoodieHiveClient {
       try {
         Class.forName(HiveDriver.class.getCanonicalName());
       } catch (ClassNotFoundException e) {
-        Log.error("Unable to load Hive driver class", e);
+        LOG.error("Unable to load Hive driver class", e);
         return;
       }
 
diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml
index d36d3a63c..14dd192a1 100644
--- a/packaging/hudi-spark-bundle/pom.xml
+++ b/packaging/hudi-spark-bundle/pom.xml
@@ -173,6 +173,7 @@
                     <!-- Use this jar's NOTICE and license file -->
                     <exclude>META-INF/NOTICE*</exclude>
                     <exclude>META-INF/LICENSE*</exclude>
+                    <exclude>META-INF/services/javax.*</exclude>
                   </excludes>
                 </filter>
               </filters>
diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml
index bf992da14..3060bdfc1 100644
--- a/packaging/hudi-utilities-bundle/pom.xml
+++ b/packaging/hudi-utilities-bundle/pom.xml
@@ -148,6 +148,7 @@
                     <!-- Use this jar's NOTICE and license file -->
                     <exclude>META-INF/NOTICE*</exclude>
                     <exclude>META-INF/LICENSE*</exclude>
+                    <exclude>META-INF/services/javax.*</exclude>
                   </excludes>
                 </filter>
               </filters>