From 0a63e7c8ca3815f08d449a1e40ee10e488aa69f9 Mon Sep 17 00:00:00 2001
From: yangjie01 <yangjie01@baidu.com>
Date: Thu, 10 Oct 2024 02:54:32 +0800
Subject: [PATCH 1/2] init

---
 .github/workflows/build_and_test.yml | 6 ++++++
 sql/core/pom.xml                     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 2b459e4c73bbb..aa90a69e4e397 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -306,6 +306,12 @@ jobs:
         name: unit-tests-log-${{ matrix.modules }}-${{ matrix.comment }}-${{ matrix.java }}-${{ matrix.hadoop }}-${{ matrix.hive }}
         path: "**/target/*.log"
 
+  maven-test:
+    name: "Run Maven Test"
+    permissions:
+      packages: write
+    uses: ./.github/workflows/maven_test.yml
+
   infra-image:
     name: "Base image build"
     needs: precondition
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 972cf76d27535..16236940fe072 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -79,6 +79,12 @@
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>spark-connect-shims_${scala.binary.version}</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>

From 2cb3fecfdba58746053adc26c11be068f763db3e Mon Sep 17 00:00:00 2001
From: YangJie <yangjie01@baidu.com>
Date: Thu, 10 Oct 2024 10:58:27 +0800
Subject: [PATCH 2/2] Revert maven test

---
 .github/workflows/build_and_test.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index aa90a69e4e397..2b459e4c73bbb 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -306,12 +306,6 @@ jobs:
         name: unit-tests-log-${{ matrix.modules }}-${{ matrix.comment }}-${{ matrix.java }}-${{ matrix.hadoop }}-${{ matrix.hive }}
         path: "**/target/*.log"
 
-  maven-test:
-    name: "Run Maven Test"
-    permissions:
-      packages: write
-    uses: ./.github/workflows/maven_test.yml
-
   infra-image:
     name: "Base image build"
     needs: precondition