[api-draft][Optimize] Optimize module name

seatunnel-connectors/plugin-mapping.properties → plugin-mapping.properties

@@ -85,15 +85,15 @@ spark.sink.TiDB = seatunnel-connector-spark-tidb
 
 # SeaTunnel new connector API
 
-seatunnel.source.FakeSource = seatunnel-connector-seatunnel-fake
-seatunnel.sink.Console = seatunnel-connector-seatunnel-console
-seatunnel.source.Kafka = seatunnel-connector-seatunnel-kafka
-seatunnel.sink.Kafka = seatunnel-connector-seatunnel-kafka
-seatunnel.source.Http = seatunnel-connector-seatunnel-http
-seatunnel.source.Socket = seatunnel-connector-seatunnel-socket
-seatunnel.sink.Hive = seatunnel-connector-seatunnel-hive
-seatunnel.source.Clickhouse = seatunnel-connector-seatunnel-clickhouse
-seatunnel.sink.Clickhouse = seatunnel-connector-seatunnel-clickhouse
-seatunnel.sink.ClickhouseFile = seatunnel-connector-seatunnel-clickhouse
-seatunnel.source.Jdbc = seatunnel-connector-seatunnel-jdbc
-seatunnel.sink.Jdbc = seatunnel-connector-seatunnel-jdbc
+seatunnel.source.FakeSource = connector-fake
+seatunnel.sink.Console = connector-console
+seatunnel.source.Kafka = connector-kafka
+seatunnel.sink.Kafka = connector-kafka
+seatunnel.source.Http = connector-http
+seatunnel.source.Socket = connector-socket
+seatunnel.sink.Hive = connector-hive
+seatunnel.source.Clickhouse = connector-clickhouse
+seatunnel.sink.Clickhouse = connector-clickhouse
+seatunnel.sink.ClickhouseFile = connector-clickhouse
+seatunnel.source.Jdbc = connector-jdbc
+seatunnel.sink.Jdbc = connector-jdbc

pom.xml

@@ -89,6 +89,8 @@
         <module>seatunnel-translation</module>
         <module>seatunnel-plugin-discovery</module>
         <module>seatunnel-formats</module>
+        <module>seatunnel-connectors-v2</module>
+        <module>seatunnel-connectors-v2-dist</module>
     </modules>
 
     <properties>

seatunnel-connectors/seatunnel-connectors-seatunnel-dist/pom.xml → seatunnel-connectors-v2-dist/pom.xml

@@ -21,58 +21,58 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors</artifactId>
+        <artifactId>seatunnel</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connectors-seatunnel-dist</artifactId>
+    <artifactId>seatunnel-connectors-v2-dist</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-fake</artifactId>
+            <artifactId>connector-fake</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-console</artifactId>
+            <artifactId>connector-console</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-kafka</artifactId>
+            <artifactId>connector-kafka</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-http</artifactId>
+            <artifactId>connector-http</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-jdbc</artifactId>
+            <artifactId>connector-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-socket</artifactId>
+            <artifactId>connector-socket</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-clickhouse</artifactId>
+            <artifactId>connector-clickhouse</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-pulsar</artifactId>
+            <artifactId>connector-pulsar</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-hive</artifactId>
+            <artifactId>connector-hive</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-clickhouse/pom.xml → seatunnel-connectors-v2/connector-clickhouse/pom.xml

@@ -20,13 +20,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-clickhouse</artifactId>
+    <artifactId>connector-clickhouse</artifactId>
 
     <dependencies>
 

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/client/ClickhouseSinkWriter.java → seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/client/ClickhouseSinkWriter.java

@@ -57,7 +57,7 @@ public class ClickhouseSinkWriter implements SinkWriter<SeaTunnelRow, CKCommitIn
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ClickhouseSinkWriter.class);
 
-    private final SinkWriter.Context context;
+    private final Context context;
     private final ReaderOption option;
     private final ShardRouter shardRouter;
     private final transient ClickhouseProxy proxy;
@@ -69,7 +69,7 @@ public class ClickhouseSinkWriter implements SinkWriter<SeaTunnelRow, CKCommitIn
     private static final Pattern NULLABLE = Pattern.compile("Nullable\\((.*)\\)");
     private static final Pattern LOW_CARDINALITY = Pattern.compile("LowCardinality\\((.*)\\)");
 
