Merge pull request quarkusio#27340 from cescoffier/vertx-4.3.3

Update to Vert.x 4.3.3 and Mutiny Bindings 2.26.0
gastaldi · Aug 18, 2022 · a682f10 · a682f10
2 parents 8e467f5 + baeb0be
commit a682f10
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -51,7 +51,7 @@
         <smallrye-context-propagation.version>1.2.2</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
         <smallrye-reactive-types-converter.version>2.7.0</smallrye-reactive-types-converter.version>
-        <smallrye-mutiny-vertx-binding.version>2.25.0</smallrye-mutiny-vertx-binding.version>
+        <smallrye-mutiny-vertx-binding.version>2.26.0</smallrye-mutiny-vertx-binding.version>
         <smallrye-reactive-messaging.version>3.18.0</smallrye-reactive-messaging.version>
         <smallrye-stork.version>1.1.2</smallrye-stork.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
@@ -109,7 +109,7 @@
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>1.20.0.Final</wildfly-elytron.version>
         <jboss-threads.version>3.4.2.Final</jboss-threads.version>
-        <vertx.version>4.3.2</vertx.version>
+        <vertx.version>4.3.3</vertx.version>
 
         <httpclient.version>4.5.13</httpclient.version>
         <httpcore.version>4.4.15</httpcore.version>
@@ -298,12 +298,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- Extra Vert.x dependency because of a breaking change in the Vert.x Web Client 4.3.3 -->
-            <dependency>
-                <groupId>io.vertx</groupId>
-                <artifactId>vertx-web-client</artifactId>
-                <version>${vertx.version}.1</version>
-            </dependency>
 
             <!-- gRPC dependencies, imported as a BOM -->
             <dependency>

diff --git a/...ecurity-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnSecurity.java b/...ecurity-webauthn/runtime/src/main/java/io/quarkus/security/webauthn/WebAuthnSecurity.java
@@ -58,7 +58,7 @@ public WebAuthnSecurity(WebAuthnRunTimeConfig config, Vertx vertx, WebAuthnAuthe
             options.setRequireResidentKey(config.requireResidentKey.get());
         }
         if (config.timeout.isPresent()) {
-            options.setTimeout(config.timeout.get().toMillis());
+            options.setTimeoutInMilliseconds(config.timeout.get().toMillis());
         }
         if (config.transports.isPresent()) {
             options.setTransports(config.transports.get());

diff --git a/...l/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java b/...l/deployment/src/main/java/io/quarkus/vertx/graphql/deployment/VertxGraphqlProcessor.java
@@ -12,8 +12,7 @@
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.*;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import io.quarkus.vertx.graphql.runtime.VertxGraphqlRecorder;
 import io.quarkus.vertx.http.deployment.BodyHandlerBuildItem;
@@ -47,6 +46,13 @@ List<ReflectiveClassBuildItem> registerForReflection() {
                 new ReflectiveClassBuildItem(true, true, GraphQLQuery.class.getName()));
     }
 
+    @BuildStep
+    void registerI18nResources(BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle) {
+        resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/Execution"));
+        resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/General"));
+        resourceBundle.produce(new NativeImageResourceBundleBuildItem("i18n/Validation"));
+    }
+
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     void registerVertxGraphqlUI(VertxGraphqlRecorder recorder,