From d0e4ebe3a0fcf3c7f237f90fab70d7528d977191 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Tue, 21 Mar 2023 09:04:44 +0100 Subject: [PATCH 1/2] doc upd --- docs/v7_detailed_changes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/v7_detailed_changes.md b/docs/v7_detailed_changes.md index 269af809a..897727d53 100644 --- a/docs/v7_detailed_changes.md +++ b/docs/v7_detailed_changes.md @@ -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 From 3b0f496cabd4a327fb79a1031659e202fb1ab9ba Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Tue, 21 Mar 2023 11:18:24 +0100 Subject: [PATCH 2/2] deps upd --- .github/workflows/test.yml | 4 ++-- driver/src/test/java/graal/VertxSubstitutions.java | 8 ++++---- http/pom.xml | 9 +-------- pom.xml | 10 +++++----- resilience-tests/pom.xml | 6 +++--- shaded/src/main/java/graal/VertxSubstitutions.java | 8 ++++---- .../native-image.properties | 3 ++- 7 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5def54cdb..7c1be5728 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/driver/src/test/java/graal/VertxSubstitutions.java b/driver/src/test/java/graal/VertxSubstitutions.java index 2127e16f0..043815fbc 100644 --- a/driver/src/test/java/graal/VertxSubstitutions.java +++ b/driver/src/test/java/graal/VertxSubstitutions.java @@ -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; @@ -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; } } diff --git a/http/pom.xml b/http/pom.xml index 23c1eb34a..ea2ac3909 100644 --- a/http/pom.xml +++ b/http/pom.xml @@ -35,14 +35,7 @@ io.vertx vertx-stack-depchain - 4.3.5 - pom - import - - - io.netty - netty-bom - 4.1.85.Final + 4.4.0 pom import diff --git a/pom.xml b/pom.xml index 5c4298612..37381a180 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ true arangodb-1 https://sonarcloud.io - 2.14.1 + 2.14.2 @@ -104,7 +104,7 @@ org.junit junit-bom - 5.9.1 + 5.9.2 pom import @@ -161,7 +161,7 @@ org.slf4j slf4j-api - 2.0.6 + 2.0.7 com.google.code.findbugs @@ -171,12 +171,12 @@ org.slf4j slf4j-simple - 2.0.6 + 2.0.7 org.assertj assertj-core - 3.23.1 + 3.24.2 com.tngtech.archunit diff --git a/resilience-tests/pom.xml b/resilience-tests/pom.xml index 77a0bdc79..0fa635b45 100644 --- a/resilience-tests/pom.xml +++ b/resilience-tests/pom.xml @@ -15,7 +15,7 @@ org.mock-server mockserver-netty - 5.13.2 + 5.15.0 com.arangodb @@ -42,7 +42,7 @@ ch.qos.logback logback-classic - 1.3.5 + 1.4.6 @@ -51,7 +51,7 @@ io.netty netty-bom - 4.1.85.Final + 4.1.90.Final pom import diff --git a/shaded/src/main/java/graal/VertxSubstitutions.java b/shaded/src/main/java/graal/VertxSubstitutions.java index 14892fc8f..5e9eb9ff4 100644 --- a/shaded/src/main/java/graal/VertxSubstitutions.java +++ b/shaded/src/main/java/graal/VertxSubstitutions.java @@ -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; @@ -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; } } diff --git a/shaded/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver-shaded/native-image.properties b/shaded/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver-shaded/native-image.properties index 8a2425d56..453d78f42 100644 --- a/shaded/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver-shaded/native-image.properties +++ b/shaded/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver-shaded/native-image.properties @@ -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