Skip to content

Commit 537c2e8

Browse files
chernserchernser
committed
fixed dependencies
1 parent 0e63603 commit 537c2e8

File tree

7 files changed

+17
-94
lines changed

7 files changed

+17
-94
lines changed

‎clickhouse-client/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@
3434
</exclusions>
3535
</dependency>
3636

37-
<!-- remove -->
38-
<!-- <dependency>-->
39-
<!-- <groupId>com.google.code.gson</groupId>-->
40-
<!-- <artifactId>gson</artifactId>-->
41-
<!-- <optional>true</optional>-->
42-
<!-- </dependency>-->
4337
<dependency>
4438
<groupId>dnsjava</groupId>
4539
<artifactId>dnsjava</artifactId>

‎clickhouse-data/pom.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,39 +85,13 @@
8585
<optional>true</optional>
8686
</dependency>
8787

88-
<!-- remove -->
89-
<!-- <dependency>-->
90-
<!-- <groupId>org.apache.arrow</groupId>-->
91-
<!-- <artifactId>arrow-memory</artifactId>-->
92-
<!-- <type>pom</type>-->
93-
<!-- <optional>true</optional>-->
94-
<!-- </dependency>-->
95-
<!-- <dependency>-->
96-
<!-- <groupId>org.apache.arrow</groupId>-->
97-
<!-- <artifactId>arrow-vector</artifactId>-->
98-
<!-- <optional>true</optional>-->
99-
<!-- </dependency>-->
100-
101-
<!-- remove -->
102-
<!-- <dependency>-->
103-
<!-- <groupId>org.apache.avro</groupId>-->
104-
<!-- <artifactId>avro</artifactId>-->
105-
<!-- <optional>true</optional>-->
106-
<!-- </dependency>-->
107-
108-
10988
<dependency>
11089
<!-- for adaptive queue-->
11190
<groupId>org.jctools</groupId>
11291
<artifactId>jctools-core</artifactId>
11392
<optional>true</optional>
11493
</dependency>
11594

116-
<!-- <dependency>-->
117-
<!-- <groupId>org.msgpack</groupId>-->
118-
<!-- <artifactId>msgpack-core</artifactId>-->
119-
<!-- <optional>true</optional>-->
120-
<!-- </dependency>-->
12195
<dependency>
12296
<groupId>org.ow2.asm</groupId>
12397
<artifactId>asm</artifactId>

‎clickhouse-http-client/pom.xml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<artifactId>zstd-jni</artifactId>
2828
<optional>true</optional>
2929
</dependency>
30-
<!-- <dependency>-->
31-
<!-- <groupId>com.google.code.gson</groupId>-->
32-
<!-- <artifactId>gson</artifactId>-->
33-
<!-- <optional>true</optional>-->
34-
<!-- </dependency>-->
3530
<dependency>
3631
<groupId>org.apache.commons</groupId>
3732
<artifactId>commons-compress</artifactId>
@@ -42,11 +37,6 @@
4237
<artifactId>httpclient5</artifactId>
4338
<version>${apache.httpclient.version}</version>
4439
</dependency>
45-
<dependency>
46-
<groupId>org.apache.httpcomponents.core5</groupId>
47-
<artifactId>httpcore5</artifactId>
48-
<version>${apache.httpclient.version}</version>
49-
</dependency>
5040

5141
<dependency>
5242
<groupId>org.brotli</groupId>
@@ -100,9 +90,9 @@
10090
</dependency>
10191
<!-- Replace with newer version as soon java 11 is minimal version -->
10292
<dependency>
103-
<groupId>com.github.tomakehurst</groupId>
104-
<artifactId>wiremock-jre8</artifactId>
105-
<version>2.35.2</version>
93+
<groupId>org.wiremock</groupId>
94+
<artifactId>wiremock-standalone</artifactId>
95+
<version>3.13.0</version>
10696
<scope>test</scope>
10797
</dependency>
10898
</dependencies>

‎client-v2/pom.xml‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@
7070
<version>${asm.version}</version>
7171
</dependency>
7272

73-
<!-- remove -->
74-
<!-- <dependency>-->
75-
<!-- <groupId>com.fasterxml.jackson.core</groupId>-->
76-
<!-- <artifactId>jackson-core</artifactId>-->
77-
<!-- <version>2.17.2</version>-->
78-
<!-- </dependency>-->
7973
<dependency>
8074
<groupId>io.micrometer</groupId>
8175
<artifactId>micrometer-core</artifactId>
@@ -91,19 +85,6 @@
9185
</dependency>
9286

9387
<!-- Test Dependencies -->
94-
<dependency>
95-
<groupId>${project.parent.groupId}</groupId>
96-
<artifactId>clickhouse-http-client</artifactId>
97-
<version>${revision}</version>
98-
<scope>test</scope>
99-
</dependency>
100-
<!-- <dependency>-->
101-
<!-- <groupId>com.google.code.gson</groupId>-->
102-
<!-- <artifactId>gson</artifactId>-->
103-
<!-- <scope>test</scope>-->
104-
<!-- <optional>true</optional>-->
105-
<!-- </dependency>-->
106-
10788
<dependency>
10889
<groupId>com.fasterxml.jackson.core</groupId>
10990
<artifactId>jackson-databind</artifactId>
@@ -117,12 +98,6 @@
11798
<type>test-jar</type>
11899
<scope>test</scope>
119100
</dependency>
120-
<!-- <dependency>-->
121-
<!-- <groupId>org.slf4j</groupId>-->
122-
<!-- <artifactId>slf4j-simple</artifactId>-->
123-
<!-- <version>${slf4j.version}</version>-->
124-
<!-- <scope>test</scope>-->
125-
<!-- </dependency>-->
126101
<dependency>
127102
<groupId>org.testcontainers</groupId>
128103
<artifactId>testcontainers</artifactId>
@@ -142,9 +117,9 @@
142117
</dependency>
143118

