From bd27713206af6d60f1feee0752ab0647233c35a9 Mon Sep 17 00:00:00 2001 From: Tim Liu Date: Fri, 12 Jul 2024 15:24:45 +0800 Subject: [PATCH] Clean up unused and duplicated 'org/roaringbitmap' folder To fix: https://github.com/NVIDIA/spark-rapids/issues/11175 Clean up unused and duplicated 'org/roaringbitmap' in the spark320 shim folder to work around for the JACOCO error 'different class with same name', after we drop 31x shims and change the default shim to spark320 Signed-off-by: Tim Liu --- jenkins/spark-premerge-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/spark-premerge-build.sh b/jenkins/spark-premerge-build.sh index bf33b8d65c99..9cd1664af9f2 100755 --- a/jenkins/spark-premerge-build.sh +++ b/jenkins/spark-premerge-build.sh @@ -92,7 +92,8 @@ mvn_verify() { # 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/ + # TODO Should clean up unused and duplicated 'org/roaringbitmap' in the spark3xx shim folders, https://github.com/NVIDIA/spark-rapids/issues/11175 + rm -rf com/nvidia/shaded/ org/openucx/ spark${SPK_VER}/META-INF/versions/*/org/roaringbitmap/ spark-shared/com/nvidia/spark/udf/ spark${SPK_VER}/com/nvidia/spark/udf/ popd # Triggering here until we change the jenkins file