Skip to content

Commit f959687

Browse files
joschijoschi
authored
Merge branch 'main' into patch-1
2 parents 1317c1b + 38a5ef5 commit f959687

File tree

8 files changed

+31
-109
lines changed

8 files changed

+31
-109
lines changed

‎clickhouse-http-client/pom.xml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,14 @@
4040
<dependency>
4141
<groupId>org.apache.httpcomponents.client5</groupId>
4242
<artifactId>httpclient5</artifactId>
43-
<exclusions>
44-
<exclusion>
45-
<groupId>org.apache.httpcomponents.core5</groupId>
46-
<artifactId>httpcore5</artifactId>
47-
</exclusion>
48-
</exclusions>
49-
<optional>true</optional>
43+
<version>${apache.httpclient.version}</version>
5044
</dependency>
5145
<dependency>
5246
<groupId>org.apache.httpcomponents.core5</groupId>
5347
<artifactId>httpcore5</artifactId>
54-
<optional>true</optional>
48+
<version>${apache.httpclient.version}</version>
5549
</dependency>
50+
5651
<dependency>
5752
<groupId>org.brotli</groupId>
5853
<artifactId>dec</artifactId>

‎clickhouse-jdbc/pom.xml‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,7 @@
4747
<artifactId>commons-compress</artifactId>
4848
<optional>true</optional>
4949
</dependency>
50-
<dependency>
51-
<groupId>org.apache.httpcomponents.client5</groupId>
52-
<artifactId>httpclient5</artifactId>
53-
<exclusions>
54-
<exclusion>
55-
<groupId>org.apache.httpcomponents.core5</groupId>
56-
<artifactId>httpcore5</artifactId>
57-
</exclusion>
58-
<exclusion>
59-
<groupId>org.slf4j</groupId>
60-
<artifactId>slf4j-api</artifactId>
61-
</exclusion>
62-
</exclusions>
63-
<optional>true</optional>
64-
</dependency>
65-
<dependency>
66-
<groupId>org.apache.httpcomponents.core5</groupId>
67-
<artifactId>httpcore5</artifactId>
68-
<optional>true</optional>
69-
</dependency>
50+
7051
<dependency>
7152
<groupId>org.lz4</groupId>
7253
<artifactId>lz4-pure-java</artifactId>
@@ -145,7 +126,7 @@
145126
<dependency>
146127
<groupId>com.clickhouse</groupId>
147128
<artifactId>clickhouse-http-client</artifactId>
148-
<version>0.7.0-SNAPSHOT</version>
129+
<version>${revision}</version>
149130
<scope>compile</scope>
150131
</dependency>
151132
</dependencies>

‎client-v2/pom.xml‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
<description>New client api for ClickHouse</description>
1717
<url>https://github.com/ClickHouse/clickhouse-java/tree/main/clickhouse-client-api</url>
1818

