Skip to content

Commit 443e8a5

Browse files
authored
[DE-503] Update dependencies (#489)
* doc upd * deps upd
1 parent d55276a commit 443e8a5

File tree

8 files changed

+23
-27
lines changed

8 files changed

+23
-27
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ jobs:
186186
fail-fast: false
187187
matrix:
188188
jackson-version:
189-
- 2.14.1
190-
- 2.13.3
189+
- 2.14.2
190+
- 2.13.5
191191
- 2.12.7
192192
- 2.11.4
193193
- 2.10.5

docs/v7_detailed_changes.md

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ The HTTP client has been changed to [Vert.x WebClient](https://vertx.io/docs/ver
3232
`HTTP/2` is now supported.
3333
`HTTP/2` supports multiplexing and uses `1` connection per host by default.
3434

35+
Cookies are not supported anymore: cookies received in the response will be ignored.
36+
3537

3638
## Configuration changes
3739

driver/src/test/java/graal/VertxSubstitutions.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.vertx.core.impl.VertxInternal;
1818
import io.vertx.core.impl.resolver.DefaultResolverProvider;
1919
import io.vertx.core.net.NetServerOptions;
20-
import io.vertx.core.net.impl.transport.Transport;
2120
import io.vertx.core.spi.resolver.ResolverProvider;
21+
import io.vertx.core.spi.transport.Transport;
2222

2323
import javax.net.ssl.KeyManagerFactory;
2424
import javax.net.ssl.SSLException;
@@ -28,11 +28,11 @@
2828
import java.util.Set;
2929
import java.util.concurrent.ConcurrentMap;
3030

31-
@TargetClass(className = "io.vertx.core.net.impl.transport.Transport")
32-
final class Target_io_vertx_core_net_impl_transport_Transport {
31+
@TargetClass(className = "io.vertx.core.impl.VertxBuilder")
32+
final class Target_io_vertx_core_impl_VertxBuilder {
3333
@Substitute
3434
public static Transport nativeTransport() {
35-
return Transport.JDK;
35+
return null;
3636
}
3737
}
3838

http/pom.xml

+1-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,7 @@
3535
<dependency>
3636
<groupId>io.vertx</groupId>
3737
<artifactId>vertx-stack-depchain</artifactId>
38-
<version>4.3.5</version>
39-
<type>pom</type>
40-
<scope>import</scope>
41-
</dependency>
42-
<dependency>
43-
<groupId>io.netty</groupId>
44-
<artifactId>netty-bom</artifactId>
45-
<version>4.1.85.Final</version>
38+
<version>4.4.0</version>
4639
<type>pom</type>
4740
<scope>import</scope>
4841
</dependency>

pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<maven.deploy.skip>true</maven.deploy.skip>
3838
<sonar.organization>arangodb-1</sonar.organization>
3939
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
40-
<adb.jackson.version>2.14.1</adb.jackson.version>
40+
<adb.jackson.version>2.14.2</adb.jackson.version>
4141
<moduleName/>
4242
<SslTest/>
4343
</properties>
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>org.junit</groupId>
106106
<artifactId>junit-bom</artifactId>
107-
<version>5.9.1</version>
107+
<version>5.9.2</version>
108108
<type>pom</type>
109109
<scope>import</scope>
110110
</dependency>
@@ -161,7 +161,7 @@
161161
<dependency>
162162
<groupId>org.slf4j</groupId>
163163
<artifactId>slf4j-api</artifactId>
164-
<version>2.0.6</version>
164+
<version>2.0.7</version>
165165
</dependency>
166166
<dependency>
167167
<groupId>com.google.code.findbugs</groupId>
@@ -171,12 +171,12 @@
171171
<dependency>
172172
<groupId>org.slf4j</groupId>
173173
<artifactId>slf4j-simple</artifactId>
174-
<version>2.0.6</version>
174+
<version>2.0.7</version>
175175
</dependency>
176176
<dependency>
177177
<groupId>org.assertj</groupId>
178178
<artifactId>assertj-core</artifactId>
179-
<version>3.23.1</version>
179+
<version>3.24.2</version>
180180
</dependency>
181181
<dependency>
182182
<groupId>com.tngtech.archunit</groupId>

resilience-tests/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>org.mock-server</groupId>
1717
<artifactId>mockserver-netty</artifactId>
18-
<version>5.13.2</version>
18+
<version>5.15.0</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>com.arangodb</groupId>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>ch.qos.logback</groupId>
4444
<artifactId>logback-classic</artifactId>
45-
<version>1.3.5</version>
45+
<version>1.4.6</version>
4646
</dependency>
4747
</dependencies>
4848

@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>io.netty</groupId>
5353
<artifactId>netty-bom</artifactId>
54-
<version>4.1.85.Final</version>
54+
<version>4.1.90.Final</version>
5555
<type>pom</type>
5656
<scope>import</scope>
5757
</dependency>

shaded/src/main/java/graal/VertxSubstitutions.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import io.vertx.core.impl.VertxInternal;
1818
import io.vertx.core.impl.resolver.DefaultResolverProvider;
1919
import io.vertx.core.net.NetServerOptions;
20-
import io.vertx.core.net.impl.transport.Transport;
2120
import io.vertx.core.spi.resolver.ResolverProvider;
21+
import io.vertx.core.spi.transport.Transport;
2222

2323
import javax.net.ssl.KeyManagerFactory;
2424
import javax.net.ssl.SSLException;
@@ -28,11 +28,11 @@
2828
import java.util.Set;
2929
import java.util.concurrent.ConcurrentMap;
3030

31-
@TargetClass(className = "io.vertx.core.net.impl.transport.Transport")
32-
final class Target_com_arangodb_shaded_vertx_core_net_impl_transport_Transport {
31+
@TargetClass(className = "io.vertx.core.impl.VertxBuilder")
32+
final class Target_com_arangodb_shaded_vertx_core_impl_VertxBuilder {
3333
@Substitute
3434
public static Transport nativeTransport() {
35-
return Transport.JDK;
35+
return null;
3636
}
3737
}
3838

shaded/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver-shaded/native-image.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ Args=\
3636
com.arangodb.shaded.netty.util.internal.ThreadLocalRandom,\
3737
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhost4LazyHolder,\
3838
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhost6LazyHolder,\
39-
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhostLazyHolder
39+
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhostLazyHolder,\
40+
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilNetworkInterfacesLazyHolder

0 commit comments

Comments
 (0)