Skip to content

Commit ce65071

Browse files
authored
Merge pull request #1933 from ClickHouse/v2_remove_old_project_dependencies
[client-v2] Remove dependencies on old projects
2 parents 81f7268 + 542a875 commit ce65071

26 files changed

+1219
-498
lines changed

client-v2/docs/dependencies.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Module Dependencies
2+
3+
## Abstract
4+
This document describes module dependencies and a reason for their existence. Additionally
5+
the document keeps historical information about the dependencies.
6+
7+
## Dependencies
8+
9+
### 0.7.1-patch1
10+
11+
- `com.clickhouse:clickhouse-data:jar:0.7.1-patch1-SNAPSHOT:compile` - Required for reading custom data types. When client-v1 required classes should be moved to client-v2 module this dependency will be removed.
12+
- `com.clickhouse:clickhouse-client:jar:0.7.1-patch1-SNAPSHOT:compile` - Required because there is an option to use client-v1. Additionally, this dependency is required because a few core classes like `ClickHouseNode` are used in client-v2. When client-v1 is deprecated - all required classes should be moved to client-v2 module and this dependency will be removed.
13+
- `org.slf4j:slf4j-api:jar:2.0.7:compile` - Most commonly used logging frontend.
14+
- `org.apache.commons:commons-compress:jar:1.27.1:compile` - Required for compression.
15+
- `org.lz4:lz4-pure-java:jar:1.8.0:compile` - Required for compression.
16+
- `org.ow2.asm:asm:jar:9.7:compile` - Required for serialization/deserialization.
17+
- `org.apache.httpcomponents.client5:httpclient5:jar:5.3.1:compile` - only HTTP client that is currently supported. In the future it should be an optional dependency when support for different clients will be added. This client also implements async API that might be used in the future.
18+
- `com.fasterxml.jackson.core:jackson-core:jar:2.17.2:compile` - used to safely parse summary from ClickHouse.
19+
- `org.roaringbitmap:RoaringBitmap:jar:0.9.47:compile` - used for serialization/deserialization of aggregate functions. For some reason `clickhouse-data` modules has this dependency as `provided`.

client-v2/pom.xml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,22 @@
2323
<dependencies>
2424
<dependency>
2525
<groupId>${project.parent.groupId}</groupId>
26-
<artifactId>clickhouse-client</artifactId>
26+
<artifactId>clickhouse-data</artifactId>
2727
<version>${revision}</version>
2828
</dependency>
29+
30+
<dependency>
31+
<groupId>org.roaringbitmap</groupId>
32+
<artifactId>RoaringBitmap</artifactId>
33+
<version>${roaring-bitmap.version}</version>
34+
</dependency>
35+
2936
<dependency>
3037
<groupId>${project.parent.groupId}</groupId>
31-
<artifactId>clickhouse-http-client</artifactId>
38+
<artifactId>clickhouse-client</artifactId>
3239
<version>${revision}</version>
3340
</dependency>
41+
3442
<dependency>
3543
<groupId>org.slf4j</groupId>
3644
<artifactId>slf4j-api</artifactId>
@@ -41,33 +49,38 @@
4149
<artifactId>httpclient5</artifactId>
4250
<version>${apache.httpclient.version}</version>
4351
</dependency>
44-
<dependency>
45-
<groupId>com.github.luben</groupId>
46-
<artifactId>zstd-jni</artifactId>
47-
<optional>true</optional>
48-
</dependency>
52+
4953
<dependency>
5054
<groupId>org.lz4</groupId>
5155
<artifactId>lz4-pure-java</artifactId>
5256
<version>${lz4.version}</version>
5357
</dependency>
58+
5459
<dependency>
5560
<groupId>org.apache.commons</groupId>
5661
<artifactId>commons-compress</artifactId>
5762
<version>${compress.version}</version>
5863
</dependency>
64+
5965
<dependency>
6066
<groupId>org.ow2.asm</groupId>
6167
<artifactId>asm</artifactId>
6268
<version>9.7</version>
6369
</dependency>
70+
6471
<dependency>
6572
<groupId>com.fasterxml.jackson.core</groupId>
6673
<artifactId>jackson-core</artifactId>
6774
<version>2.17.2</version>
6875
</dependency>
6976

7077
<!-- Test Dependencies -->
78+
<dependency>
79+
<groupId>${project.parent.groupId}</groupId>
80+
<artifactId>clickhouse-http-client</artifactId>
81+
<version>${revision}</version>
82+
<scope>test</scope>
83+
</dependency>
7184
<dependency>
7285
<groupId>com.google.code.gson</groupId>
7386
<artifactId>gson</artifactId>
@@ -81,12 +94,6 @@
8194
<scope>test</scope>
8295
<version>2.17.2</version>
8396
</dependency>
84-
<!-- necessary for Java 9+ -->
85-
<dependency>
86-
<groupId>org.apache.tomcat</groupId>
87-
<artifactId>annotations-api</artifactId>
88-
<scope>provided</scope>
89-
</dependency>
9097

9198
<!-- Test dependencies -->
9299
<dependency>
@@ -119,18 +126,14 @@
119126
<version>${testng.version}</version>
120127
<scope>test</scope>
121128
</dependency>
122-
<!-- Replace with newer version as soon java 11 is minimal version -->
129+
123130
<dependency>
124131
<groupId>com.github.tomakehurst</groupId>
125132
<artifactId>wiremock-jre8</artifactId>
126133
<version>2.35.2</version>
127134
<scope>test</scope>
128135
</dependency>
129-
<dependency>
130-
<groupId>org.roaringbitmap</groupId>
131-
<artifactId>RoaringBitmap</artifactId>
132-
<scope>test</scope>
133-
</dependency>
136+
134137
</dependencies>
135138

136139
<build>

0 commit comments

Comments
 (0)