144119
<dependency>
145-
<groupId>com.github.tomakehurst</groupId>
146-
<artifactId>wiremock-jre8</artifactId>
147-
<version>2.35.2</version>
120+
<groupId>org.wiremock</groupId>
121+
<artifactId>wiremock-standalone</artifactId>
122+
<version>3.13.0</version>
148123
<scope>test</scope>
149124
</dependency>
150125

‎client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
import com.clickhouse.client.api.enums.Protocol;
1313
import com.clickhouse.client.api.enums.ProxyType;
1414
import com.clickhouse.client.api.insert.InsertResponse;
15-
import com.clickhouse.client.api.insert.InsertSettings;
1615
import com.clickhouse.client.api.internal.ServerSettings;
1716
import com.clickhouse.client.api.query.GenericRecord;
1817
import com.clickhouse.client.api.query.QueryResponse;
1918
import com.clickhouse.client.api.query.QuerySettings;
2019
import com.clickhouse.client.config.ClickHouseClientOption;
21-
import com.clickhouse.client.insert.SamplePOJO;
2220
import com.clickhouse.data.ClickHouseFormat;
2321
import com.github.tomakehurst.wiremock.WireMockServer;
2422
import com.github.tomakehurst.wiremock.client.WireMock;
@@ -31,37 +29,29 @@
3129
import org.apache.hc.core5.http.HttpHeaders;
3230
import org.apache.hc.core5.http.HttpStatus;
3331
import org.apache.hc.core5.net.URIBuilder;
34-
import org.eclipse.jetty.server.Server;
3532
import org.testcontainers.utility.ThrowingFunction;
3633
import org.testng.Assert;
3734
import org.testng.annotations.DataProvider;
3835
import org.testng.annotations.Test;
3936

4037
import java.io.ByteArrayInputStream;
4138
import java.net.Socket;
42-
import java.net.SocketTimeoutException;
4339
import java.nio.ByteBuffer;
4440
import java.nio.charset.StandardCharsets;
4541
import java.time.temporal.ChronoUnit;
4642
import java.util.Arrays;
4743
import java.util.Base64;
48-
import java.util.Collections;
4944
import java.util.EnumSet;
5045
import java.util.List;
5146
import java.util.Random;
5247
import java.util.UUID;
5348
import java.util.concurrent.CompletableFuture;
5449
import java.util.concurrent.ExecutionException;
5550
import java.util.concurrent.TimeUnit;
56-
import java.util.concurrent.TimeoutException;
5751
import java.util.concurrent.atomic.AtomicInteger;
5852
import java.util.regex.Pattern;
59-
import java.util.function.Supplier;
6053

6154
import static com.github.tomakehurst.wiremock.stubbing.Scenario.STARTED;
62-
import static org.junit.Assert.assertEquals;
63-
import static org.junit.Assert.assertNotNull;
64-
import static org.junit.Assert.assertThrows;
6555
import static org.junit.Assert.fail;
6656

6757
public class HttpTransportTests extends BaseIntegrationTest {

‎jdbc-v2/pom.xml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@
5656
<type>test-jar</type>
5757
<scope>test</scope>
5858
</dependency>
59-
<dependency>
60-
<!-- needed for integration tests to interact with server -->
61-
<groupId>${project.parent.groupId}</groupId>
62-
<artifactId>clickhouse-http-client</artifactId>
63-
<version>${revision}</version>
64-
<scope>test</scope>
65-
</dependency>
6659
<dependency>
6760
<groupId>org.slf4j</groupId>
6861
<artifactId>slf4j-simple</artifactId>
@@ -80,9 +73,9 @@
8073
<scope>test</scope>
8174
</dependency>
8275
<dependency>
83-
<groupId>com.github.tomakehurst</groupId>
84-
<artifactId>wiremock-jre8</artifactId>
85-
<version>2.35.2</version>
76+
<groupId>org.wiremock</groupId>
77+
<artifactId>wiremock-standalone</artifactId>
78+
<version>3.13.0</version>
8679
<scope>test</scope>
8780
</dependency>
8881
</dependencies>

‎pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,15 @@
8686
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
8787

8888
<annotations-api.version>6.0.53</annotations-api.version>
89-
<apache.httpclient.version>5.2.1</apache.httpclient.version>
89+
<apache.httpclient.version>5.3.1</apache.httpclient.version>
9090
<arrow.version>12.0.1</arrow.version>
9191
<asm.version>9.7</asm.version>
9292
<avro.version>1.11.4</avro.version>
9393
<brotli.version>0.1.2</brotli.version>
9494
<brotli4j.version>1.12.0</brotli4j.version>
9595
<caffeine.version>3.1.7</caffeine.version>
9696
<compress.version>1.27.1</compress.version>
97+
<commons-lang3.version>3.16.0</commons-lang3.version>
9798
<dnsjava.version>3.6.0</dnsjava.version>
9899
<fastutil.version>8.5.12</fastutil.version>
99100
<gson.version>2.10.1</gson.version>
@@ -187,6 +188,12 @@
187188
<version>${compress.version}</version>
188189
</dependency>
189190

191+
<dependency>
192+
<groupId>org.apache.commons</groupId>
193+
<artifactId>commons-lang3</artifactId>
194+
<version>${commons-lang3.version}</version>
195+
</dependency>
196+
190197
<dependency>
191198
<groupId>org.lz4</groupId>
192199
<artifactId>lz4-java</artifactId>

0 commit comments

Comments
 (0)