You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by GitBox <gi...@apache.org> on 2022/09/09 10:22:59 UTC
[GitHub] [incubator-seatunnel] ashulin opened a new pull request, #2703: [Improve][build] Change the way releases are packaged
ashulin opened a new pull request, #2703:
URL: https://github.com/apache/incubator-seatunnel/pull/2703
<!--
Thank you for contributing to SeaTunnel! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
## Contribution Checklist
- Make sure that the pull request corresponds to a [GITHUB issue](https://github.com/apache/incubator-seatunnel/issues).
- Name the pull request in the form "[Feature] [component] Title of the pull request", where *Feature* can be replaced by `Hotfix`, `Bug`, etc.
- Minor fixes should be named following this pattern: `[hotfix] [docs] Fix typo in README.md doc`.
-->
## Purpose of this pull request
<!-- Describe the purpose of this pull request. For example: This pull request adds checkstyle plugin.-->
## Check list
* [ ] Code changed are covered with tests, or it does not need tests for reason:
* [ ] If any new Jar binary package adding in your PR, please add License Notice according
[New License Guide](https://github.com/apache/incubator-seatunnel/blob/dev/docs/en/contribution/new-license.md)
* [ ] If necessary, please update the documentation to describe the new feature. https://github.com/apache/incubator-seatunnel/tree/dev/docs
--
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: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] ashulin merged pull request #2703: [Improve][build] Change the way releases are packaged
Posted by GitBox <gi...@apache.org>.
ashulin merged PR #2703:
URL: https://github.com/apache/incubator-seatunnel/pull/2703
--
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: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] ashulin commented on a diff in pull request #2703: [Improve][build] Change the way releases are packaged
Posted by GitBox <gi...@apache.org>.
ashulin commented on code in PR #2703:
URL: https://github.com/apache/incubator-seatunnel/pull/2703#discussion_r967634969
##########
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:
`seatunnel-dist` packaging is to generate tar.gz file, how to do CI needs to be discussed.
--
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: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs commented on a diff in pull request #2703: [Improve][build] Change the way releases are packaged
Posted by GitBox <gi...@apache.org>.
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: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org