Skip to content

Commit 9994231

Browse files
committed
Split into multi module project
1 parent f70bc0b commit 9994231

File tree

20 files changed

+260
-368
lines changed

20 files changed

+260
-368
lines changed

build.gradle.kts

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
`maven-publish`
3-
scala
43
java
54
signing
65
id("com.gradleup.nmcp") version "0.0.8"
@@ -15,7 +14,7 @@ val junitVersion by extra("5.8.2")
1514

1615
allprojects {
1716
group = "org.apache.flink"
18-
version = "1.0.0"
17+
version = sinkVersion
1918

2019
repositories {
2120
mavenCentral()
@@ -26,32 +25,53 @@ subprojects {
2625
apply(plugin = "java-library")
2726
apply(plugin = "maven-publish")
2827

29-
dependencies {
30-
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
31-
}
32-
3328
java {
3429
toolchain {
3530
languageVersion.set(JavaLanguageVersion.of(11))
3631
}
3732
}
38-
}
3933

40-
sourceSets {
41-
main {
42-
scala {
43-
srcDirs("src/main/scala")
44-
}
45-
java {
46-
srcDirs("src/main/java")
47-
}
34+
dependencies {
35+
// Use JUnit Jupiter for testing.
36+
// testImplementation(libs.junit.jupiter)
37+
testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
38+
testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
4839
}
49-
test {
50-
scala {
51-
srcDirs("src/test/scala")
52-
}
53-
java {
54-
srcDirs("src/test/java")
40+
41+
tasks.test {
42+
useJUnitPlatform()
43+
44+
include("**/*Test.class", "**/*Tests.class", "**/*Spec.class")
45+
testLogging {
46+
events("passed", "failed", "skipped")
47+
//showStandardStreams = true - , "standardOut", "standardError"
5548
}
5649
}
50+
51+
tasks.compileJava {
52+
options.encoding = "UTF-8"
53+
}
54+
55+
tasks.compileTestJava {
56+
options.encoding = "UTF-8"
57+
}
5758
}
59+
60+
//sourceSets {
61+
// main {
62+
// scala {
63+
// srcDirs("src/main/scala")
64+
// }
65+
// java {
66+
// srcDirs("src/main/java")
67+
// }
68+
// }
69+
// test {
70+
// scala {
71+
// srcDirs("src/test/scala")
72+
// }
73+
// java {
74+
// srcDirs("src/test/java")
75+
// }
76+
// }
77+
//}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ dependencies {
4949
implementation("org.apache.logging.log4j:log4j-api:${project.extra["log4jVersion"]}")
5050
implementation("org.apache.logging.log4j:log4j-1.2-api:${project.extra["log4jVersion"]}")
5151
implementation("org.apache.logging.log4j:log4j-core:${project.extra["log4jVersion"]}")
52+
implementation(project(":flink-connector-clickhouse-base"))
5253

54+
testImplementation(project(":flink-connector-clickhouse-base"))
5355
// ClickHouse Client Libraries
5456
implementation("com.clickhouse:client-v2:${project.extra["clickHouseDriverVersion"]}:all")
5557
// Apache Flink Libraries

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ extra.apply {
3131
}
3232

3333
dependencies {
34-
// Use JUnit Jupiter for testing.
35-
testImplementation(libs.junit.jupiter)
36-
37-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
3834

3935
implementation("net.bytebuddy:byte-buddy:${project.extra["byteBuddyVersion"]}")
4036
implementation("net.bytebuddy:byte-buddy-agent:${project.extra["byteBuddyVersion"]}")
@@ -53,8 +49,9 @@ dependencies {
5349
// Apache Flink Libraries
5450
implementation("org.apache.flink:flink-connector-base:${project.extra["flinkVersion"]}")
5551
implementation("org.apache.flink:flink-streaming-java:${project.extra["flinkVersion"]}")
52+
implementation(project(":flink-connector-clickhouse-base"))
5653

57-
54+
testImplementation(project(":flink-connector-clickhouse-base"))
5855
testImplementation("org.apache.flink:flink-connector-files:${project.extra["flinkVersion"]}")
5956
testImplementation("org.apache.flink:flink-connector-base:${project.extra["flinkVersion"]}")
6057
testImplementation("org.apache.flink:flink-streaming-java:${project.extra["flinkVersion"]}")
@@ -93,13 +90,13 @@ sourceSets {
9390
}
9491
}
9592
}
96-
97-
// Apply a specific Java toolchain to ease working on different environments.
98-
java {
99-
toolchain {
100-
languageVersion = JavaLanguageVersion.of(11)
101-
}
102-
}
93+
//
94+
//// Apply a specific Java toolchain to ease working on different environments.
95+
//java {
96+
// toolchain {
97+
// languageVersion = JavaLanguageVersion.of(11)
98+
// }
99+
//}
103100

104101
tasks.test {
105102
useJUnitPlatform()
@@ -119,10 +116,10 @@ tasks.withType<ScalaCompile> {
119116
}
120117
}
121118

122-
tasks.named<Test>("test") {
123-
// Use JUnit Platform for unit tests.
124-
useJUnitPlatform()
125-
}
119+
//tasks.named<Test>("test") {
120+
// // Use JUnit Platform for unit tests.
121+
// useJUnitPlatform()
122+
//}
126123

127124
tasks.register<JavaExec>("runScalaTests") {
128125
group = "verification"

flink-connector-clickhouse-2.0.0/src/main/java/com/clickhouse/utils/Serialize.java

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)