From 2b36b0c9980168f238f1d914c885bac3b2726ba6 Mon Sep 17 00:00:00 2001
From: YanxuanLiu <yanxuanl@nvidia.com>
Date: Wed, 24 Jul 2024 16:50:31 +0800
Subject: [PATCH 1/2] remove meta-inf folder

Signed-off-by: YanxuanLiu <yanxuanl@nvidia.com>
---
 build/coverage-report | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/coverage-report b/build/coverage-report
index ddde86b6aea..c073eef446e 100755
--- a/build/coverage-report
+++ b/build/coverage-report
@@ -37,7 +37,11 @@ jar xf "$DIST_JAR" com org rapids spark-shared "spark${SPK_VER}/"
 # extract the .class files in udf jar and replace the existing ones in spark3xx-ommon and spark$SPK_VER
 # because the class files in udf jar will be modified in aggregator's shade phase
 jar xf "$UDF_JAR" com/nvidia/spark/udf
-rm -rf com/nvidia/shaded/ org/openucx/ spark-shared/com/nvidia/spark/udf/ spark${SPK_VER}/com/nvidia/spark/udf/
+rm -rf com/nvidia/shaded/ \
+  org/openucx/ \
+  spark3xx-common/com/nvidia/spark/udf/ \
+  spark${SPK_VER}/com/nvidia/spark/udf/ \
+  spark${SPK_VER}/META-INF/versions/*
 popd
 
 if [ ! -f "$JDEST" ]; then

From f84af928e093e258701a79756f3e64f2e490f84f Mon Sep 17 00:00:00 2001
From: YanxuanLiu <yanxuanl@nvidia.com>
Date: Thu, 25 Jul 2024 01:38:28 +0800
Subject: [PATCH 2/2] optimize script structure

Signed-off-by: YanxuanLiu <yanxuanl@nvidia.com>
---
 build/coverage-report | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/build/coverage-report b/build/coverage-report
index c073eef446e..2044ddf3996 100755
--- a/build/coverage-report
+++ b/build/coverage-report
@@ -17,33 +17,32 @@
 #
 
 set -e
-JVER=${JACOCO_VERSION:-"0.8.5"}
-JDEST=${JACOCO_DEST:-"./target/jacococli.jar"}
-TMP_CLASS=${TEMP_CLASS_LOC:-"./target/jacoco_classes/"}
-HTML_LOC=${HTML_LOCATION:="./target/jacoco-report/"}
-XML_LOC=${XML_LOCATION:="${HTML_LOC}"}
-DIST_JAR=${RAPIDS_DIST_JAR:-$(ls ./dist/target/rapids-4-spark_2.12-*cuda*.jar | grep -v test | head -1 | xargs readlink -f)}
 SPK_VER=${JACOCO_SPARK_VER:-"320"}
-UDF_JAR=${RAPIDS_UDF_JAR:-$(ls ./udf-compiler/target/spark${SPK_VER}/rapids-4-spark-udf_2.12-*-SNAPSHOT-spark${SPK_VER}.jar | grep -v test | head -1 | xargs readlink -f)}
-SOURCE_DIRS=${SOURCE_DIRS:-"./sql-plugin/src/main/scala/:./sql-plugin/src/main/java/:./shuffle-plugin/src/main/scala/:./udf-compiler/src/main/scala/"}
-
-SOURCE_WITH_ARGS="--sourcefiles "$(echo $SOURCE_DIRS | sed -e 's/:/ --sourcefiles /g')
-
+TMP_CLASS=${TEMP_CLASS_LOC:-"./target/jacoco_classes/"}
 # Clean up the classes so we can build the report cleanly
 rm -rf "$TMP_CLASS"
 mkdir -p "$TMP_CLASS"
+DIST_JAR=${RAPIDS_DIST_JAR:-$(ls ./dist/target/rapids-4-spark_2.12-*cuda*.jar | grep -v test | head -1 | xargs readlink -f)}
+UDF_JAR=${RAPIDS_UDF_JAR:-$(ls ./udf-compiler/target/spark${SPK_VER}/rapids-4-spark-udf_2.12-*-spark${SPK_VER}.jar | grep -v test | head -1 | xargs readlink -f)}
 pushd "$TMP_CLASS"
 jar xf "$DIST_JAR" com org rapids spark-shared "spark${SPK_VER}/"
 # extract the .class files in udf jar and replace the existing ones in spark3xx-ommon and spark$SPK_VER
 # because the class files in udf jar will be modified in aggregator's shade phase
 jar xf "$UDF_JAR" com/nvidia/spark/udf
 rm -rf com/nvidia/shaded/ \
-  org/openucx/ \
-  spark3xx-common/com/nvidia/spark/udf/ \
+  org/openucx/ spark-shared/com/nvidia/spark/udf/ \
   spark${SPK_VER}/com/nvidia/spark/udf/ \
   spark${SPK_VER}/META-INF/versions/*
 popd
 
+
+JVER=${JACOCO_VERSION:-"0.8.8"}
+JDEST=${JACOCO_DEST:-"./target/jacococli.jar"}
+HTML_LOC=${HTML_LOCATION:="./target/jacoco-report/"}
+XML_LOC=${XML_LOCATION:="${HTML_LOC}"}
+SOURCE_DIRS=${SOURCE_DIRS:-"./sql-plugin/src/main/scala/:./sql-plugin/src/main/java/:./shuffle-plugin/src/main/scala/:./udf-compiler/src/main/scala/"}
+SOURCE_WITH_ARGS="--sourcefiles "$(echo $SOURCE_DIRS | sed -e 's/:/ --sourcefiles /g')
+
 if [ ! -f "$JDEST" ]; then
   # get the jacoco jar
   mvn dependency:get -DgroupId=org.jacoco -DartifactId=org.jacoco.cli -Dclassifier=nodeps -Dversion="$JVER" -Ddest="$JDEST"