Skip to content

[FLINK-36054][cdc][build] Fix Flink CDC parent pom and release scripts #3540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PatrickRen merged 5 commits into from
Aug 14, 2024
Merged

[FLINK-36054][cdc][build] Fix Flink CDC parent pom and release scripts #3540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29d203f
[FLINK-36054][cdc][build] Remove distribution management and add scm …
PatrickRen Apr 26, 2024
412bacb
[FLINK-36054][cdc][build] Change parent POM's artifact ID to flink-cd…
PatrickRen Apr 26, 2024
3a6256c
[FLINK-36054][cdc][build] Use apache-release profile instead
PatrickRen Apr 26, 2024
543b4a6
[FLINK-36054][cdc][build] Include LICENSE in binary release
PatrickRen Apr 26, 2024
ee89a36
[FLINK-36054][cdc][build] Use flink-cdc as source release prefix
PatrickRen Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flink-cdc-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-composer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-connect/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
7 changes: 7 additions & 0 deletions flink-cdc-dist/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ limitations under the License.
<destName>flink-cdc-dist-${revision}.jar</destName>
<fileMode>0644</fileMode>
</file>

<!-- copy license -->
<file>
<source>../LICENSE</source>
<outputDirectory/>
<fileMode>0644</fileMode>
</file>
</files>

<fileSets>
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-e2e-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-migration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<version>${revision}</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-pipeline-udf-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<version>${revision}</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
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>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<groupId>org.apache.flink</groupId>
<version>${revision}</version>
</parent>
Expand Down
127 changes: 25 additions & 102 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>

<groupId>org.apache.flink</groupId>
<artifactId>flink-cdc</artifactId>
<artifactId>flink-cdc-parent</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>

Expand All @@ -51,16 +51,11 @@ limitations under the License.
</license>
</licenses>

<distributionManagement>
<snapshotRepository>
<id>oss</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>oss</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<scm>
<url>https://github.com/apache/flink-cdc</url>
<connection>git@github.com:apache/flink-cdc.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/flink-cdc.git</developerConnection>
</scm>

<properties>
<revision>3.3-SNAPSHOT</revision>
Expand Down Expand Up @@ -727,107 +722,35 @@ limitations under the License.
</build>
</profile>
<profile>
<id>release</id>
<!--
We're reusing the apache-release build profile defined in the Apache Parent POM,
with one exclusion: do not run the source-release-assembly execution goal.
We have our own scripts to create the source release, which correctly excludes
binaries from distribution tarball.
The script can be found under tools/releasing/create_source_release.sh.
-->
<id>apache-release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<artifactId>maven-assembly-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
<version>1.0.6</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8,)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.ju-n.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>artifacts</goal>
</goals>
</execution>
</executions>
<configuration>
<algorithms>
<algorithm>SHA-256</algorithm>
</algorithms>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version><!--$NO-MVN-MAN-VER$-->
<configuration>
<quiet>true</quiet>
<detectOfflineLinks>false</detectOfflineLinks>
<additionalJOptions combine.children="append">
<additionalJOption>-Xdoclint:none</additionalJOption>
</additionalJOptions>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<id>source-release-assembly</id>
<!-- disable the execution -->
<phase>none</phase>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
<arguments>${arguments} -Psonatype-oss-release</arguments>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
Expand Down
6 changes: 3 additions & 3 deletions tools/releasing/create_source_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ rsync -a \
--exclude ".travis.yml" \
. flink-cdc-${RELEASE_VERSION}

tar czf ${RELEASE_DIR}/apache-flink-cdc-${RELEASE_VERSION}-src.tgz flink-cdc-${RELEASE_VERSION}
gpg --armor --detach-sig ${RELEASE_DIR}/apache-flink-cdc-${RELEASE_VERSION}-src.tgz
tar czf ${RELEASE_DIR}/flink-cdc-${RELEASE_VERSION}-src.tgz flink-cdc-${RELEASE_VERSION}
gpg --armor --detach-sig ${RELEASE_DIR}/flink-cdc-${RELEASE_VERSION}-src.tgz
cd ${RELEASE_DIR}
${SHASUM} apache-flink-cdc-${RELEASE_VERSION}-src.tgz > apache-flink-cdc-${RELEASE_VERSION}-src.tgz.sha512
${SHASUM} flink-cdc-${RELEASE_VERSION}-src.tgz > flink-cdc-${RELEASE_VERSION}-src.tgz.sha512

rm -rf ${CLONE_DIR}

Expand Down