This is an automated email from the ASF dual-hosted git repository.
zongwen pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 8b43e9355 [Improve][build] Change the way releases are packaged (#2703)
8b43e9355 is described below
commit 8b43e93551edfaeb9cb8d1a445540c6db1453dad
Author: Zongwen Li <[email protected]>
AuthorDate: Sat Sep 10 12:39:29 2022 +0800
[Improve][build] Change the way releases are packaged (#2703)
* [build] Change the packing mode of seatunnel connectors
* change the activation mode
Use '!' can cause '<activeByDefault>true' failed
* simple starter code
* fix starter jar output file name
---
pom.xml | 10 +
seatunnel-dist/pom.xml | 533 ++++++++++++++++++---
.../src/main/assembly/assembly-bin-ci.xml | 181 ++++---
seatunnel-dist/src/main/assembly/assembly-bin.xml | 163 +++----
4 files changed, 632 insertions(+), 255 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a904df22..f47e0a131 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,10 @@
<id>all</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>release</name>
+ <value>false</value>
+ </property>
</activation>
<modules>
<module>seatunnel-connectors-v2</module>
@@ -105,6 +109,12 @@
</profile>
<profile>
<id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ <value>true</value>
+ </property>
+ </activation>
</profile>
</profiles>
diff --git a/seatunnel-dist/pom.xml b/seatunnel-dist/pom.xml
index 58c3b67c8..03c857913 100644
--- a/seatunnel-dist/pom.xml
+++ b/seatunnel-dist/pom.xml
@@ -35,114 +35,535 @@
<artifactId>seatunnel-dist</artifactId>
<packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-bin-ci.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly-src.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>true</appendAssemblyId>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ <finalName>apache-seatunnel-incubating-${project.version}</finalName>
+ </build>
+
<profiles>
<profile>
- <id>all</id>
+ <id>seatunnel</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>release</name>
+ <value>false</value>
+ </property>
</activation>
<dependencies>
+ <!-- starters -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-v2-dist</artifactId>
+ <artifactId>seatunnel-flink-starter</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-spark-dist</artifactId>
+ <artifactId>seatunnel-spark-starter</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
+ <!-- connectors -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-flink-dist</artifactId>
+ <artifactId>connector-fake</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
-
- <!-- seatunnel core dependencies -->
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-console</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-assert</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-kafka</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-http-base</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-http-feishu</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-http-wechat</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-socket</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-clickhouse</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-pulsar</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-hive</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-file-hadoop</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-file-local</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-file-oss</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-file-ftp</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-hudi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-dingtalk</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-kudu</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-email</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-elasticsearch</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-iotdb</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-neo4j</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-redis</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-datahub</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-sentry</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>connector-mongodb</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>flink-v1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>release</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- starter -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-core-flink</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
-
+ <!-- connectors -->
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-kafka</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-console</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-fake</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-socket</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-file</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+
<artifactId>seatunnel-connector-flink-elasticsearch6</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+
<artifactId>seatunnel-connector-flink-elasticsearch7</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-doris</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+
<artifactId>seatunnel-connector-flink-clickhouse</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-http</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-flink-assert</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>flink-sql</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>release</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- starter -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-core-flink-sql</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
-
+ <!-- connectors -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-core-spark</artifactId>
+ <artifactId>flink-sql-connector-jdbc</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-flink-starter</artifactId>
+ <artifactId>flink-sql-connector-kafka</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-spark-starter</artifactId>
+
<artifactId>flink-sql-connector-elasticsearch-6</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+
<artifactId>flink-sql-connector-elasticsearch-7</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
-
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/assembly-bin-ci.xml</descriptor>
- </descriptors>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
-
- <execution>
- <id>src</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/assembly-src.xml</descriptor>
- </descriptors>
- <appendAssemblyId>true</appendAssemblyId>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
-
<finalName>apache-seatunnel-incubating-${project.version}</finalName>
- </build>
</profile>
<profile>
- <id>release</id>
+ <id>spark-v1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ <property>
+ <name>release</name>
+ <value>true</value>
+ </property>
+ </activation>
<dependencies>
+ <!-- starter -->
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-core-spark</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- connectors -->
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-kafka</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-fake</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-file</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-socket</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-jdbc</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+
<artifactId>seatunnel-connector-spark-elasticsearch</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-hive</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-phoenix</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-redis</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-mongodb</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-kudu</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-email</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-console</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+
<artifactId>seatunnel-connector-spark-clickhouse</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-hbase</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-hudi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-doris</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-tidb</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-neo4j</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-iceberg</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connector-spark-feishu</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-spark-dist</artifactId>
+ <artifactId>seatunnel-connector-spark-http</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
- <artifactId>seatunnel-connectors-flink-dist</artifactId>
+ <artifactId>seatunnel-connector-spark-webhook</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
+ </profile>
+ <profile>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -154,7 +575,6 @@
<goals>
<goal>single</goal>
</goals>
-
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly-bin.xml</descriptor>
@@ -176,7 +596,6 @@
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
-
</executions>
</plugin>
</plugins>
diff --git a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
index 1f15cbc08..2e016d3a3 100644
--- a/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
+++ b/seatunnel-dist/src/main/assembly/assembly-bin-ci.xml
@@ -43,16 +43,8 @@
<include>plugins/**</include>
</includes>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-core-flink/target</directory>
- <includes>
- <include>seatunnel-core-flink*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
+
+ <!-- ============ Starter Bin ============ -->
<fileSet>
<directory>../seatunnel-core/seatunnel-core-flink/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
@@ -63,131 +55,122 @@
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-core-flink-sql/target</directory>
- <includes>
- <include>seatunnel-core-flink-sql*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
<fileSet>
<directory>../seatunnel-core/seatunnel-core-spark/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-core-spark/target</directory>
- <includes>
- <include>seatunnel-core-spark*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
<fileSet>
<directory>../seatunnel-core/seatunnel-flink-starter/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-flink-starter/target</directory>
- <includes>
- <include>seatunnel-flink-starter*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
<fileSet>
<directory>../seatunnel-core/seatunnel-spark-starter/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
+
<fileSet>
-
<directory>../seatunnel-core/seatunnel-spark-starter/target</directory>
+ <directory>${project.build.directory}/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
<includes>
- <include>seatunnel-spark-starter*.jar</include>
+ <include>*</include>
</includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
+ <fileMode>0755</fileMode>
</fileSet>
- <!-- connectors -->
+ <!--Licenses And NOTICE-->
<fileSet>
-
<directory>../seatunnel-connectors/seatunnel-connectors-flink-dist/target/lib</directory>
- <includes>
- <include>seatunnel-connector-flink*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/connectors/flink</outputDirectory>
+ <directory>release-docs</directory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
+ <!-- DISCLAIMER -->
<fileSet>
-
<directory>../seatunnel-connectors/seatunnel-connectors-flink-sql-dist/target/lib</directory>
+ <directory>${basedir}/.././</directory>
<includes>
- <include>flink-sql-connector*.jar</include>
+ <include>DISCLAIMER</include>
</includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/connectors/flink-sql</outputDirectory>
+ <outputDirectory>.</outputDirectory>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-connectors/seatunnel-connectors-spark-dist/target/lib</directory>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>../plugin-mapping.properties</source>
+ <outputDirectory>/connectors</outputDirectory>
+ </file>
+ </files>
+ <dependencySets>
+ <!-- ============ Starter Jars ============ -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
<includes>
- <include>seatunnel-connector-spark*.jar</include>
+ <!-- Flink V2 starter -->
+
<include>org.apache.seatunnel:seatunnel-flink-starter:jar</include>
+ <!-- Spark V2 starter -->
+
<include>org.apache.seatunnel:seatunnel-spark-starter:jar</include>
+ <!-- Flink starter -->
+
<include>org.apache.seatunnel:seatunnel-core-flink:jar</include>
+ <!-- Flink SQL starter -->
+
<include>org.apache.seatunnel:seatunnel-core-flink-sql:jar</include>
+ <!-- Spark starter -->
+
<include>org.apache.seatunnel:seatunnel-core-spark:jar</include>
</includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/connectors/spark</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../seatunnel-connectors-v2-dist/target/lib</directory>
+
<outputFileNameMapping>${artifact.file.name}</outputFileNameMapping>
+ <outputDirectory>/lib</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+
+ <!-- ============ Connectors Jars ============ -->
+ <!-- SeaTunnel connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
<includes>
- <include>connector-*.jar</include>
+ <include>org.apache.seatunnel:connector-*:jar</include>
</includes>
<excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- <exclude>connector-common*.jar</exclude>
+ <exclude>org.apache.seatunnel:connector-common</exclude>
+ <exclude>org.apache.seatunnel:connector-*-base</exclude>
</excludes>
<outputDirectory>/connectors/seatunnel</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
+ <scope>provided</scope>
+ </dependencySet>
+ <!-- Flink connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
<includes>
- <include>plugin-mapping.properties</include>
+
<include>org.apache.seatunnel:seatunnel-connector-flink-*:jar</include>
</includes>
- <outputDirectory>/connectors</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/bin</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>/connectors/flink</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+ <!-- Flink SQL connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
<includes>
- <include>*</include>
+
<include>org.apache.seatunnel:flink-sql-connector-*:jar</include>
</includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <!--Licenses And NOTICE-->
- <fileSet>
- <directory>release-docs</directory>
- <outputDirectory>.</outputDirectory>
- </fileSet>
- <!-- DISCLAIMER -->
- <fileSet>
- <directory>${basedir}/.././</directory>
+ <outputDirectory>/connectors/flink-sql</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+ <!-- Spark connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
<includes>
- <include>DISCLAIMER</include>
+
<include>org.apache.seatunnel:seatunnel-connector-spark-*:jar</include>
</includes>
- <outputDirectory>.</outputDirectory>
- </fileSet>
-
- </fileSets>
+ <outputDirectory>/connectors/spark</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+ </dependencySets>
</assembly>
diff --git a/seatunnel-dist/src/main/assembly/assembly-bin.xml
b/seatunnel-dist/src/main/assembly/assembly-bin.xml
index d68a147da..125e1a176 100644
--- a/seatunnel-dist/src/main/assembly/assembly-bin.xml
+++ b/seatunnel-dist/src/main/assembly/assembly-bin.xml
@@ -43,16 +43,7 @@
<include>plugins/**</include>
</includes>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-core-flink/target</directory>
- <includes>
- <include>seatunnel-core-flink*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
+ <!-- ============ Starter Bin ============ -->
<fileSet>
<directory>../seatunnel-core/seatunnel-core-flink/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
@@ -63,99 +54,12 @@
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-core-flink-sql/target</directory>
- <includes>
- <include>seatunnel-core-flink-sql*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
<fileSet>
<directory>../seatunnel-core/seatunnel-core-spark/src/main/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-core-spark/target</directory>
- <includes>
- <include>seatunnel-core-spark*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-flink-starter/src/main/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-flink-starter/target</directory>
- <includes>
- <include>seatunnel-flink-starter*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-spark-starter/src/main/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
-
<directory>../seatunnel-core/seatunnel-spark-starter/target</directory>
- <includes>
- <include>seatunnel-spark-starter*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/lib</outputDirectory>
- </fileSet>
- <!-- connectors -->
- <fileSet>
-
<directory>../seatunnel-connectors/seatunnel-connectors-flink-dist/target/lib</directory>
- <includes>
- <include>seatunnel-connector-flink*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/connectors/flink</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>../seatunnel-connectors/seatunnel-connectors-flink-sql-dist/target/lib</directory>
- <includes>
- <include>flink-sql-connector*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/connectors/flink-sql</outputDirectory>
- </fileSet>
- <fileSet>
-
<directory>../seatunnel-connectors/seatunnel-connectors-spark-dist/target/lib</directory>
- <includes>
- <include>seatunnel-connector-spark*.jar</include>
- </includes>
- <excludes>
- <exclude>%regex[.*((javadoc)|(sources))\.jar]</exclude>
- </excludes>
- <outputDirectory>/connectors/spark</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../</directory>
- <includes>
- <include>plugin-mapping.properties</include>
- </includes>
- <outputDirectory>/connectors</outputDirectory>
- </fileSet>
+
<fileSet>
<directory>${project.build.directory}/bin</directory>
<outputDirectory>/bin</outputDirectory>
@@ -177,6 +81,67 @@
</includes>
<outputDirectory>.</outputDirectory>
</fileSet>
-
</fileSets>
+
+ <files>
+ <file>
+ <source>../plugin-mapping.properties</source>
+ <outputDirectory>/connectors</outputDirectory>
+ </file>
+ </files>
+
+ <dependencySets>
+ <!-- ============ Starter Jars ============ -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <includes>
+ <!-- Flink starter -->
+
<include>org.apache.seatunnel:seatunnel-core-flink:jar</include>
+ <!-- Flink SQL starter -->
+
<include>org.apache.seatunnel:seatunnel-core-flink-sql:jar</include>
+ <!-- Spark starter -->
+
<include>org.apache.seatunnel:seatunnel-core-spark:jar</include>
+ </includes>
+
<outputFileNameMapping>${artifact.file.name}</outputFileNameMapping>
+ <outputDirectory>/lib</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+
+ <!-- ============ Connectors Jars ============ -->
+ <!-- Flink connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <includes>
+
<include>org.apache.seatunnel:seatunnel-connector-flink-*:jar</include>
+ </includes>
+ <outputDirectory>/connectors/flink</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+ <!-- Flink SQL connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <includes>
+
<include>org.apache.seatunnel:flink-sql-connector-*:jar</include>
+ </includes>
+ <outputDirectory>/connectors/flink-sql</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+ <!-- Spark connectors -->
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <unpack>false</unpack>
+ <includes>
+
<include>org.apache.seatunnel:seatunnel-connector-spark-*:jar</include>
+ </includes>
+ <outputDirectory>/connectors/spark</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+ </dependencySets>
</assembly>
