From d2474ef29fc2e2c12878d0476b92a8b8e3dff038 Mon Sep 17 00:00:00 2001
From: Subham Sangwan <subhamsangwan26@gmail.com>
Date: Sat, 22 Nov 2025 21:55:20 +0530
Subject: [PATCH] feat: remove Flink Scala dependencies

---
 flink-shaded/pom.xml |  2 +-
 flink/pom.xml        | 42 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/flink-shaded/pom.xml b/flink-shaded/pom.xml
index 11e745686de..716462d6a74 100644
--- a/flink-shaded/pom.xml
+++ b/flink-shaded/pom.xml
@@ -39,7 +39,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.sedona</groupId>
-            <artifactId>sedona-flink_${scala.compat.version}</artifactId>
+            <artifactId>sedona-flink</artifactId>
             <version>${project.version}</version>
         </dependency>
          <!-- Define this to be shaded since it is provided in other modules -->
diff --git a/flink/pom.xml b/flink/pom.xml
index 14c89aa860b..0808d45d821 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -25,7 +25,7 @@
         <version>1.8.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>sedona-flink_${scala.compat.version}</artifactId>
+    <artifactId>sedona-flink</artifactId>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>A cluster computing system for processing large-scale spatial data: Streaming API for Apache Flink.</description>
@@ -83,7 +83,7 @@
 <!--        Starting Flink 14, Blink planner has been renamed to the official Flink planner-->
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner_${scala.compat.version}</artifactId>
+            <artifactId>flink-table-planner-loader</artifactId>
             <version>${flink.version}</version>
             <scope>${flink.scope}</scope>
         </dependency>
@@ -119,9 +119,28 @@
             <artifactId>gt-epsg-hsql</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala.version}</version>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-api-java</artifactId>
+            <version>${flink.version}</version>
+            <scope>${flink.scope}</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.7.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-planner_${scala.compat.version}</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table-api-scala-bridge_${scala.compat.version}</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -141,4 +160,17 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <classpathDependencyExcludes>
+                        <classpathDependencyExclude>org.apache.flink:flink-table-planner-loader</classpathDependencyExclude>
+                    </classpathDependencyExcludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>