Skip to content

Commit fe0a767

Browse files
itinychengitinycheng
committed
[improve] Adjust pom dependencies and packaging strategy #159 
1 parent 5f879c6 commit fe0a767

File tree

4 files changed

+95
-170
lines changed

4 files changed

+95
-170
lines changed

‎flink-connector-clickhouse-e2e-test/pom.xml‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ limitations under the License.
2424
<version>1.0.0-SNAPSHOT</version>
2525
</parent>
2626

27-
<groupId>org.apache.flink</groupId>
2827
<name>Flink : Connectors : Clickhouse : E2E Tests</name>
2928
<artifactId>flink-connector-clickhouse-e2e-test</artifactId>
3029
<url>https://flink.apache.org</url>
@@ -35,20 +34,15 @@ limitations under the License.
3534
</properties>
3635

3736
<dependencies>
38-
<dependency>
39-
<groupId>org.apache.flink</groupId>
40-
<artifactId>flink-connector-test-utils</artifactId>
41-
<version>${flink.version}</version>
42-
</dependency>
4337
<dependency>
4438
<groupId>org.testcontainers</groupId>
4539
<artifactId>clickhouse</artifactId>
4640
<version>${testcontainer.version}</version>
4741
</dependency>
4842
<dependency>
49-
<groupId>com.clickhouse</groupId>
50-
<artifactId>clickhouse-jdbc</artifactId>
51-
<version>${clickhouse-jdbc.version}</version>
43+
<groupId>org.apache.flink</groupId>
44+
<artifactId>flink-connector-test-utils</artifactId>
45+
<version>${flink.version}</version>
5246
<scope>test</scope>
5347
</dependency>
5448
<dependency>
@@ -57,25 +51,6 @@ limitations under the License.
5751
<version>${project.version}</version>
5852
<scope>test</scope>
5953
</dependency>
60-
<dependency>
61-
<groupId>org.apache.httpcomponents.client5</groupId>
62-
<artifactId>httpclient5</artifactId>
63-
<version>${httpclient5.version}</version>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.apache.httpcomponents.core5</groupId>
68-
<artifactId>httpcore5</artifactId>
69-
<version>${httpcore5.version}</version>
70-
<scope>test</scope>
71-
</dependency>
72-
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5-h2 -->
73-
<dependency>
74-
<groupId>org.apache.httpcomponents.core5</groupId>
75-
<artifactId>httpcore5-h2</artifactId>
76-
<version>${httpcore5.version}</version>
77-
<scope>test</scope>
78-
</dependency>
7954
</dependencies>
8055
<build>
8156
<plugins>

‎flink-connector-clickhouse/pom.xml‎

Lines changed: 4 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -26,105 +26,59 @@ limitations under the License.
2626

2727
<artifactId>flink-connector-clickhouse</artifactId>
2828
<name>Flink : Connectors : Clickhouse</name>
29-
3029
<packaging>jar</packaging>
3130

3231
<dependencies>
33-
34-
<!-- Core -->
35-
36-
<dependency>
37-
<groupId>org.apache.flink</groupId>
38-
<artifactId>flink-streaming-java</artifactId>
39-
<version>${flink.version}</version>
40-
<scope>provided</scope>
41-
</dependency>
42-
43-
<!-- Connectors -->
44-
4532
<dependency>
4633
<groupId>org.apache.flink</groupId>
4734
<artifactId>flink-connector-base</artifactId>
48-
<version>${flink.version}</version>
4935
</dependency>
50-
51-
<!-- Table ecosystem -->
52-
53-
<!-- Projects depending on this project won't depend on flink-table-*. -->
5436
<dependency>
5537
<groupId>org.apache.flink</groupId>
5638
<artifactId>flink-table-api-java-bridge</artifactId>
57-
<version>${flink.version}</version>
58-
<scope>provided</scope>
59-
<optional>true</optional>
6039
</dependency>
6140

6241
<!-- Clickhouse -->
63-
6442
<dependency>
6543
<groupId>com.clickhouse</groupId>
6644
<artifactId>clickhouse-jdbc</artifactId>
67-
<version>${clickhouse-jdbc.version}</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>com.fasterxml.jackson.core</groupId>
71-
<artifactId>jackson-databind</artifactId>
72-
<version>${jackson.version}</version>
7345
</dependency>
7446
<dependency>
7547
<groupId>org.apache.commons</groupId>
7648
<artifactId>commons-lang3</artifactId>
77-
<version>${commons-lang3.version}</version>
7849
</dependency>
79-
80-
<!-- Http -->
81-
8250
<dependency>
8351
<groupId>org.apache.httpcomponents.client5</groupId>
8452
<artifactId>httpclient5</artifactId>
85-
<version>5.2.1</version>
8653
</dependency>
8754

