From afce912914ad42f7c0e37bbe74f739ce5846efda Mon Sep 17 00:00:00 2001
From: bjornjorgensen <bjornjorgensen@gmail.com>
Date: Mon, 22 May 2023 17:35:10 +0200
Subject: [PATCH 1/2] 1.

---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 708667e86b394..cd2a7822c63ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,8 @@
       errors building different Hadoop versions.
       See: SPARK-36547, SPARK-38394.
        -->
-    <scala-maven-plugin.version>4.8.1</scala-maven-plugin.version>
+    <!-- dont update scala-maven-plugin to version 4.8.1 -->   
+    <scala-maven-plugin.version>4.8.0</scala-maven-plugin.version>
     <maven.scaladoc.skip>false</maven.scaladoc.skip>
     <versions-maven-plugin.version>2.15.0</versions-maven-plugin.version>
     <!-- for now, not running scalafmt as part of default verify pipeline -->

From 3da8e112982e67d6b6df4fd7a8a4cd4f59849a0b Mon Sep 17 00:00:00 2001
From: bjornjorgensen <bjornjorgensen@gmail.com>
Date: Mon, 22 May 2023 18:00:34 +0200
Subject: [PATCH 2/2] 2.

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd2a7822c63ca..899525fdbbd0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,12 +170,7 @@
     <scala.version>2.12.17</scala.version>
     <scala.binary.version>2.12</scala.binary.version>
     <scalatest-maven-plugin.version>2.2.0</scalatest-maven-plugin.version>
-    <!--
-      This needs to be managed in different profiles to avoid
-      errors building different Hadoop versions.
-      See: SPARK-36547, SPARK-38394.
-       -->
-    <!-- dont update scala-maven-plugin to version 4.8.1 -->   
+    <!-- dont update scala-maven-plugin to version 4.8.1 SPARK-42809 and SPARK-43595 -->   
     <scala-maven-plugin.version>4.8.0</scala-maven-plugin.version>
     <maven.scaladoc.skip>false</maven.scaladoc.skip>
     <versions-maven-plugin.version>2.15.0</versions-maven-plugin.version>