From 0fda67556c1e407fec21f45c9ea3ba4ec3f13df5 Mon Sep 17 00:00:00 2001
From: Peixin <pxli@nyu.edu>
Date: Mon, 1 Nov 2021 21:19:14 +0800
Subject: [PATCH] Update aggregator jar name in databricks deploy script
 [databricks] (#3978)

* update aggregator jar in databrick deploy script

Signed-off-by: Peixin Li <pxli@nyu.edu>

* modified pom file name
---
 jenkins/databricks/build.sh  | 2 +-
 jenkins/databricks/deploy.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jenkins/databricks/build.sh b/jenkins/databricks/build.sh
index e67d8cebfb7..3db8414ec18 100755
--- a/jenkins/databricks/build.sh
+++ b/jenkins/databricks/build.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-set -e
+set -ex
 
 SPARKSRCTGZ=$1
 # version of Apache Spark we are building against
diff --git a/jenkins/databricks/deploy.sh b/jenkins/databricks/deploy.sh
index c21e11d3ddd..6583c03871a 100755
--- a/jenkins/databricks/deploy.sh
+++ b/jenkins/databricks/deploy.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-set -e
+set -ex
 rm -rf deploy
 mkdir -p deploy
 cd deploy
@@ -30,10 +30,10 @@ VERSION_NUM=${BASE_SPARK_VERSION_TO_INSTALL_DATABRICKS_JARS//.}
 SPARK_VERSION_STR=spark$VERSION_NUM
 SPARK_PLUGIN_JAR_VERSION=`mvn help:evaluate -q -pl dist -Dexpression=project.version -DforceStdout`
 DB_SHIM_NAME=${SPARK_VERSION_STR}db
-DBJARFPATH=./aggregator/target/${DB_SHIM_NAME}/rapids-4-spark-aggregator_$SCALA_VERSION-$SPARK_PLUGIN_JAR_VERSION-${DB_SHIM_NAME}.jar
+DBJARFPATH=./aggregator/target/${DB_SHIM_NAME}/rapids-4-spark-aggregator_$SCALA_VERSION-$SPARK_PLUGIN_JAR_VERSION.jar
 echo "Databricks jar is: $DBJARFPATH"
 mvn -B deploy:deploy-file $MVN_URM_MIRROR -Durl=$SERVER_URL -DrepositoryId=$SERVER_ID \
-    -Dfile=$DBJARFPATH -DpomFile=aggregator/dependency-reduced-pom.xml -Dclassifier=$DB_SHIM_NAME
+    -Dfile=$DBJARFPATH -DpomFile=aggregator/pom.xml -Dclassifier=$DB_SHIM_NAME
 # install the integration test jar
 DBINTTESTJARFPATH=./integration_tests/target/rapids-4-spark-integration-tests_$SCALA_VERSION-$SPARK_PLUGIN_JAR_VERSION-${DB_SHIM_NAME}.jar
 mvn -B deploy:deploy-file $MVN_URM_MIRROR -Durl=$SERVER_URL -DrepositoryId=$SERVER_ID \