(inlong) branch master updated: [INLONG-10773][Sort] Refactor dependency structure to solve format-base could not compile on flink 1.18 env. (#10775)

[aloyszhang]

This is an automated email from the ASF dual-hosted git repository.

aloyszhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new ef20f569e6 [INLONG-10773][Sort] Refactor dependency structure to solve 
format-base could not compile on flink 1.18 env. (#10775)
ef20f569e6 is described below

commit ef20f569e66cafea49fe6c7370c7ed700bcc8ae7
Author: XiaoYou201 <xiaoyou...@foxmail.com>
AuthorDate: Tue Aug 13 16:37:55 2024 +0800

    [INLONG-10773][Sort] Refactor dependency structure to solve format-base 
could not compile on flink 1.18 env. (#10775)
---
 inlong-sort/sort-core/pom.xml                                        | 5 -----
 inlong-sort/sort-flink/base/pom.xml                                  | 2 +-
 .../inlong/sort/formats/base/collectors/TimestampedCollector.java    | 0
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/inlong-sort/sort-core/pom.xml b/inlong-sort/sort-core/pom.xml
index a919ff0dd8..2ef9506520 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 ad984516e3..a98220f178 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