8855
<!-- Tests -->
89-
9056
<dependency>
9157
<groupId>org.apache.flink</groupId>
92-
<artifactId>flink-core</artifactId>
93-
<version>${flink.version}</version>
94-
<scope>test</scope>
95-
<type>test-jar</type>
96-
</dependency>
97-
98-
<dependency>
99-
<groupId>org.apache.flink</groupId>
100-
<artifactId>flink-streaming-java</artifactId>
58+
<artifactId>flink-test-utils</artifactId>
10159
<version>${flink.version}</version>
10260
<scope>test</scope>
103-
<type>test-jar</type>
10461
</dependency>
105-
10662
<dependency>
10763
<groupId>org.apache.flink</groupId>
108-
<artifactId>flink-test-utils</artifactId>
64+
<artifactId>flink-connector-test-utils</artifactId>
10965
<version>${flink.version}</version>
11066
<scope>test</scope>
11167
</dependency>
112-
11368
<dependency>
11469
<groupId>org.apache.flink</groupId>
115-
<artifactId>flink-connector-test-utils</artifactId>
70+
<artifactId>flink-streaming-java</artifactId>
11671
<version>${flink.version}</version>
11772
<scope>test</scope>
73+
<type>test-jar</type>
11874
</dependency>
119-
12075
<dependency>
12176
<groupId>org.apache.flink</groupId>
12277
<artifactId>flink-runtime</artifactId>
12378
<version>${flink.version}</version>
12479
<type>test-jar</type>
12580
<scope>test</scope>
12681
</dependency>
127-
12882
<dependency>
12983
<groupId>org.apache.flink</groupId>
13084
<artifactId>flink-connector-base</artifactId>
@@ -133,13 +87,6 @@ limitations under the License.
13387
<type>test-jar</type>
13488
</dependency>
13589

136-
<dependency>
137-
<groupId>org.apache.flink</groupId>
138-
<artifactId>flink-metrics-jmx</artifactId>
139-
<version>${flink.version}</version>
140-
<scope>test</scope>
141-
</dependency>
142-
14390
<!-- Clickhouse table factory testing -->
14491
<dependency>
14592
<groupId>org.apache.flink</groupId>

‎flink-sql-connector-clickhouse/pom.xml‎

Lines changed: 14 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -27,47 +27,24 @@ limitations under the License.
2727
<artifactId>flink-sql-connector-clickhouse</artifactId>
2828
<name>Flink : Connectors : SQL : Clickhouse</name>
2929
<url>https://flink.apache.org</url>
30-
3130
<packaging>jar</packaging>
3231

3332
<properties>
3433
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3534
</properties>
35+
36+
<dependencies>
37+
<dependency>
38+
<groupId>org.apache.flink</groupId>
39+
<artifactId>flink-connector-clickhouse</artifactId>
40+
<version>${project.version}</version>
41+
</dependency>
42+
</dependencies>
3643
<build>
3744
<plugins>
38-
<plugin>
39-
<groupId>com.diffplug.spotless</groupId>
40-
<artifactId>spotless-maven-plugin</artifactId>
41-
<version>${spotless-maven-plugin.version}</version>
42-
<configuration>
43-
<java>
44-
<googleJavaFormat>
45-
<version>1.7</version>
46-
<style>AOSP</style>
47-
</googleJavaFormat>
48-
<!-- \# refers to the static imports -->
49-
<importOrder>
50-
<order>
51-
org.apache.flink,org.apache.flink.shaded,,javax,java,scala,\#
52-
</order>
53-
</importOrder>
54-
<removeUnusedImports/>
55-
</java>
56-
</configuration>
57-
<executions>
58-
<execution>
59-
<id>spotless-check</id>
60-
<phase>validate</phase>
61-
<goals>
62-
<goal>check</goal>
63-
</goals>
64-
</execution>
65-
</executions>
66-
</plugin>
6745
<plugin>
6846
<groupId>org.apache.maven.plugins</groupId>
6947
<artifactId>maven-shade-plugin</artifactId>
70-
<version>${maven-shade-plugin.version}</version>
7148
<executions>
7249
<execution>
7350
<phase>package</phase>
@@ -77,10 +54,6 @@ limitations under the License.
7754
<configuration>
7855
<shadeTestJar>false</shadeTestJar>
7956
<artifactSet>
80-
<includes>
81-
<include>org.apache.flink:flink-connector-base</include>
82-
<include>org.apache.flink:flink-connector-clickhouse</include>
83-
</includes>
8457
<excludes>
8558
<!-- These jars must exist on the server side -->
8659
<exclude>log4j:*</exclude>
@@ -90,24 +63,20 @@ limitations under the License.
9063
</artifactSet>
9164
<relocations>
9265
<relocation>
93-
<pattern>ru.yandex.clickhouse</pattern>
94-
<shadedPattern>${shade.base}.ru.yandex.clickhouse</shadedPattern>
95-
</relocation>
96-
<relocation>
97-
<pattern>com.fasterxml</pattern>
98-
<shadedPattern>${shade.base}.com.fasterxml</shadedPattern>
66+
<pattern>com.clickhouse</pattern>
67+
<shadedPattern>${shade.base}.com.clickhouse</shadedPattern>
9968
</relocation>
10069
<relocation>
10170
<pattern>org.apache.commons</pattern>
10271
<shadedPattern>${shade.base}.org.apache.commons</shadedPattern>
10372
</relocation>
10473
<relocation>
105-
<pattern>org.apache.http</pattern>
106-
<shadedPattern>${shade.base}.org.apache.http</shadedPattern>
74+
<pattern>org.apache.hc.client5</pattern>
75+
<shadedPattern>${shade.base}.org.apache.hc.client5</shadedPattern>
10776
</relocation>
10877
<relocation>
109-
<pattern>net.jpountz</pattern>
110-
<shadedPattern>${shade.base}.net.jpountz</shadedPattern>
78+
<pattern>org.apache.hc.core5</pattern>
79+
<shadedPattern>${shade.base}.org.apache.hc.core5</shadedPattern>
11180
</relocation>
11281
</relocations>
11382
<filters>

0 commit comments

Comments
 (0)