Merge pull request #1842 from ClickHouse/jdbc_all_artifact_fix

[jdbc] Restores jdbc-all.jar content
ClickHouse · Sep 30, 2024 · 41cfa7d · 41cfa7d
2 parents 1ab7809 + dfc358b
commit 41cfa7d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/clickhouse-jdbc/pom.xml b/clickhouse-jdbc/pom.xml
@@ -50,6 +50,16 @@
 <!--                </exclusion>-->
 <!--            </exclusions>-->
 <!--        </dependency>-->
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>clickhouse-client</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>clickhouse-data</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>clickhouse-http-client</artifactId>
@@ -401,11 +411,11 @@
                                 <includes>
                                     <include>com.clickhouse:clickhouse-data</include>
                                     <include>com.clickhouse:clickhouse-client</include>
-                                    <include>com.clickhouse:clickhouse-cli-client</include>
+<!--                                    <include>com.clickhouse:clickhouse-cli-client</include>-->
                                     <include>com.clickhouse:clickhouse-http-client</include>
                                     <include>org.apache.httpcomponents.client5:httpclient5</include>
                                     <include>org.apache.httpcomponents.core5:httpcore5</include>
-                                    <include>org.apache.httpcomponents.core5:httpcore5-h2</include>
+<!--                                    <include>org.apache.httpcomponents.core5:httpcore5-h2</include>-->
                                     <include>org.lz4:lz4-pure-java</include>
                                 </includes>
                             </artifactSet>
@@ -461,6 +471,7 @@
                             <artifactSet>
                                 <includes>
                                     <include>com.clickhouse:clickhouse-data</include>
+                                    <include>com.clickhouse:clickhouse-client</include>
 <!-- CLI Client Deprecation                                   <include>com.clickhouse:clickhouse-client</include>-->
 <!-- CLI Client Deprecation                                   <include>com.clickhouse:clickhouse-cli-client</include>-->
 <!-- GRPC Client. Deprecation.                                   <include>com.clickhouse:clickhouse-grpc-client</include>-->
@@ -485,6 +496,7 @@
 <!-- GRPC Client. Deprecation.                                   <include>io.opencensus:opencensus-contrib-grpc-metrics</include>-->
                                     <include>io.perfmark:perfmark-api</include>
                                     <include>org.apache.commons:commons-compress</include>
+                                    <include>com.clickhouse:clickhouse-http-client</include>
                                     <include>org.apache.httpcomponents.client5:httpclient5</include>
                                     <include>org.apache.httpcomponents.core5:httpcore5</include>
                                     <include>org.apache.httpcomponents.core5:httpcore5-h2</include>

diff --git a/examples/demo-kotlin-service/build.gradle.kts b/examples/demo-kotlin-service/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
 
     // https://mvnrepository.com/artifact/com.clickhouse/client-v2
-    implementation("com.clickhouse:client-v2:0.6.4-SNAPSHOT")
+    implementation("com.clickhouse:client-v2:0.6.5-SNAPSHOT")
 
     // http client used by clickhouse client
     implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")