Try to fix Mima failures

apache · Aug 15, 2024 · 459fec6 · 459fec6
1 parent b945840
commit 459fec6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/dev/connect-jvm-client-mima-check b/dev/connect-jvm-client-mima-check
@@ -18,7 +18,7 @@
 #
 
 set -o pipefail
-set -e
+set -ex
 
 # Go to the Spark project root directory
 FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
@@ -35,10 +35,10 @@ fi
 rm -f .connect-mima-check-result
 
 echo "Build required modules..."
-build/sbt "sql/package;connect-client-jvm/package;connect-client-jvm/Test/package;avro/package;protobuf/assembly"
+build/sbt "-Popentelmetry-reporter sql/package;connect-client-jvm/package;connect-client-jvm/Test/package;avro/package;protobuf/assembly"
 
-CONNECT_TEST_CLASSPATH="$(build/sbt -DcopyDependencies=false "export connect-client-jvm/Test/fullClasspath" | grep jar | tail -n1)"
-SQL_CLASSPATH="$(build/sbt -DcopyDependencies=false "export sql/fullClasspath" | grep jar | tail -n1)"
+CONNECT_TEST_CLASSPATH="$(build/sbt -Popentelmetry-reporter -DcopyDependencies=false "export connect-client-jvm/Test/fullClasspath" | grep jar | tail -n1)"
+SQL_CLASSPATH="$(build/sbt -Popentelmetry-reporter -DcopyDependencies=false "export sql/fullClasspath" | grep jar | tail -n1)"
 
 echo "Do connect-client-jvm module mima check ..."
 

diff --git a/dev/mima b/dev/mima
@@ -18,14 +18,14 @@
 #
 
 set -o pipefail
-set -e
+set -ex
 
 # Go to the Spark project root directory
 FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
 cd "$FWDIR"
 
 SPARK_PROFILES=${1:-"-Pkubernetes -Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl -Phive-thriftserver -Phive -Popentelemetry-reporter"}
-TOOLS_CLASSPATH="$(build/sbt -DcopyDependencies=false "export tools/fullClasspath" | grep jar | tail -n1)"
+TOOLS_CLASSPATH="$(build/sbt -Popentelemetry-reporter -DcopyDependencies=false "export tools/fullClasspath" | grep jar | tail -n1)"
 OLD_DEPS_CLASSPATH="$(build/sbt -DcopyDependencies=false $SPARK_PROFILES "export oldDeps/fullClasspath" | grep jar | tail -n1)"
 
 rm -f .generated-mima*
@@ -42,7 +42,7 @@ $JAVA_CMD \
   -cp "$TOOLS_CLASSPATH:$OLD_DEPS_CLASSPATH" \
   org.apache.spark.tools.GenerateMIMAIgnore
 
-echo -e "q\n" | build/sbt -mem 5632 -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving"
+echo -e "q\n" | build/sbt -mem 5632 -Popentelemetry-reporter -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving"
 ret_val=$?
 
 if [ $ret_val != 0 ]; then

diff --git a/docs/_plugins/build_api_docs.rb b/docs/_plugins/build_api_docs.rb
@@ -123,7 +123,7 @@ def build_scala_and_java_docs
   print_header "Building Scala and Java API docs."
   cd(SPARK_PROJECT_ROOT)
 
-  command = "build/sbt -Pkinesis-asl unidoc"
+  command = "build/sbt -Pkinesis-asl -Popentelemetry-reporter unidoc"
   puts "Running '#{command}'..."
   system(command) || raise("Unidoc generation failed")