From 914e08ccf1e83c2583d0fd94d4b72080ec3fa47e Mon Sep 17 00:00:00 2001
From: xiaoyou201 <xiaoyou201@foxmail.com>
Date: Mon, 12 Aug 2024 14:43:47 +0800
Subject: [PATCH] [INLONG-10773][Sort] Refactor dependency structure to solve
 format-base could not compile on flink 1.18 env.

---
 inlong-sort/sort-core/pom.xml                                | 5 -----
 inlong-sort/sort-flink/base/pom.xml                          | 2 +-
 .../sort/formats/base/collectors/TimestampedCollector.java   | 0
 3 files changed, 1 insertion(+), 6 deletions(-)
 rename inlong-sort/sort-formats/{format-row/format-base => format-common}/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java (100%)

diff --git a/inlong-sort/sort-core/pom.xml b/inlong-sort/sort-core/pom.xml
index a919ff0dd84..2ef9506520a 100644
--- a/inlong-sort/sort-core/pom.xml
+++ b/inlong-sort/sort-core/pom.xml
@@ -44,11 +44,6 @@
             <artifactId>sort-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.inlong</groupId>
-            <artifactId>sort-format-base</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <!-- for test -->
         <dependency>
diff --git a/inlong-sort/sort-flink/base/pom.xml b/inlong-sort/sort-flink/base/pom.xml
index ad984516e31..a98220f178e 100644
--- a/inlong-sort/sort-flink/base/pom.xml
+++ b/inlong-sort/sort-flink/base/pom.xml
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.apache.inlong</groupId>
-            <artifactId>sort-format-base</artifactId>
+            <artifactId>sort-format-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java b/inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java
similarity index 100%
rename from inlong-sort/sort-formats/format-row/format-base/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java
rename to inlong-sort/sort-formats/format-common/src/main/java/org/apache/inlong/sort/formats/base/collectors/TimestampedCollector.java