From 452f42fd098c6a0206114af7cd18aef2c726838e Mon Sep 17 00:00:00 2001
From: Gera Shegalov <gera@apache.org>
Date: Mon, 23 May 2022 14:56:18 -0700
Subject: [PATCH 1/2] Move ShimServiceProvider file re-init/truncate

This PR closes 5596 by moving truncate close to when shim service file
concatentation is about to generate a new list. T

The empty file for ShimServiceProvider created during init-properties is not populated via
concat in the conventional jar path, later overwriting the original file
from the aggregator jar. it's also bad practice to have side effects
while still initializing properties. This PR corrects these issues.

Signed-off-by: Gera Shegalov <gera@apache.org>
---
 dist/maven-antrun/build-parallel-worlds.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dist/maven-antrun/build-parallel-worlds.xml b/dist/maven-antrun/build-parallel-worlds.xml
index 13e58ae540f..f4519f1047b 100644
--- a/dist/maven-antrun/build-parallel-worlds.xml
+++ b/dist/maven-antrun/build-parallel-worlds.xml
@@ -15,6 +15,7 @@
   limitations under the License.
 -->
 <project name="maven-antrun" xmlns:ac="antlib:net.sf.antcontrib" xmlns:if="ant:if">
+    <record name="/tmp/ant-build.log" loglevel="verbose" action="start" />
     <!--
         - Generates shim service discovery META-INF entries for ShimLoader
 
@@ -61,7 +62,6 @@
         <property name="shimServiceRsrc" value="META-INF/services/com.nvidia.spark.rapids.SparkShimServiceProvider"/>
         <property name="shimServiceFile" value="${project.build.directory}/extra-resources/${shimServiceRsrc}"/>
         <property name="aggregatorPrefix" value="${project.build.directory}/deps/${aggregatorArtifact}-${project.version}"/>
-        <truncate file="${shimServiceFile}" create="true" mkdirs="true"/>
         <property name="aggregatorBuildDir" value="${project.basedir}/../aggregator/target"/>
 
         <condition property="should.build.conventional.jar">
@@ -148,6 +148,7 @@
             </sequential>
         </ac:for>
 
+        <truncate file="${shimServiceFile}" create="true" mkdirs="true"/>
         <concat destfile="${shimServiceFile}">
             <fileset dir="${project.build.directory}/parallel-world" includes="spark*/${shimServiceRsrc}"/>
         </concat>

From 0f40c1df29d905aa8d888aeb79921121326ad0d2 Mon Sep 17 00:00:00 2001
From: Gera Shegalov <gera@apache.org>
Date: Mon, 23 May 2022 15:16:47 -0700
Subject: [PATCH 2/2] delete debug log

Signed-off-by: Gera Shegalov <gera@apache.org>
---
 dist/maven-antrun/build-parallel-worlds.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dist/maven-antrun/build-parallel-worlds.xml b/dist/maven-antrun/build-parallel-worlds.xml
index f4519f1047b..5bb06ae8187 100644
--- a/dist/maven-antrun/build-parallel-worlds.xml
+++ b/dist/maven-antrun/build-parallel-worlds.xml
@@ -15,7 +15,6 @@
   limitations under the License.
 -->
 <project name="maven-antrun" xmlns:ac="antlib:net.sf.antcontrib" xmlns:if="ant:if">
-    <record name="/tmp/ant-build.log" loglevel="verbose" action="start" />
     <!--
         - Generates shim service discovery META-INF entries for ShimLoader