Skip to content

Commit e5da291

Browse files
mzitnikmzitnik
committed
Adjust build gradle
1 parent 7b0b53b commit e5da291

File tree

6 files changed

+105
-95
lines changed

6 files changed

+105
-95
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
val sinkVersion by extra("0.0.1")
1111
val flinkVersion by extra("1.18.0")
12-
val clickhouseVersion by extra("0.9.0-SNAPSHOT")
12+
val clickhouseVersion by extra("0.9.1")
1313
val junitVersion by extra("5.8.2")
1414

1515
allprojects {

‎examples/maven/covid/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ under the License.
7575
<scope>provided</scope>
7676
</dependency>
7777

78+
<dependency>
79+
<groupId>com.clickhouse.flink</groupId>
80+
<artifactId>flink-connector-clickhouse-base</artifactId>
81+
<version>0.0.1</version>
82+
<classifier>all</classifier>
83+
</dependency>
84+
7885
<dependency>
7986
<groupId>com.clickhouse.flink</groupId>
8087
<artifactId>flink-connector-clickhouse-2.0.0</artifactId>

‎flink-connector-clickhouse-1.17/build.gradle.kts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ repositories {
2323
val flinkVersion = System.getenv("FLINK_VERSION") ?: "1.17.2"
2424

2525
extra.apply {
26-
set("clickHouseDriverVersion", "0.9.1")
2726
set("flinkVersion", flinkVersion)
2827
set("log4jVersion","2.17.2")
2928
set("testContainersVersion", "1.21.0")
@@ -97,9 +96,12 @@ sourceSets {
9796
}
9897

9998
tasks.shadowJar {
99+
dependsOn(":flink-connector-clickhouse-base:classes")
100+
100101
archiveClassifier.set("all")
101102

102103
dependencies {
104+
include(project(":flink-connector-clickhouse-base"))
103105
exclude(dependency("org.apache.flink:.*"))
104106
}
105107
mergeServiceFiles()

‎flink-connector-clickhouse-2.0.0/build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ repositories {
2121
}
2222

2323
extra.apply {
24-
set("clickHouseDriverVersion", "0.9.1")
2524
set("flinkVersion", "2.0.0")
2625
set("log4jVersion","2.17.2")
2726
set("testContainersVersion", "1.21.0")
@@ -43,7 +42,7 @@ dependencies {
4342
implementation("org.apache.logging.log4j:log4j-core:${project.extra["log4jVersion"]}")
4443

4544
// ClickHouse Client Libraries
46-
implementation("com.clickhouse:client-v2:${project.extra["clickHouseDriverVersion"]}:all")
45+
implementation("com.clickhouse:client-v2:${clickhouseVersion}:all")
4746
// Apache Flink Libraries
4847
implementation("org.apache.flink:flink-connector-base:${project.extra["flinkVersion"]}")
4948
implementation("org.apache.flink:flink-streaming-java:${project.extra["flinkVersion"]}")
@@ -90,9 +89,11 @@ sourceSets {
9089
}
9190

9291
tasks.shadowJar {
92+
dependsOn(":flink-connector-clickhouse-base:classes")
9393
archiveClassifier.set("all")
9494

9595
dependencies {
96+
include(project(":flink-connector-clickhouse-base"))
9697
exclude(dependency("org.apache.flink:.*"))
9798
}
9899
mergeServiceFiles()

‎flink-connector-clickhouse-base/build.gradle.kts‎

Lines changed: 89 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ repositories {
2222
}
2323

2424
extra.apply {
25-
set("clickHouseDriverVersion", "0.9.1")
2625
set("log4jVersion","2.17.2")
2726
set("testContainersVersion", "1.21.0")
2827
set("byteBuddyVersion", "1.17.5")
@@ -107,92 +106,92 @@ sourceSets {
107106
// )
108107
//}
109108
//
110-
//tasks.shadowJar {
111-
// archiveClassifier.set("all")
112-
//
113-
// dependencies {
114-
// exclude(dependency("org.apache.flink:.*"))
115-
// }
116-
// mergeServiceFiles()
117-
//}
118-
//
119-
//val shadowSourcesJar by tasks.registering(Jar::class) {
120-
// archiveClassifier.set("all-sources")
121-
// from(sourceSets.main.get().allSource)
122-
// duplicatesStrategy = DuplicatesStrategy.EXCLUDE
123-
//}
124-
//
125-
//tasks.jar {
126-
// enabled = false
127-
//}
128-
//
129-
//publishing {
130-
// publications {
131-
// create<MavenPublication>("maven") {
132-
// artifact(tasks.shadowJar)
133-
// groupId = "com.clickhouse.flink"
134-
// artifactId = "flink-connector-clickhouse"
135-
// version = sinkVersion
136-
//
137-
// artifact(shadowSourcesJar)
138-
//
139-
// pom {
140-
// name.set("ClickHouse Flink Connector")
141-
// description.set("Official Apache Flink connector for ClickHouse")
142-
// url.set("https://github.com/ClickHouse/flink-connector-clickhouse")
143-
//
144-
// licenses {
145-
// license {
146-
// name.set("The Apache License, Version 2.0")
147-
// url.set("https://github.com/ClickHouse/flink-connector-clickhouse/blob/main/LICENSE")
148-
// }
149-
// }
150-
//
151-
// developers {
152-
// developer {
153-
// id.set("mzitnik")
154-
// name.set("Mark Zitnik")
155-
// email.set("[email protected]")
156-
// }
157-
// developer {
158-
// id.set("BentsiLeviav")
159-
// name.set("Bentsi Leviav")
160-
// email.set("[email protected]")
161-
// }
162-
// }
163-
//
164-
// scm {
165-
// connection.set("[email protected]:ClickHouse/flink-connector-clickhouse.git")
166-
// url.set("https://github.com/ClickHouse/flink-connector-clickhouse")
167-
// }
168-
//
169-
// organization {
170-
// name.set("ClickHouse")
171-
// url.set("https://clickhouse.com")
172-
// }
173-
//
174-
// issueManagement {
175-
// system.set("GitHub Issues")
176-
// url.set("https://github.com/ClickHouse/flink-connector-clickhouse/issues")
177-
// }
178-
// }
179-
// }
180-
// }
181-
//}
182-
//
183-
//signing {
184-
// val signingKey = System.getenv("SIGNING_KEY")
185-
// val signingPassword = System.getenv("SIGNING_PASSWORD")
186-
// if (signingKey != null && signingPassword != null) {
187-
// useInMemoryPgpKeys(signingKey, signingPassword)
188-
// sign(publishing.publications["maven"])
189-
// }
190-
//}
191-
//
192-
//nmcp {
193-
// publish("maven") {
194-
// username = System.getenv("NMCP_USERNAME")
195-
// password = System.getenv("NMCP_PASSWORD")
196-
// publicationType = "AUTOMATIC"
197-
// }
198-
//}
109+
tasks.shadowJar {
110+
archiveClassifier.set("all")
111+
112+
dependencies {
113+
exclude(dependency("org.apache.flink:.*"))
114+
}
115+
mergeServiceFiles()
116+
}
117+
118+
val shadowSourcesJar by tasks.registering(Jar::class) {
119+
archiveClassifier.set("all-sources")
120+
from(sourceSets.main.get().allSource)
121+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
122+
}
123+
124+
tasks.jar {
125+
enabled = false
126+
}
127+
128+
publishing {
129+
publications {
130+
create<MavenPublication>("maven") {
131+
artifact(tasks.shadowJar)
132+
groupId = "com.clickhouse.flink"
133+
artifactId = "flink-connector-clickhouse-base"
134+
version = sinkVersion
135+
136+
artifact(shadowSourcesJar)
137+
138+
pom {
139+
name.set("ClickHouse Flink Connector")
140+
description.set("Official Apache Flink connector for ClickHouse")
141+
url.set("https://github.com/ClickHouse/flink-connector-clickhouse")
142+
143+
licenses {
144+
license {
145+
name.set("The Apache License, Version 2.0")
146+
url.set("https://github.com/ClickHouse/flink-connector-clickhouse/blob/main/LICENSE")
147+
}
148+
}
149+
150+
developers {
151+
developer {
152+
id.set("mzitnik")
153+
name.set("Mark Zitnik")
154+
email.set("[email protected]")
155+
}
156+
developer {
157+
id.set("BentsiLeviav")
158+
name.set("Bentsi Leviav")
159+
email.set("[email protected]")
160+
}
161+
}
162+
163+
scm {
164+
connection.set("[email protected]:ClickHouse/flink-connector-clickhouse.git")
165+
url.set("https://github.com/ClickHouse/flink-connector-clickhouse")
166+
}
167+
168+
organization {
169+
name.set("ClickHouse")
170+
url.set("https://clickhouse.com")
171+
}
172+
173+
issueManagement {
174+
system.set("GitHub Issues")
175+
url.set("https://github.com/ClickHouse/flink-connector-clickhouse/issues")
176+
}
177+
}
178+
}
179+
}
180+
}
181+
182+
signing {
183+
val signingKey = System.getenv("SIGNING_KEY")
184+
val signingPassword = System.getenv("SIGNING_PASSWORD")
185+
if (signingKey != null && signingPassword != null) {
186+
useInMemoryPgpKeys(signingKey, signingPassword)
187+
sign(publishing.publications["maven"])
188+
}
189+
}
190+
191+
nmcp {
192+
publish("maven") {
193+
username = System.getenv("NMCP_USERNAME")
194+
password = System.getenv("NMCP_PASSWORD")
195+
publicationType = "AUTOMATIC"
196+
}
197+
}

‎flink-connector-clickhouse-integration/src/test/java/com/clickhouse/flink/integration/FlinkTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class FlinkTests {
2020
static String flinkVersion = "latest";
2121
@BeforeAll
2222
public static void setUp() throws Exception {
23-
flinkVersion = System.getenv("FLINK_VERSION");
23+
flinkVersion = (System.getenv("FLINK_VERSION") != null ? System.getenv("FLINK_VERSION") : "latest");
2424
System.out.println("FLINK_VERSION: " + flinkVersion);
2525
ClickHouseServerForTests.setUp(false);
2626
}
@@ -112,6 +112,7 @@ void testFlinkCluster() throws Exception {
112112
Thread.sleep(2000);
113113
}
114114
int count = ClickHouseServerForTests.countRows(tableName);
115+
System.out.println(count);
115116
Assert.assertEquals(100000, count);
116117
}
117118
}

0 commit comments

Comments
 (0)