From 008984a73ec57c86125d87ba3b70370f4031cecb Mon Sep 17 00:00:00 2001
From: "chenglong.wang" <tiny.wcl@gmail.com>
Date: Thu, 26 Dec 2024 09:58:39 +0800
Subject: [PATCH] [improve] Adjust pom dependencies and packaging strategy #159

---
 flink-connector-clickhouse-e2e-test/pom.xml |  31 +-----
 flink-connector-clickhouse/pom.xml          |  61 +----------
 flink-sql-connector-clickhouse/pom.xml      |  59 +++-------
 pom.xml                                     | 114 +++++++++++++-------
 4 files changed, 95 insertions(+), 170 deletions(-)

diff --git a/flink-connector-clickhouse-e2e-test/pom.xml b/flink-connector-clickhouse-e2e-test/pom.xml
index d2285ed..678d8ce 100644
--- a/flink-connector-clickhouse-e2e-test/pom.xml
+++ b/flink-connector-clickhouse-e2e-test/pom.xml
@@ -24,7 +24,6 @@ limitations under the License.
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>org.apache.flink</groupId>
 	<name>Flink : Connectors : Clickhouse : E2E Tests</name>
 	<artifactId>flink-connector-clickhouse-e2e-test</artifactId>
 	<url>https://flink.apache.org</url>