-    ClickhouseSinkWriter(ReaderOption option, SinkWriter.Context context) {
+    ClickhouseSinkWriter(ReaderOption option, Context context) {
         this.option = option;
         this.context = context;
 

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-common/pom.xml → seatunnel-connectors-v2/connector-common/pom.xml

@@ -21,13 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-common</artifactId>
+    <artifactId>connector-common</artifactId>
 
     <properties>
     </properties>

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-console/pom.xml → seatunnel-connectors-v2/connector-console/pom.xml

@@ -20,17 +20,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.seatunnel</groupId>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-console</artifactId>
+    <artifactId>connector-console</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-common</artifactId>
+            <artifactId>connector-common</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-fake/pom.xml → seatunnel-connectors-v2/connector-fake/pom.xml

@@ -22,17 +22,17 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.seatunnel</groupId>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-fake</artifactId>
+    <artifactId>connector-fake</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-common</artifactId>
+            <artifactId>connector-common</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-hive/pom.xml → seatunnel-connectors-v2/connector-hive/pom.xml

@@ -21,13 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-hive</artifactId>
+    <artifactId>connector-hive</artifactId>
 
     <dependencies>
         <dependency>

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-http/pom.xml → seatunnel-connectors-v2/connector-http/pom.xml

@@ -21,18 +21,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-http</artifactId>
+    <artifactId>connector-http</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-common</artifactId>
+            <artifactId>connector-common</artifactId>
             <version>${project.version}</version>
         </dependency>
 

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-jdbc/pom.xml → seatunnel-connectors-v2/connector-jdbc/pom.xml

@@ -21,13 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-jdbc</artifactId>
+    <artifactId>connector-jdbc</artifactId>
 
     <dependencies>
 

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-kafka/pom.xml → seatunnel-connectors-v2/connector-kafka/pom.xml

@@ -21,13 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-kafka</artifactId>
+    <artifactId>connector-kafka</artifactId>
 
     <dependencies>
 

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-pulsar/pom.xml → seatunnel-connectors-v2/connector-pulsar/pom.xml

@@ -21,13 +21,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-pulsar</artifactId>
+    <artifactId>connector-pulsar</artifactId>
 
     <properties>
         <pulsar.version>2.8.0</pulsar.version>

seatunnel-connectors/seatunnel-connectors-seatunnel/seatunnel-connector-seatunnel-socket/pom.xml → seatunnel-connectors-v2/connector-socket/pom.xml

@@ -21,18 +21,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors-seatunnel</artifactId>
+        <artifactId>seatunnel-connectors-v2</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>seatunnel-connector-seatunnel-socket</artifactId>
+    <artifactId>connector-socket</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.seatunnel</groupId>
-            <artifactId>seatunnel-connector-seatunnel-common</artifactId>
+            <artifactId>connector-common</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

seatunnel-connectors/seatunnel-connectors-seatunnel/pom.xml → seatunnel-connectors-v2/pom.xml

@@ -17,30 +17,31 @@
     limitations under the License.
 
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>seatunnel-connectors</artifactId>
+        <artifactId>seatunnel</artifactId>
         <groupId>org.apache.seatunnel</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
-    <artifactId>seatunnel-connectors-seatunnel</artifactId>
+    <artifactId>seatunnel-connectors-v2</artifactId>
 
     <modules>
-        <module>seatunnel-connector-seatunnel-common</module>
-        <module>seatunnel-connector-seatunnel-console</module>
-        <module>seatunnel-connector-seatunnel-fake</module>
-        <module>seatunnel-connector-seatunnel-kafka</module>
-        <module>seatunnel-connector-seatunnel-http</module>
-        <module>seatunnel-connector-seatunnel-jdbc</module>
-        <module>seatunnel-connector-seatunnel-socket</module>
-        <module>seatunnel-connector-seatunnel-clickhouse</module>
-        <module>seatunnel-connector-seatunnel-pulsar</module>
-        <module>seatunnel-connector-seatunnel-hive</module>
+        <module>connector-common</module>
+        <module>connector-clickhouse</module>
+        <module>connector-console</module>
+        <module>connector-fake</module>
+        <module>connector-hive</module>
+        <module>connector-http</module>
+        <module>connector-jdbc</module>
+        <module>connector-kafka</module>
+        <module>connector-pulsar</module>
+        <module>connector-socket</module>
     </modules>
 
     <dependencies>
@@ -54,4 +55,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

seatunnel-connectors/pom.xml

@@ -35,8 +35,6 @@
         <module>seatunnel-connectors-flink-dist</module>
         <module>seatunnel-connectors-spark</module>
         <module>seatunnel-connectors-spark-dist</module>
-        <module>seatunnel-connectors-seatunnel</module>
-        <module>seatunnel-connectors-seatunnel-dist</module>
     </modules>
 
 </project>

seatunnel-dist/src/main/assembly/assembly-bin.xml

@@ -140,17 +140,17 @@
             <outputDirectory>/connectors/spark</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../seatunnel-connectors/seatunnel-connectors-seatunnel-dist/target/lib</directory>
+            <directory>../seatunnel-connectors-v2-dist/target/lib</directory>
             <includes>
-                <include>seatunnel-connector-seatunnel*.jar</include>
+                <include>connector-*.jar</include>
             </includes>
             <excludes>
                 <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
             </excludes>
             <outputDirectory>/connectors/seatunnel</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../seatunnel-connectors</directory>
+            <directory>../</directory>
             <includes>
                 <include>plugin-mapping.properties</include>
             </includes>

seatunnel-e2e/seatunnel-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/FlinkContainer.java

@@ -153,7 +153,7 @@ protected void copySeaTunnelFlinkFile() {
 
         // copy plugin-mapping.properties
         jobManager.copyFileToContainer(
-            MountableFile.forHostPath(PROJECT_ROOT_PATH + "/seatunnel-connectors/plugin-mapping.properties"),
+            MountableFile.forHostPath(PROJECT_ROOT_PATH + "/plugin-mapping.properties"),
             Paths.get(SEATUNNEL_CONNECTORS, PLUGIN_MAPPING_FILE).toString());
     }