diff --git a/aggregator/pom.xml b/aggregator/pom.xml index 1dd0fdf6168..470bc93f6e8 100644 --- a/aggregator/pom.xml +++ b/aggregator/pom.xml @@ -30,7 +30,11 @@ 21.10.0-SNAPSHOT - com.nvidia.shaded.${spark.version.classifier}.spark + + com.nvidia.shaded.spark diff --git a/dist/scripts/binary-dedupe.sh b/dist/scripts/binary-dedupe.sh index 2e9dc35efb6..882831e354b 100755 --- a/dist/scripts/binary-dedupe.sh +++ b/dist/scripts/binary-dedupe.sh @@ -66,7 +66,7 @@ echo PWD # it's now safe to delete duplicate .class files from the original locations # don't use rm */% because globbing is broken for files containing $ for shimDir in $SHIM_DIRS; do - xargs --arg-file="$SPARK3XX_COMMON_TXT" -n 100 -I% rm "$PARALLEL_WORLDS_DIR/$shimDir/%" + xargs --arg-file="$SPARK3XX_COMMON_TXT" -P 4 -n 100 -I% rm "$PARALLEL_WORLDS_DIR/$shimDir/%" done mv "$SPARK3XX_COMMON_DIR" $PARALLEL_WORLDS_DIR/ diff --git a/dist/unshimmed-base.txt b/dist/unshimmed-base.txt index 27aba8c222e..042002b193a 100644 --- a/dist/unshimmed-base.txt +++ b/dist/unshimmed-base.txt @@ -2,7 +2,6 @@ META-INF/DEPENDENCIES META-INF/LICENSE META-INF/NOTICE META-INF/maven/** -com/nvidia/shaded/** com/nvidia/spark/RapidsUDF* com/nvidia/spark/SQLPlugin* com/nvidia/spark/rapids/ExecutionPlanCaptureCallback*