@@ -35,20 +34,15 @@ limitations under the License.
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-connector-test-utils</artifactId>
-			<version>${flink.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>clickhouse</artifactId>
 			<version>${testcontainer.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.clickhouse</groupId>
-			<artifactId>clickhouse-jdbc</artifactId>
-			<version>${clickhouse-jdbc.version}</version>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-test-utils</artifactId>
+			<version>${flink.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -57,25 +51,6 @@ limitations under the License.
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents.client5</groupId>
-			<artifactId>httpclient5</artifactId>
-			<version>${httpclient5.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents.core5</groupId>
-			<artifactId>httpcore5</artifactId>
-			<version>${httpcore5.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5-h2 -->
-		<dependency>
-			<groupId>org.apache.httpcomponents.core5</groupId>
-			<artifactId>httpcore5-h2</artifactId>
-			<version>${httpcore5.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/flink-connector-clickhouse/pom.xml b/flink-connector-clickhouse/pom.xml
index 853d1b0..d7760fa 100644
--- a/flink-connector-clickhouse/pom.xml
+++ b/flink-connector-clickhouse/pom.xml
@@ -26,97 +26,52 @@ limitations under the License.
 
 	<artifactId>flink-connector-clickhouse</artifactId>
 	<name>Flink : Connectors : Clickhouse</name>
-
 	<packaging>jar</packaging>
 
 	<dependencies>
-
-		<!-- Core -->
-
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-streaming-java</artifactId>
-			<version>${flink.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- Connectors -->
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-connector-base</artifactId>
-			<version>${flink.version}</version>
 		</dependency>
-
-		<!-- Table ecosystem -->
-
-		<!-- Projects depending on this project won't depend on flink-table-*. -->
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-table-api-java-bridge</artifactId>
-			<version>${flink.version}</version>
-			<scope>provided</scope>
-			<optional>true</optional>
 		</dependency>
 
 		<!-- Clickhouse -->
-
 		<dependency>
 			<groupId>com.clickhouse</groupId>
 			<artifactId>clickhouse-jdbc</artifactId>
-			<version>${clickhouse-jdbc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
 		</dependency>
-
-		<!--	Http	-->
-
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.2.1</version>
 		</dependency>
 
 		<!-- Tests -->
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-core</artifactId>
-			<version>${flink.version}</version>
-			<scope>test</scope>
-			<type>test-jar</type>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-streaming-java</artifactId>
+			<artifactId>flink-test-utils</artifactId>
 			<version>${flink.version}</version>
 			<scope>test</scope>
-			<type>test-jar</type>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-test-utils</artifactId>
+			<artifactId>flink-connector-test-utils</artifactId>
 			<version>${flink.version}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-connector-test-utils</artifactId>
+			<artifactId>flink-streaming-java</artifactId>
 			<version>${flink.version}</version>
 			<scope>test</scope>
+			<type>test-jar</type>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-runtime</artifactId>
@@ -124,7 +79,6 @@ limitations under the License.
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-connector-base</artifactId>
@@ -133,13 +87,6 @@ limitations under the License.
 			<type>test-jar</type>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-metrics-jmx</artifactId>
-			<version>${flink.version}</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Clickhouse table factory testing -->
 		<dependency>
 			<groupId>org.apache.flink</groupId>
diff --git a/flink-sql-connector-clickhouse/pom.xml b/flink-sql-connector-clickhouse/pom.xml
index e88a05a..3e8d192 100644
--- a/flink-sql-connector-clickhouse/pom.xml
+++ b/flink-sql-connector-clickhouse/pom.xml
@@ -27,47 +27,24 @@ limitations under the License.
 	<artifactId>flink-sql-connector-clickhouse</artifactId>
 	<name>Flink : Connectors : SQL : Clickhouse</name>
 	<url>https://flink.apache.org</url>
-
 	<packaging>jar</packaging>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.flink</groupId>
+			<artifactId>flink-connector-clickhouse</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>com.diffplug.spotless</groupId>
-				<artifactId>spotless-maven-plugin</artifactId>
-				<version>${spotless-maven-plugin.version}</version>
-				<configuration>
-					<java>
-						<googleJavaFormat>
-							<version>1.7</version>
-							<style>AOSP</style>
-						</googleJavaFormat>
-						<!-- \# refers to the static imports -->
-						<importOrder>
-							<order>
-								org.apache.flink,org.apache.flink.shaded,,javax,java,scala,\#
-							</order>
-						</importOrder>
-						<removeUnusedImports/>
-					</java>
-				</configuration>
-				<executions>
-					<execution>
-						<id>spotless-check</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>${maven-shade-plugin.version}</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -77,10 +54,6 @@ limitations under the License.
 						<configuration>
 							<shadeTestJar>false</shadeTestJar>
 							<artifactSet>
-								<includes>
-									<include>org.apache.flink:flink-connector-base</include>
-									<include>org.apache.flink:flink-connector-clickhouse</include>
-								</includes>
 								<excludes>
 									<!-- These jars must exist on the server side -->
 									<exclude>log4j:*</exclude>
@@ -90,24 +63,20 @@ limitations under the License.
 							</artifactSet>
 							<relocations>
 								<relocation>
-									<pattern>ru.yandex.clickhouse</pattern>
-									<shadedPattern>${shade.base}.ru.yandex.clickhouse</shadedPattern>
-								</relocation>
-								<relocation>
-									<pattern>com.fasterxml</pattern>
-									<shadedPattern>${shade.base}.com.fasterxml</shadedPattern>
+									<pattern>com.clickhouse</pattern>
+									<shadedPattern>${shade.base}.com.clickhouse</shadedPattern>
 								</relocation>
 								<relocation>
 									<pattern>org.apache.commons</pattern>
 									<shadedPattern>${shade.base}.org.apache.commons</shadedPattern>
 								</relocation>
 								<relocation>
-									<pattern>org.apache.http</pattern>
-									<shadedPattern>${shade.base}.org.apache.http</shadedPattern>
+									<pattern>org.apache.hc.client5</pattern>
+									<shadedPattern>${shade.base}.org.apache.hc.client5</shadedPattern>
 								</relocation>
 								<relocation>
-									<pattern>net.jpountz</pattern>
-									<shadedPattern>${shade.base}.net.jpountz</shadedPattern>
+									<pattern>org.apache.hc.core5</pattern>
+									<shadedPattern>${shade.base}.org.apache.hc.core5</shadedPattern>
 								</relocation>
 							</relocations>
 							<filters>
diff --git a/pom.xml b/pom.xml
index 147df00..9c8b5f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,25 +57,17 @@ limitations under the License.
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>8</maven.compiler.target>
 		<junit.version>4.13.2</junit.version>
 		<clickhouse-jdbc.version>0.6.4</clickhouse-jdbc.version>
 		<scala.binary.version>2.12</scala.binary.version>
 		<flink.version>1.19.0</flink.version>
-		<flink.scope>provided</flink.scope>
-		<guava.version>32.1.3-jre</guava.version>
-		<jackson.version>2.12.4</jackson.version>
 		<commons-lang3.version>3.13.0</commons-lang3.version>
 		<testcontainer.version>1.19.8</testcontainer.version>
 		<httpclient5.version>5.2.1</httpclient5.version>
 		<httpcore5.version>5.2</httpcore5.version>
 		<shade.base>org.apache.flink.shaded.clickhouse</shade.base>
 		<flink.parent.artifactId>flink-connector-clickhouse-parent</flink.parent.artifactId>
-		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-		<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-		<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-		<spotless-maven-plugin.version>2.4.2</spotless-maven-plugin.version>
+		<spotless.skip>false</spotless.skip>
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 	</properties>
 
@@ -86,32 +78,42 @@ limitations under the License.
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.clickhouse</groupId>
-			<artifactId>clickhouse-jdbc</artifactId>
-			<version>${clickhouse-jdbc.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
-		</dependency>
-
-		<!-- flink jars -->
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-table-api-java</artifactId>
-			<version>${flink.version}</version>
-			<scope>${flink.scope}</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-runtime</artifactId>
-			<version>${flink.version}</version>
-			<scope>${flink.scope}</scope>
-		</dependency>
 	</dependencies>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>com.clickhouse</groupId>
+				<artifactId>clickhouse-jdbc</artifactId>
+				<version>${clickhouse-jdbc.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.httpcomponents.client5</groupId>
+				<artifactId>httpclient5</artifactId>
+				<version>${httpclient5.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-lang3</artifactId>
+				<version>${commons-lang3.version}</version>
+			</dependency>
+			<!-- flink jars -->
+			<dependency>
+				<groupId>org.apache.flink</groupId>
+				<artifactId>flink-connector-base</artifactId>
+				<version>${flink.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.flink</groupId>
+				<artifactId>flink-table-api-java-bridge</artifactId>
+				<version>${flink.version}</version>
+				<scope>provided</scope>
+				<optional>true</optional>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -127,16 +129,16 @@ limitations under the License.
 				</dependencies>
 			</plugin>
 
-            <plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 			</plugin>
 
-            <plugin>
+			<plugin>
 				<!-- activate API compatibility checks -->
 				<groupId>com.github.siom79.japicmp</groupId>
 				<artifactId>japicmp-maven-plugin</artifactId>
-                <version>0.20.0</version>
+				<version>0.20.0</version>
 			</plugin>
 
 			<plugin>
@@ -151,31 +153,63 @@ limitations under the License.
 			<plugin>
 				<groupId>com.diffplug.spotless</groupId>
 				<artifactId>spotless-maven-plugin</artifactId>
+				<configuration>
+					<skip>${spotless.skip}</skip>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 			</plugin>
-
 			<plugin>
 				<groupId>org.commonjava.maven.plugins</groupId>
 				<artifactId>directory-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>java11</id>
+			<activation>
+				<jdk>[11,)</jdk>
+			</activation>
+			<properties>
+				<spotless.skip>false</spotless.skip>
+				<target.java.version>11</target.java.version>
+			</properties>
+		</profile>
+		<profile>
+			<id>java17</id>
+			<activation>
+				<jdk>[17,)</jdk>
+			</activation>
+			<properties>
+				<spotless.skip>false</spotless.skip>
+				<target.java.version>17</target.java.version>
+			</properties>
+		</profile>
+		<profile>
+			<id>java21</id>
+			<activation>
+				<jdk>[21,)</jdk>
+			</activation>
+			<properties>
+				<spotless.skip>true</spotless.skip>
+				<target.java.version>21</target.java.version>
+			</properties>
+		</profile>
+	</profiles>
 </project>