Skip to content

Commit b0a0b3d

Browse files
snuyanzinsnuyanzin
committed
[build] Add convergence check
1 parent 025ffd1 commit b0a0b3d

File tree

5 files changed

+93
-6
lines changed

5 files changed

+93
-6
lines changed

‎.github/workflows/ci-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
distribution: 'temurin'
4949
- name: Build
5050
run: |
51-
mvn -T 1C -B clean install -DskipTests ${{ inputs.maven-parameters }}
51+
mvn -T 1C -B clean install -DskipTests ${{ inputs.maven-parameters }} -Dflink.convergence.phase=install -Pcheck-convergence
5252
- name: Test
5353
timeout-minutes: 60
5454
run: |
@@ -76,4 +76,4 @@ jobs:
7676
if: ${{ success() && github.ref == 'refs/heads/main' }}
7777
with:
7878
name: jacoco-report-${{ matrix.module }}-${{ github.run_number}}#${{ github.run_attempt }}
79-
path: ${{ github.workspace }}/fluss-test-coverage/target/site/jacoco-aggregate/*
79+
path: ${{ github.workspace }}/fluss-test-coverage/target/site/jacoco-aggregate/*

‎fluss-jmh/pom.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@
6767
<groupId>org.apache.curator</groupId>
6868
<artifactId>curator-test</artifactId>
6969
<version>${curator.version}</version>
70+
<exclusions>
71+
<exclusion>
72+
<groupId>org.checkerframework</groupId>
73+
<artifactId>checker-qual</artifactId>
74+
</exclusion>
75+
<exclusion>
76+
<groupId>com.google.errorprone</groupId>
77+
<artifactId>error_prone_annotations</artifactId>
78+
</exclusion>
79+
</exclusions>
7080
</dependency>
7181

7282
<dependency>
@@ -94,4 +104,4 @@
94104
</dependency>
95105
</dependencies>
96106

97-
</project>
107+
</project>

‎fluss-kafka/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
<groupId>org.apache.kafka</groupId>
3939
<artifactId>kafka-clients</artifactId>
4040
<version>${kafka.version}</version>
41+
<exclusions>
42+
<exclusion>
43+
<groupId>com.github.luben</groupId>
44+
<artifactId>zstd-jni</artifactId>
45+
</exclusion>
46+
</exclusions>
4147
</dependency>
4248

4349
<dependency>
@@ -92,4 +98,4 @@
9298
<scope>test</scope>
9399
</dependency>
94100
</dependencies>
95-
</project>
101+
</project>

‎fluss-lake/fluss-lake-iceberg/pom.xml‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
<groupId>org.apache.iceberg</groupId>
4747
<artifactId>iceberg-core</artifactId>
4848
<version>${iceberg.version}</version>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>io.airlift</groupId>
52+
<artifactId>aircompressor</artifactId>
53+
</exclusion>
54+
</exclusions>
4955
</dependency>
5056
<dependency>
5157
<groupId>org.apache.iceberg</groupId>
@@ -57,6 +63,18 @@
5763
<groupId>javax.annotation</groupId>
5864
<artifactId>javax.annotation-api</artifactId>
5965
</exclusion>
66+
<exclusion>
67+
<groupId>org.apache.httpcomponents.client5</groupId>
68+
<artifactId>httpclient5</artifactId>
69+
</exclusion>
70+
<exclusion>
71+
<groupId>org.apache.httpcomponents.core5</groupId>
72+
<artifactId>httpcore5</artifactId>
73+
</exclusion>
74+
<exclusion>
75+
<groupId>io.airlift</groupId>
76+
<artifactId>aircompressor</artifactId>
77+
</exclusion>
6078
</exclusions>
6179
</dependency>
6280
<dependency>
@@ -82,6 +100,36 @@
82100
<scope>provided</scope>
83101
</dependency>
84102

103+
<!-- dependency convergence -->
104+
<dependency>
105+
<groupId>org.apache.httpcomponents.client5</groupId>
106+
<artifactId>httpclient5</artifactId>
107+
<version>5.4.3</version>
108+
<scope>runtime</scope>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.apache.httpcomponents.core5</groupId>
112+
<artifactId>httpcore5</artifactId>
113+
<version>5.3.4</version>
114+
<scope>runtime</scope>
115+
</dependency>
116+
<dependency>
117+
<groupId>io.airlift</groupId>
118+
<artifactId>aircompressor</artifactId>
119+
<version>0.27</version>
120+
<scope>runtime</scope>
121+
<exclusions>
122+
<exclusion>
123+
<groupId>org.jetbrains.kotlin</groupId>
124+
<artifactId>kotlin-stdlib</artifactId>
125+
</exclusion>
126+
<exclusion>
127+
<groupId>org.jetbrains.kotlin</groupId>
128+
<artifactId>kotlin-stdlib-common</artifactId>
129+
</exclusion>
130+
</exclusions>
131+
</dependency>
132+
85133
<!-- test dependency -->
86134
<dependency>
87135
<groupId>org.apache.fluss</groupId>
@@ -334,4 +382,4 @@
334382
</plugins>
335383
</build>
336384

337-
</project>
385+
</project>

‎pom.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<test.skip.coverage>true</test.skip.coverage>
9090
<fluss.forkCount>2</fluss.forkCount>
9191
<fluss.reuseForks>true</fluss.reuseForks>
92+
<fluss.convergence.phase>validate</fluss.convergence.phase>
9293
<skip.on.java8>false</skip.on.java8>
9394

9495
<!-- library versions in fluss-shaded -->
@@ -531,6 +532,28 @@
531532
</plugins>
532533
</build>
533534
</profile>
535+
<profile>
536+
<id>check-convergence</id>
537+
<activation>
538+
<property>
539+
<name>check-convergence</name>
540+
</property>
541+
</activation>
542+
<build>
543+
<plugins>
544+
<plugin>
545+
<groupId>org.apache.maven.plugins</groupId>
546+
<artifactId>maven-enforcer-plugin</artifactId>
547+
<executions>
548+
<execution>
549+
<id>dependency-convergence</id>
550+
<phase>${fluss.convergence.phase}</phase>
551+
</execution>
552+
</executions>
553+
</plugin>
554+
</plugins>
555+
</build>
556+
</profile>
534557
</profiles>
535558

536559
<build>
@@ -1125,4 +1148,4 @@
11251148
</pluginManagement>
11261149
</build>
11271150

1128-
</project>
1151+
</project>

0 commit comments

Comments
 (0)