Skip to content

Commit 41cfa7d

Browse files
authored
Merge pull request #1842 from ClickHouse/jdbc_all_artifact_fix
[jdbc] Restores jdbc-all.jar content
2 parents 1ab7809 + dfc358b commit 41cfa7d

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

clickhouse-jdbc/pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,16 @@
5050
<!-- </exclusion>-->
5151
<!-- </exclusions>-->
5252
<!-- </dependency>-->
53+
<dependency>
54+
<groupId>${project.parent.groupId}</groupId>
55+
<artifactId>clickhouse-client</artifactId>
56+
<version>${revision}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>${project.parent.groupId}</groupId>
60+
<artifactId>clickhouse-data</artifactId>
61+
<version>${revision}</version>
62+
</dependency>
5363
<dependency>
5464
<groupId>${project.parent.groupId}</groupId>
5565
<artifactId>clickhouse-http-client</artifactId>
@@ -401,11 +411,11 @@
401411
<includes>
402412
<include>com.clickhouse:clickhouse-data</include>
403413
<include>com.clickhouse:clickhouse-client</include>
404-
<include>com.clickhouse:clickhouse-cli-client</include>
414+
<!-- <include>com.clickhouse:clickhouse-cli-client</include>-->
405415
<include>com.clickhouse:clickhouse-http-client</include>
406416
<include>org.apache.httpcomponents.client5:httpclient5</include>
407417
<include>org.apache.httpcomponents.core5:httpcore5</include>
408-
<include>org.apache.httpcomponents.core5:httpcore5-h2</include>
418+
<!-- <include>org.apache.httpcomponents.core5:httpcore5-h2</include>-->
409419
<include>org.lz4:lz4-pure-java</include>
410420
</includes>
411421
</artifactSet>
@@ -461,6 +471,7 @@
461471
<artifactSet>
462472
<includes>
463473
<include>com.clickhouse:clickhouse-data</include>
474+
<include>com.clickhouse:clickhouse-client</include>
464475
<!-- CLI Client Deprecation <include>com.clickhouse:clickhouse-client</include>-->
465476
<!-- CLI Client Deprecation <include>com.clickhouse:clickhouse-cli-client</include>-->
466477
<!-- GRPC Client. Deprecation. <include>com.clickhouse:clickhouse-grpc-client</include>-->
@@ -485,6 +496,7 @@
485496
<!-- GRPC Client. Deprecation. <include>io.opencensus:opencensus-contrib-grpc-metrics</include>-->
486497
<include>io.perfmark:perfmark-api</include>
487498
<include>org.apache.commons:commons-compress</include>
499+
<include>com.clickhouse:clickhouse-http-client</include>
488500
<include>org.apache.httpcomponents.client5:httpclient5</include>
489501
<include>org.apache.httpcomponents.core5:httpcore5</include>
490502
<include>org.apache.httpcomponents.core5:httpcore5-h2</include>

examples/demo-kotlin-service/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
3434

3535
// https://mvnrepository.com/artifact/com.clickhouse/client-v2
36-
implementation("com.clickhouse:client-v2:0.6.4-SNAPSHOT")
36+
implementation("com.clickhouse:client-v2:0.6.5-SNAPSHOT")
3737

3838
// http client used by clickhouse client
3939
implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")

0 commit comments

Comments
 (0)