19+
<properties>
20+
<apache.httpclient.version>5.3.1</apache.httpclient.version>
21+
</properties>
22+
1923
<dependencies>
2024
<dependency>
2125
<groupId>${project.parent.groupId}</groupId>
@@ -26,6 +30,7 @@
2630
<groupId>${project.parent.groupId}</groupId>
2731
<artifactId>clickhouse-http-client</artifactId>
2832
<version>${revision}</version>
33+
<optional>true</optional>
2934
</dependency>
3035
<dependency>
3136
<groupId>org.slf4j</groupId>
@@ -35,7 +40,7 @@
3540
<dependency>
3641
<groupId>org.apache.httpcomponents.client5</groupId>
3742
<artifactId>httpclient5</artifactId>
38-
<version>5.3.1</version>
43+
<version>${apache.httpclient.version}</version>
3944
</dependency>
4045
<dependency>
4146
<groupId>com.github.luben</groupId>
@@ -45,20 +50,23 @@
4550
<dependency>
4651
<groupId>org.lz4</groupId>
4752
<artifactId>lz4-pure-java</artifactId>
48-
<optional>true</optional>
53+
<version>${lz4.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.commons</groupId>
57+
<artifactId>commons-compress</artifactId>
58+
<version>${compress.version}</version>
4959
</dependency>
5060
<dependency>
51-
<groupId>${project.groupId}</groupId>
52-
<artifactId>org.apache.commons.compress</artifactId>
53-
<version>${repackaged.version}</version>
61+
<groupId>org.ow2.asm</groupId>
62+
<artifactId>asm</artifactId>
63+
<version>9.7</version>
5464
</dependency>
55-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
5665
<dependency>
5766
<groupId>com.fasterxml.jackson.core</groupId>
5867
<artifactId>jackson-core</artifactId>
5968
<version>2.17.2</version>
6069
</dependency>
61-
6270
<!-- Test Dependencies -->
6371
<dependency>
6472
<groupId>com.google.code.gson</groupId>
@@ -73,26 +81,13 @@
7381
<scope>test</scope>
7482
<version>2.17.2</version>
7583
</dependency>
76-
<dependency>
77-
<groupId>org.apache.commons</groupId>
78-
<artifactId>commons-compress</artifactId>
79-
<optional>true</optional>
80-
</dependency>
8184
<!-- necessary for Java 9+ -->
8285
<dependency>
8386
<groupId>org.apache.tomcat</groupId>
8487
<artifactId>annotations-api</artifactId>
8588
<scope>provided</scope>
8689
</dependency>
8790

88-
<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
89-
<dependency>
90-
<groupId>org.ow2.asm</groupId>
91-
<artifactId>asm</artifactId>
92-
<version>9.7</version>
93-
</dependency>
94-
95-
9691
<!-- Test dependencies -->
9792
<dependency>
9893
<groupId>${project.parent.groupId}</groupId>

‎examples/client-v2/pom.xml‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6666

6767
<clickhouse-java.version>0.7.0-SNAPSHOT</clickhouse-java.version>
68-
<apache-httpclient.version>5.2.1</apache-httpclient.version>
68+
<apache-httpclient.version>5.3.1</apache-httpclient.version>
6969

7070
<compiler-plugin.version>3.8.1</compiler-plugin.version>
7171

@@ -78,32 +78,14 @@
7878
<artifactId>client-v2</artifactId>
7979
<version>${clickhouse-java.version}</version>
8080
</dependency>
81-
<dependency>
82-
<groupId>com.clickhouse</groupId>
83-
<artifactId>clickhouse-http-client</artifactId>
84-
<version>${clickhouse-java.version}</version>
85-
</dependency>
8681

87-
<!-- Recommended to communicate with ClickHouse server over http -->
88-
<dependency>
89-
<groupId>org.apache.httpcomponents.client5</groupId>
90-
<artifactId>httpclient5</artifactId>
91-
<version>${apache-httpclient.version}</version>
92-
</dependency>
82+
<!-- If Old implementation needed -->
83+
<!-- <dependency>-->
84+
<!-- <groupId>com.clickhouse</groupId>-->
85+
<!-- <artifactId>clickhouse-http-client</artifactId>-->
86+
<!-- <version>${clickhouse-java.version}</version>-->
87+
<!-- </dependency>-->
9388

94-
<!-- Support of the compression -->
95-
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-compress -->
96-
<dependency>
97-
<groupId>org.apache.commons</groupId>
98-
<artifactId>commons-compress</artifactId>
99-
<version>1.26.2</version>
100-
</dependency>
101-
<!-- https://mvnrepository.com/artifact/org.lz4/lz4-java -->
102-
<dependency>
103-
<groupId>org.lz4</groupId>
104-
<artifactId>lz4-java</artifactId>
105-
<version>1.8.0</version>
106-
</dependency>
10789

10890
<!-- Recommended for JSON parsing -->
10991
<dependency>

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ dependencies {
3535
// https://mvnrepository.com/artifact/com.clickhouse/client-v2
3636
implementation("com.clickhouse:client-v2:0.7.0-SNAPSHOT")
3737

38-
// http client used by clickhouse client
39-
implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
40-
// compression dependencies
41-
runtimeOnly("org.apache.commons:commons-compress:1.26.2")
42-
runtimeOnly("org.lz4:lz4-pure-java:1.8.0")
43-
44-
45-
4638
testImplementation("io.ktor:ktor-server-test-host-jvm")
4739
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
4840
}

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,10 @@ dependencies {
3030
// -- clickhouse dependencies
3131
// Main dependency
3232
implementation("com.clickhouse:client-v2:0.7.0-SNAPSHOT") // nightly build
33-
// implementation("com.clickhouse:client-v2:0.6.5") // stable version
34-
// http client used by clickhouse client
35-
implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1")
36-
// compression dependencies
37-
runtimeOnly("org.apache.commons:commons-compress:1.26.2")
38-
runtimeOnly("org.lz4:lz4-pure-java:1.8.0")
39-
// client V1 if old implementation is needed
40-
// implementation("com.clickhouse:clickhouse-http-client:0.6.5")
41-
33+
// implementation("com.clickhouse:client-v2:0.7.0") // stable version
4234

35+
// -- clickhouse-http-client dependencies if old implementation is needed
36+
// implementation("com.clickhouse:clickhouse-http-client:0.7.0-SNAPSHOT")
4337

4438
// -- application dependencies
4539
implementation("org.springframework.boot:spring-boot-starter-actuator")

‎examples/demo-service/src/main/java/com/clickhouse/demo_service/DbConfiguration.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33

44
import com.clickhouse.client.api.Client;
5-
import com.clickhouse.client.http.config.ClickHouseHttpOption;
65
import org.springframework.beans.factory.annotation.Value;
76
import org.springframework.context.annotation.Bean;
87
import org.springframework.context.annotation.Configuration;

‎pom.xml‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<brotli.version>0.1.2</brotli.version>
9393
<brotli4j.version>1.12.0</brotli4j.version>
9494
<caffeine.version>3.1.7</caffeine.version>
95-
<compress.version>1.26.1</compress.version>
95+
<compress.version>1.27.1</compress.version>
9696
<dnsjava.version>3.6.0</dnsjava.version>
9797
<fastutil.version>8.5.12</fastutil.version>
9898
<gson.version>2.10.1</gson.version>
@@ -331,22 +331,6 @@
331331
<artifactId>testng</artifactId>
332332
<version>${testng.version}</version>
333333
</dependency>
334-
<dependency>
335-
<groupId>org.apache.httpcomponents.client5</groupId>
336-
<artifactId>httpclient5</artifactId>
337-
<version>${apache.httpclient.version}</version>
338-
</dependency>
339-
<dependency>
340-
<groupId>org.apache.httpcomponents.core5</groupId>
341-
<artifactId>httpcore5</artifactId>
342-
<version>${apache.httpclient.version}</version>
343-
</dependency>
344-
<dependency>
345-
<groupId>org.apache.httpcomponents.core5</groupId>
346-
<artifactId>httpcore5-h2</artifactId>
347-
<version>${apache.httpclient.version}</version>
348-
</dependency>
349-
350334
<dependency>
351335
<groupId>org.mariadb.jdbc</groupId>
352336
<artifactId>mariadb-java-client</artifactId>

0 commit comments

Comments
 (0)