[hudi] branch master updated: [HUDI-5596] Fix hudi-cli-bundle startup issue with gson (#7728)

[yihua]

This is an automated email from the ASF dual-hosted git repository.

yihua 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 1d28d51d00c [HUDI-5596] Fix hudi-cli-bundle startup issue with gson 
(#7728)
1d28d51d00c is described below

commit 1d28d51d00c8ef88ebe75dc137c1d75c5f29166e
Author: Rahil C <32500120+rahi...@users.noreply.github.com>
AuthorDate: Sun Jan 22 21:37:39 2023 -0800

    [HUDI-5596] Fix hudi-cli-bundle startup issue with gson (#7728)
    
    Co-authored-by: Rahil Chertara <rcher...@amazon.com>
---
 hudi-cli/src/main/java/org/apache/hudi/cli/Main.java | 2 +-
 packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hudi-cli/src/main/java/org/apache/hudi/cli/Main.java 
b/hudi-cli/src/main/java/org/apache/hudi/cli/Main.java
index e9870780019..08c6ab47776 100644
--- a/hudi-cli/src/main/java/org/apache/hudi/cli/Main.java
+++ b/hudi-cli/src/main/java/org/apache/hudi/cli/Main.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 /**
  * Main class that delegates to Spring Shell's Bootstrap class in order to 
simplify debugging inside an IDE.
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = 
{org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration.class})
 public class Main {
 
   public static void main(String[] args) throws IOException {
diff --git a/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh 
b/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh
index 361e5962fab..725104b1d2a 100755
--- a/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh
+++ b/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh
@@ -40,5 +40,5 @@ if [ -z "$CLIENT_JAR" ]; then
   echo "Client jar location not set, please set it in conf/hudi-env.sh"
 fi
 
-echo "Running : java -cp 
${HUDI_AUX_LIB}/*:${SPARK_HOME}/*:${SPARK_HOME}/jars/*:${HUDI_CONF_DIR}:${HUDI_AUX_LIB}/*:${HADOOP_CONF_DIR}:${SPARK_CONF_DIR}:${CLI_BUNDLE_JAR}:${SPARK_BUNDLE_JAR}:${CLIENT_JAR}
 -DSPARK_CONF_DIR=${SPARK_CONF_DIR} -DHADOOP_CONF_DIR=${HADOOP_CONF_DIR} 
org.apache.hudi.cli.Main $@"
+echo "Running : java -cp 
${HUDI_AUX_LIB}/*:${SPARK_HOME}/*:${SPARK_HOME}/jars/*:${HUDI_CONF_DIR}:${HADOOP_CONF_DIR}:${SPARK_CONF_DIR}:${CLI_BUNDLE_JAR}:${SPARK_BUNDLE_JAR}:${CLIENT_JAR}
 -DSPARK_CONF_DIR=${SPARK_CONF_DIR} -DHADOOP_CONF_DIR=${HADOOP_CONF_DIR} 
org.apache.hudi.cli.Main $@"
 java -cp 
${HUDI_AUX_LIB}/*:${SPARK_HOME}/*:${SPARK_HOME}/jars/*:${HUDI_CONF_DIR}:${HADOOP_CONF_DIR}:${SPARK_CONF_DIR}:${CLI_BUNDLE_JAR}:${SPARK_BUNDLE_JAR}:${CLIENT_JAR}
 -DSPARK_CONF_DIR=${SPARK_CONF_DIR} -DHADOOP_CONF_DIR=${HADOOP_CONF_DIR} 
org.apache.hudi.cli.Main $@