Skip to content

[DE-503] Update dependencies #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ jobs:
fail-fast: false
matrix:
jackson-version:
- 2.14.1
- 2.13.3
- 2.14.2
- 2.13.5
- 2.12.7
- 2.11.4
- 2.10.5
Expand Down
2 changes: 2 additions & 0 deletions docs/v7_detailed_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ The HTTP client has been changed to [Vert.x WebClient](https://vertx.io/docs/ver
`HTTP/2` is now supported.
`HTTP/2` supports multiplexing and uses `1` connection per host by default.

Cookies are not supported anymore: cookies received in the response will be ignored.


## Configuration changes

Expand Down
8 changes: 4 additions & 4 deletions driver/src/test/java/graal/VertxSubstitutions.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import io.vertx.core.impl.VertxInternal;
import io.vertx.core.impl.resolver.DefaultResolverProvider;
import io.vertx.core.net.NetServerOptions;
import io.vertx.core.net.impl.transport.Transport;
import io.vertx.core.spi.resolver.ResolverProvider;
import io.vertx.core.spi.transport.Transport;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLException;
Expand All @@ -28,11 +28,11 @@
import java.util.Set;
import java.util.concurrent.ConcurrentMap;

@TargetClass(className = "io.vertx.core.net.impl.transport.Transport")
final class Target_io_vertx_core_net_impl_transport_Transport {
@TargetClass(className = "io.vertx.core.impl.VertxBuilder")
final class Target_io_vertx_core_impl_VertxBuilder {
@Substitute
public static Transport nativeTransport() {
return Transport.JDK;
return null;
}
}

Expand Down
9 changes: 1 addition & 8 deletions http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,7 @@
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-stack-depchain</artifactId>
<version>4.3.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.85.Final</version>
<version>4.4.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.organization>arangodb-1</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<adb.jackson.version>2.14.1</adb.jackson.version>
<adb.jackson.version>2.14.2</adb.jackson.version>
<moduleName/>
<SslTest/>
</properties>
Expand Down Expand Up @@ -104,7 +104,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.9.1</version>
<version>5.9.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -161,7 +161,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -171,12 +171,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.23.1</version>
<version>3.24.2</version>
</dependency>
<dependency>
<groupId>com.tngtech.archunit</groupId>
Expand Down
6 changes: 3 additions & 3 deletions resilience-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
<version>5.13.2</version>
<version>5.15.0</version>
</dependency>
<dependency>
<groupId>com.arangodb</groupId>
Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.5</version>
<version>1.4.6</version>
</dependency>
</dependencies>

Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.85.Final</version>
<version>4.1.90.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions shaded/src/main/java/graal/VertxSubstitutions.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import io.vertx.core.impl.VertxInternal;
import io.vertx.core.impl.resolver.DefaultResolverProvider;
import io.vertx.core.net.NetServerOptions;
import io.vertx.core.net.impl.transport.Transport;
import io.vertx.core.spi.resolver.ResolverProvider;
import io.vertx.core.spi.transport.Transport;

import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLException;
Expand All @@ -28,11 +28,11 @@
import java.util.Set;
import java.util.concurrent.ConcurrentMap;

@TargetClass(className = "io.vertx.core.net.impl.transport.Transport")
final class Target_com_arangodb_shaded_vertx_core_net_impl_transport_Transport {
@TargetClass(className = "io.vertx.core.impl.VertxBuilder")
final class Target_com_arangodb_shaded_vertx_core_impl_VertxBuilder {
@Substitute
public static Transport nativeTransport() {
return Transport.JDK;
return null;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ Args=\
com.arangodb.shaded.netty.util.internal.ThreadLocalRandom,\
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhost4LazyHolder,\
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhost6LazyHolder,\
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhostLazyHolder
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilLocalhostLazyHolder,\
com.arangodb.shaded.netty.util.NetUtilSubstitutions$NetUtilNetworkInterfacesLazyHolder