Skip to content

Commit e53f167

Browse files
mzitnikmzitnik
committed
Fix compile & tests
1 parent fe83307 commit e53f167

File tree

4 files changed

+92
-103
lines changed

4 files changed

+92
-103
lines changed

‎.github/workflows/tests.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
if: env.SKIP_STEP != 'true'
2828
uses: actions/setup-java@v3
2929
with:
30-
java-version: '11'
30+
java-version: '24'
3131
distribution: 'adopt'
3232
architecture: x64
3333
- name: Setup and execute Gradle 'test' task
@@ -39,7 +39,7 @@ jobs:
3939
CLICKHOUSE_CLOUD_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
4040
FLINK_VERSION: ${{ matrix.flink }}
4141
with:
42-
arguments: :flink-connector-clickhouse-1.17:test --info --stacktrace --continue
42+
arguments: :flink-connector-clickhouse-1.17:test
4343
test-flink-2:
4444
runs-on: ubuntu-latest
4545
strategy:
@@ -74,4 +74,4 @@ jobs:
7474
CLICKHOUSE_CLOUD_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
7575
CLICKHOUSE_CLOUD_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
7676
with:
77-
arguments: :flink-connector-clickhouse-2.0.0:test --info --stacktrace --continue
77+
arguments: :flink-connector-clickhouse-2.0.0:test

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ plugins {
88
scala
99
java
1010
signing
11+
`java-test-fixtures`
1112
id("com.gradleup.nmcp") version "0.0.8"
1213
id("com.github.johnrengelman.shadow") version "8.1.1"
1314
}
@@ -46,9 +47,8 @@ dependencies {
4647
implementation("org.apache.logging.log4j:log4j-api:${project.extra["log4jVersion"]}")
4748
implementation("org.apache.logging.log4j:log4j-1.2-api:${project.extra["log4jVersion"]}")
4849
implementation("org.apache.logging.log4j:log4j-core:${project.extra["log4jVersion"]}")
49-
implementation(project(":flink-connector-clickhouse-base"))
5050

51-
testImplementation(project(":flink-connector-clickhouse-base"))
51+
implementation(project(":flink-connector-clickhouse-base"))
5252
// ClickHouse Client Libraries
5353
implementation("com.clickhouse:client-v2:${clickhouseVersion}:all")
5454
// Apache Flink Libraries
@@ -96,12 +96,9 @@ sourceSets {
9696
}
9797

9898
tasks.shadowJar {
99-
dependsOn(":flink-connector-clickhouse-base:classes")
100-
10199
archiveClassifier.set("all")
102100

103101
dependencies {
104-
include(project(":flink-connector-clickhouse-base"))
105102
exclude(dependency("org.apache.flink:.*"))
106103
}
107104
mergeServiceFiles()
@@ -114,7 +111,7 @@ val shadowSourcesJar by tasks.registering(Jar::class) {
114111
}
115112

116113
tasks.jar {
117-
enabled = false
114+
enabled = true
118115
}
119116

120117
publishing {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ dependencies {
4848
implementation("org.apache.flink:flink-streaming-java:${project.extra["flinkVersion"]}")
4949
implementation(project(":flink-connector-clickhouse-base"))
5050

51-
testImplementation(project(":flink-connector-clickhouse-base"))
5251
testImplementation("org.apache.flink:flink-connector-files:${project.extra["flinkVersion"]}")
5352
testImplementation("org.apache.flink:flink-connector-base:${project.extra["flinkVersion"]}")
5453
testImplementation("org.apache.flink:flink-streaming-java:${project.extra["flinkVersion"]}")
@@ -89,11 +88,8 @@ sourceSets {
8988
}
9089

9190
tasks.shadowJar {
92-
dependsOn(":flink-connector-clickhouse-base:classes")
9391
archiveClassifier.set("all")
94-
9592
dependencies {
96-
include(project(":flink-connector-clickhouse-base"))
9793
exclude(dependency("org.apache.flink:.*"))
9894
}
9995
mergeServiceFiles()
@@ -105,10 +101,6 @@ val shadowSourcesJar by tasks.registering(Jar::class) {
105101
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
106102
}
107103

108-
tasks.jar {
109-
enabled = false
110-
}
111-
112104
publishing {
113105
publications {
114106
create<MavenPublication>("maven") {

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

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -106,92 +106,92 @@ sourceSets {
106106
// )
107107
//}
108108
//
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-
}
109+
//tasks.shadowJar {
110+
// archiveClassifier.set("all")
111+
//
112+
// dependencies {
113+
// exclude(dependency("org.apache.flink:.*"))
114+
// }
115+
// mergeServiceFiles()
116+
//}
172117

173-
issueManagement {
174-
system.set("GitHub Issues")
175-
url.set("https://github.com/ClickHouse/flink-connector-clickhouse/issues")
176-
}
177-
}
178-
}
179-
}
180-
}
118+
//val shadowSourcesJar by tasks.registering(Jar::class) {
119+
// archiveClassifier.set("all-sources")
120+
// from(sourceSets.main.get().allSource)
121+
// duplicatesStrategy = DuplicatesStrategy.EXCLUDE
122+
//}
181123

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-
}
124+
//tasks.jar {
125+
// enabled = false
126+
//}
190127

191-
nmcp {
192-
publish("maven") {
193-
username = System.getenv("NMCP_USERNAME")
194-
password = System.getenv("NMCP_PASSWORD")
195-
publicationType = "AUTOMATIC"
196-
}
197-
}
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+
//}

0 commit comments

Comments
 (0)