Skip to content

Commit 2dcb3d7

Browse files
committed
deps upd
1 parent 0bc727b commit 2dcb3d7

File tree

4 files changed

+11
-40
lines changed

4 files changed

+11
-40
lines changed

pom.xml

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,6 @@
2323

2424
<properties>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<slf4j-api.version>1.7.30</slf4j-api.version>
27-
<arangodb.velocypack.version>2.1.1</arangodb.velocypack.version>
28-
29-
<!-- provided -->
30-
<httpclient.version>4.5.11</httpclient.version>
31-
32-
<!-- test -->
33-
<logback-classic.version>1.2.3</logback-classic.version>
34-
<hamcrest-all.version>1.3</hamcrest-all.version>
35-
<junit.version>4.13</junit.version>
36-
37-
<!-- javadoc-->
38-
<javadoc.opts/>
3926
</properties>
4027

4128
<developers>
@@ -107,7 +94,7 @@
10794
<plugin>
10895
<groupId>org.apache.maven.plugins</groupId>
10996
<artifactId>maven-source-plugin</artifactId>
110-
<version>3.1.0</version>
97+
<version>3.2.0</version>
11198
<executions>
11299
<execution>
113100
<goals>
@@ -119,15 +106,14 @@
119106
<plugin>
120107
<groupId>org.apache.maven.plugins</groupId>
121108
<artifactId>maven-javadoc-plugin</artifactId>
122-
<version>3.1.1</version>
109+
<version>3.2.0</version>
123110
<executions>
124111
<execution>
125112
<id>attach-javadocs</id>
126113
<goals>
127114
<goal>jar</goal>
128115
</goals>
129116
<configuration>
130-
<additionalOptions>${javadoc.opts}</additionalOptions>
131117
<excludePackageNames>com.arangodb.internal</excludePackageNames>
132118
</configuration>
133119
</execution>
@@ -176,19 +162,6 @@
176162
<artifactId>httpclient</artifactId>
177163
<scope>provided</scope>
178164
</dependency>
179-
<dependency>
180-
<groupId>org.apache.httpcomponents</groupId>
181-
<artifactId>httpcore</artifactId>
182-
<scope>provided</scope>
183-
</dependency>
184-
<dependency>
185-
<groupId>commons-logging</groupId>
186-
<artifactId>commons-logging</artifactId>
187-
</dependency>
188-
<dependency>
189-
<groupId>commons-codec</groupId>
190-
<artifactId>commons-codec</artifactId>
191-
</dependency>
192165
<dependency>
193166
<groupId>com.arangodb</groupId>
194167
<artifactId>velocypack</artifactId>
@@ -231,7 +204,7 @@
231204
<dependency>
232205
<groupId>org.apache.httpcomponents</groupId>
233206
<artifactId>httpclient</artifactId>
234-
<version>${httpclient.version}</version>
207+
<version>4.5.12</version>
235208
</dependency>
236209
<dependency>
237210
<groupId>org.apache.httpcomponents</groupId>
@@ -251,27 +224,27 @@
251224
<dependency>
252225
<groupId>com.arangodb</groupId>
253226
<artifactId>velocypack</artifactId>
254-
<version>${arangodb.velocypack.version}</version>
227+
<version>2.3.0</version>
255228
</dependency>
256229
<dependency>
257230
<groupId>org.slf4j</groupId>
258231
<artifactId>slf4j-api</artifactId>
259-
<version>${slf4j-api.version}</version>
232+
<version>1.7.30</version>
260233
</dependency>
261234
<dependency>
262235
<groupId>ch.qos.logback</groupId>
263236
<artifactId>logback-classic</artifactId>
264-
<version>${logback-classic.version}</version>
237+
<version>1.2.3</version>
265238
</dependency>
266239
<dependency>
267240
<groupId>junit</groupId>
268241
<artifactId>junit</artifactId>
269-
<version>${junit.version}</version>
242+
<version>4.13</version>
270243
</dependency>
271244
<dependency>
272245
<groupId>org.hamcrest</groupId>
273246
<artifactId>hamcrest-all</artifactId>
274-
<version>${hamcrest-all.version}</version>
247+
<version>1.3</version>
275248
</dependency>
276249
</dependencies>
277250
</dependencyManagement>

src/main/java/com/arangodb/entity/CursorEntity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
package com.arangodb.entity;
2222

2323
import com.arangodb.velocypack.VPackSlice;
24-
import org.apache.http.protocol.HTTP;
2524

2625
import java.util.Collection;
2726
import java.util.Map;
@@ -95,8 +94,8 @@ public Map<String, String> getMeta() {
9594
* @return remove not allowed (valid storable) meta information
9695
*/
9796
public Map<String, String> cleanupMeta(Map<String, String> meta) {
98-
meta.remove(HTTP.CONTENT_LEN);
99-
meta.remove(HTTP.TRANSFER_ENCODING);
97+
meta.remove("Content-Length");
98+
meta.remove("Transfer-Encoding");
10099
return meta;
101100
}
102101

src/main/java/com/arangodb/internal/util/CURLLogger.java renamed to src/main/java/com/arangodb/internal/http/CURLLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
*/
2020

21-
package com.arangodb.internal.util;
21+
package com.arangodb.internal.http;
2222

2323
import com.arangodb.util.ArangoSerialization;
2424
import com.arangodb.velocystream.Request;

src/main/java/com/arangodb/internal/http/HttpConnection.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.arangodb.Protocol;
2525
import com.arangodb.internal.net.Connection;
2626
import com.arangodb.internal.net.HostDescription;
27-
import com.arangodb.internal.util.CURLLogger;
2827
import com.arangodb.internal.util.IOUtils;
2928
import com.arangodb.internal.util.ResponseUtils;
3029
import com.arangodb.util.ArangoSerialization;

0 commit comments

Comments
 (0)