CalvinKirs commented on code in PR #2703:
URL:
https://github.com/apache/incubator-seatunnel/pull/2703#discussion_r967579867
##########
seatunnel-dist/src/main/assembly/assembly-bin-ci.xml:
##########
@@ -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>
Review Comment:
It seems that our CI is strongly dependent on the logic here. Maybe we will
modify the CI later to get all the connector jars from connector-dist/target. I
remember we no longer release binaries for connectors. Of course, this is
something to do later
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
