From ffcd5cc5bb231fbe34640ccc24d6392eb29a8826 Mon Sep 17 00:00:00 2001
From: Peixin Li <pxLi@nyu.edu>
Date: Wed, 3 Jul 2024 09:57:30 +0800
Subject: [PATCH] remove hardcoded scala 430 plugin

---
 .github/workflows/mvn-verify-check.yml | 10 +++++-----
 pom.xml                                | 12 ------------
 scala2.13/pom.xml                      |  9 ---------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/mvn-verify-check.yml b/.github/workflows/mvn-verify-check.yml
index 34981d1f11a..a07ad01b753 100644
--- a/.github/workflows/mvn-verify-check.yml
+++ b/.github/workflows/mvn-verify-check.yml
@@ -156,11 +156,11 @@ jobs:
           distribution: adopt
           java-version: 8
 
-      - name: Cache local Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ needs.cache-dependencies.outputs.dailyCacheKey }}
+#      - name: Cache local Maven repository
+#        uses: actions/cache@v4
+#        with:
+#          path: ~/.m2
+#          key: ${{ needs.cache-dependencies.outputs.dailyCacheKey }}
 
       - name: check runtime before tests
         run: |
diff --git a/pom.xml b/pom.xml
index 3ea16d3f1f7..17f6c599556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,14 +196,10 @@
             </activation>
             <properties>
                 <buildver>321cdh</buildver>
-                <scala.plugin.version>4.3.0</scala.plugin.version>
                 <spark.version>${spark321cdh.version}</spark.version>
                 <spark.test.version>${spark321cdh.version}</spark.test.version>
                 <parquet.hadoop.version>1.10.1</parquet.hadoop.version>
                 <cloudera.repo.enabled>true</cloudera.repo.enabled>
-                <!-- Keeping the scala plugin version 4.3.0 for details
-                check https://github.com/NVIDIA/spark-rapids/issues/11112 -->
-                <scala.plugin.version>4.3.0</scala.plugin.version>
             </properties>
             <modules>
                 <module>shim-deps/cloudera</module>
@@ -462,15 +458,11 @@
             </activation>
             <properties>
                 <buildver>330cdh</buildver>
-                <scala.plugin.version>4.3.0</scala.plugin.version>
                 <spark.version>${spark330cdh.version}</spark.version>
                 <spark.test.version>${spark330cdh.version}</spark.test.version>
                 <parquet.hadoop.version>1.10.99.7.1.8.0-801</parquet.hadoop.version>
                 <iceberg.version>${spark330.iceberg.version}</iceberg.version>
                 <cloudera.repo.enabled>true</cloudera.repo.enabled>
-                <!-- Keeping the scala plugin version 4.3.0 for details
-                check https://github.com/NVIDIA/spark-rapids/issues/11112 -->
-                <scala.plugin.version>4.3.0</scala.plugin.version>
             </properties>
             <modules>
                 <module>shim-deps/cloudera</module>
@@ -489,15 +481,11 @@
             </activation>
             <properties>
                 <buildver>332cdh</buildver>
-                <scala.plugin.version>4.3.0</scala.plugin.version>
                 <spark.version>${spark332cdh.version}</spark.version>
                 <spark.test.version>${spark332cdh.version}</spark.test.version>
                 <parquet.hadoop.version>1.10.99.7.1.9.0-387</parquet.hadoop.version>
                 <iceberg.version>${spark330.iceberg.version}</iceberg.version>
                 <cloudera.repo.enabled>true</cloudera.repo.enabled>
-                <!-- Keeping the scala plugin version 4.3.0 for details
-                check https://github.com/NVIDIA/spark-rapids/issues/11112 -->
-                <scala.plugin.version>4.3.0</scala.plugin.version>
             </properties>
             <modules>
                 <module>shim-deps/cloudera</module>
diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
index d1b24d8b25e..3ff634af30b 100644
--- a/scala2.13/pom.xml
+++ b/scala2.13/pom.xml
@@ -200,9 +200,6 @@
                 <spark.test.version>${spark321cdh.version}</spark.test.version>
                 <parquet.hadoop.version>1.10.1</parquet.hadoop.version>
                 <cloudera.repo.enabled>true</cloudera.repo.enabled>
-                <!-- Keeping the scala plugin version 4.3.0 for details
-                check https://github.com/NVIDIA/spark-rapids/issues/11112 -->
-                <scala.plugin.version>4.3.0</scala.plugin.version>
             </properties>
             <modules>
                 <module>shim-deps/cloudera</module>
@@ -466,9 +463,6 @@
                 <parquet.hadoop.version>1.10.99.7.1.8.0-801</parquet.hadoop.version>
                 <iceberg.version>${spark330.iceberg.version}</iceberg.version>
                 <cloudera.repo.enabled>true</cloudera.repo.enabled>
-                <!-- Keeping the scala plugin version 4.3.0 for details
-                check https://github.com/NVIDIA/spark-rapids/issues/11112 -->
-                <scala.plugin.version>4.3.0</scala.plugin.version>
             </properties>
             <modules>
                 <module>shim-deps/cloudera</module>
@@ -492,9 +486,6 @@
                 <parquet.hadoop.version>1.10.99.7.1.9.0-387</parquet.hadoop.version>
                 <iceberg.version>${spark330.iceberg.version}</iceberg.version>
                 <cloudera.repo.enabled>true</cloudera.repo.enabled>
-                <!-- Keeping the scala plugin version 4.3.0 for details
-                check https://github.com/NVIDIA/spark-rapids/issues/11112 -->
-                <scala.plugin.version>4.3.0</scala.plugin.version>
             </properties>
             <modules>
                 <module>shim-deps/cloudera</module>