From 79d7266595fc3d33e47dd2757b1bcafb96a42464 Mon Sep 17 00:00:00 2001
From: Gera Shegalov <gera@apache.org>
Date: Wed, 24 Jul 2024 13:23:55 -0700
Subject: [PATCH 1/2] Test

Signed-off-by: Gera Shegalov <gera@apache.org>
---
 .github/workflows/mvn-verify-check.yml |  8 ++++----
 aggregator/pom.xml                     | 21 +--------------------
 dist/pom.xml                           |  1 +
 pom.xml                                |  2 ++
 scala2.13/aggregator/pom.xml           | 21 +--------------------
 scala2.13/dist/pom.xml                 |  1 +
 scala2.13/pom.xml                      |  2 ++
 7 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/mvn-verify-check.yml b/.github/workflows/mvn-verify-check.yml
index b9dab57d339..86e12a4a32b 100644
--- a/.github/workflows/mvn-verify-check.yml
+++ b/.github/workflows/mvn-verify-check.yml
@@ -148,7 +148,7 @@ jobs:
             fi
           }
           done
- 
+
   cache-dependencies-scala213:
     runs-on: ubuntu-latest
     outputs:
@@ -201,7 +201,7 @@ jobs:
           jdkVersionArrBody=${jdkVersionArrBody:1}
           jdkVersionJsonStr=$(printf {\"include\":[%s]} $jdkVersionArrBody)
           echo "jdkVersions=$jdkVersionJsonStr" >> $GITHUB_OUTPUT
-      
+
 
   package-tests-scala213:
     needs: cache-dependencies-scala213
@@ -304,12 +304,12 @@ jobs:
               exit 1
           fi
           # change to Scala 2.13 Directory
-          cd scala2.13 
+          cd scala2.13
           # test command, will retry for 3 times if failed.
           max_retry=3; delay=30; i=1
           while true; do
             mvn verify \
-              -P "individual,pre-merge" -Dbuildver=${{ matrix.spark-version }} \
+              -P "individual,pre-merge,source-javadoc" -Dbuildver=${{ matrix.spark-version }} \
               ${{ env.COMMON_MVN_FLAGS }} && break || {
             if [[ $i -le $max_retry ]]; then
               echo "mvn command failed. Retry $i/$max_retry."; ((i++)); sleep $delay; ((delay=delay*2))
diff --git a/aggregator/pom.xml b/aggregator/pom.xml
index adb2e43b0cf..0b9f09aa301 100644
--- a/aggregator/pom.xml
+++ b/aggregator/pom.xml
@@ -44,6 +44,7 @@
         <rapids.default.jar.phase>initialize</rapids.default.jar.phase>
         <!-- Maven to register attached artifact , which we later replace -->
         <rapids.shim.jar.phase>initialize</rapids.shim.jar.phase>
+        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
     </properties>
     <dependencies>
         <dependency>
@@ -263,26 +264,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>source-javadoc</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-source</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>release320</id>
             <activation>
diff --git a/dist/pom.xml b/dist/pom.xml
index 1514b0bef2b..b1c75d26522 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -46,6 +46,7 @@
         <dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
         <rapids.default.jar.phase>none</rapids.default.jar.phase>
         <rapids.jni.unpack.skip>false</rapids.jni.unpack.skip>
+        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
     </properties>
     <profiles>
         <profile>
diff --git a/pom.xml b/pom.xml
index 1cd2151ea33..612010696f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -589,6 +589,7 @@
                         <executions>
                             <execution>
                                 <id>attach-source</id>
+                                <phase>${rapdis.source.jar.phase}</phase>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
@@ -887,6 +888,7 @@
         <bloop.configDirectory>${spark.rapids.source.basedir}/.bloop</bloop.configDirectory>
         <build.info.path>${project.build.outputDirectory}/rapids4spark-version-info.properties</build.info.path>
         <nonfail.errors.quiet>false</nonfail.errors.quiet>
+        <rapdis.source.jar.phase>package</rapdis.source.jar.phase>
     </properties>
 
     <dependencyManagement>
diff --git a/scala2.13/aggregator/pom.xml b/scala2.13/aggregator/pom.xml
index b247435847a..c92dbc25300 100644
--- a/scala2.13/aggregator/pom.xml
+++ b/scala2.13/aggregator/pom.xml
@@ -44,6 +44,7 @@
         <rapids.default.jar.phase>initialize</rapids.default.jar.phase>
         <!-- Maven to register attached artifact , which we later replace -->
         <rapids.shim.jar.phase>initialize</rapids.shim.jar.phase>
+        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
     </properties>
     <dependencies>
         <dependency>
@@ -263,26 +264,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>source-javadoc</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-source</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>release320</id>
             <activation>
diff --git a/scala2.13/dist/pom.xml b/scala2.13/dist/pom.xml
index 7fb97a2611d..fd90a9158d9 100644
--- a/scala2.13/dist/pom.xml
+++ b/scala2.13/dist/pom.xml
@@ -46,6 +46,7 @@
         <dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
         <rapids.default.jar.phase>none</rapids.default.jar.phase>
         <rapids.jni.unpack.skip>false</rapids.jni.unpack.skip>
+        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
     </properties>
     <profiles>
         <profile>
diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
index 804979de765..03763fe0a31 100644
--- a/scala2.13/pom.xml
+++ b/scala2.13/pom.xml
@@ -589,6 +589,7 @@
                         <executions>
                             <execution>
                                 <id>attach-source</id>
+                                <phase>${rapdis.source.jar.phase}</phase>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
@@ -887,6 +888,7 @@
         <bloop.configDirectory>${spark.rapids.source.basedir}/.bloop</bloop.configDirectory>
         <build.info.path>${project.build.outputDirectory}/rapids4spark-version-info.properties</build.info.path>
         <nonfail.errors.quiet>false</nonfail.errors.quiet>
+        <rapdis.source.jar.phase>package</rapdis.source.jar.phase>
     </properties>
 
     <dependencyManagement>

From a3b16536d84b06b56fd1357b587c7411fd6fbbe8 Mon Sep 17 00:00:00 2001
From: Gera Shegalov <gera@apache.org>
Date: Wed, 24 Jul 2024 18:04:29 -0700
Subject: [PATCH 2/2] reviews: fix typo

Signed-off-by: Gera Shegalov <gera@apache.org>
---
 aggregator/pom.xml           | 2 +-
 dist/pom.xml                 | 2 +-
 pom.xml                      | 4 ++--
 scala2.13/aggregator/pom.xml | 2 +-
 scala2.13/dist/pom.xml       | 2 +-
 scala2.13/pom.xml            | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/aggregator/pom.xml b/aggregator/pom.xml
index 0b9f09aa301..5f5400889ae 100644
--- a/aggregator/pom.xml
+++ b/aggregator/pom.xml
@@ -44,7 +44,7 @@
         <rapids.default.jar.phase>initialize</rapids.default.jar.phase>
         <!-- Maven to register attached artifact , which we later replace -->
         <rapids.shim.jar.phase>initialize</rapids.shim.jar.phase>
-        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
+        <rapids.source.jar.phase>none</rapids.source.jar.phase>
     </properties>
     <dependencies>
         <dependency>
diff --git a/dist/pom.xml b/dist/pom.xml
index b1c75d26522..8bdbcb99ddf 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -46,7 +46,7 @@
         <dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
         <rapids.default.jar.phase>none</rapids.default.jar.phase>
         <rapids.jni.unpack.skip>false</rapids.jni.unpack.skip>
-        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
+        <rapids.source.jar.phase>none</rapids.source.jar.phase>
     </properties>
     <profiles>
         <profile>
diff --git a/pom.xml b/pom.xml
index 612010696f8..3b51de6d258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -589,7 +589,7 @@
                         <executions>
                             <execution>
                                 <id>attach-source</id>
-                                <phase>${rapdis.source.jar.phase}</phase>
+                                <phase>${rapids.source.jar.phase}</phase>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
@@ -888,7 +888,7 @@
         <bloop.configDirectory>${spark.rapids.source.basedir}/.bloop</bloop.configDirectory>
         <build.info.path>${project.build.outputDirectory}/rapids4spark-version-info.properties</build.info.path>
         <nonfail.errors.quiet>false</nonfail.errors.quiet>
-        <rapdis.source.jar.phase>package</rapdis.source.jar.phase>
+        <rapids.source.jar.phase>package</rapids.source.jar.phase>
     </properties>
 
     <dependencyManagement>
diff --git a/scala2.13/aggregator/pom.xml b/scala2.13/aggregator/pom.xml
index c92dbc25300..f1242244b6d 100644
--- a/scala2.13/aggregator/pom.xml
+++ b/scala2.13/aggregator/pom.xml
@@ -44,7 +44,7 @@
         <rapids.default.jar.phase>initialize</rapids.default.jar.phase>
         <!-- Maven to register attached artifact , which we later replace -->
         <rapids.shim.jar.phase>initialize</rapids.shim.jar.phase>
-        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
+        <rapids.source.jar.phase>none</rapids.source.jar.phase>
     </properties>
     <dependencies>
         <dependency>
diff --git a/scala2.13/dist/pom.xml b/scala2.13/dist/pom.xml
index fd90a9158d9..b74e977256e 100644
--- a/scala2.13/dist/pom.xml
+++ b/scala2.13/dist/pom.xml
@@ -46,7 +46,7 @@
         <dist.jar.pom.url>jar:file:${dist.jar.name}!/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml</dist.jar.pom.url>
         <rapids.default.jar.phase>none</rapids.default.jar.phase>
         <rapids.jni.unpack.skip>false</rapids.jni.unpack.skip>
-        <rapdis.source.jar.phase>none</rapdis.source.jar.phase>
+        <rapids.source.jar.phase>none</rapids.source.jar.phase>
     </properties>
     <profiles>
         <profile>
diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
index 03763fe0a31..d5b701d7c56 100644
--- a/scala2.13/pom.xml
+++ b/scala2.13/pom.xml
@@ -589,7 +589,7 @@
                         <executions>
                             <execution>
                                 <id>attach-source</id>
-                                <phase>${rapdis.source.jar.phase}</phase>
+                                <phase>${rapids.source.jar.phase}</phase>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
@@ -888,7 +888,7 @@
         <bloop.configDirectory>${spark.rapids.source.basedir}/.bloop</bloop.configDirectory>
         <build.info.path>${project.build.outputDirectory}/rapids4spark-version-info.properties</build.info.path>
         <nonfail.errors.quiet>false</nonfail.errors.quiet>
-        <rapdis.source.jar.phase>package</rapdis.source.jar.phase>
+        <rapids.source.jar.phase>package</rapids.source.jar.phase>
     </properties>
 
     <dependencyManagement>