2.x - MicroProfile 4 and Vert.x 4

.github/native-tests.json

@@ -89,8 +89,8 @@
         },
         {
             "category": "HTTP",
-            "timeout": 65,
-            "test-modules": "elytron-resteasy resteasy-jackson resteasy-mutiny vertx vertx-http vertx-web vertx-graphql virtual-http rest-client"
+            "timeout": 70,
+            "test-modules": "elytron-resteasy resteasy-jackson resteasy-mutiny vertx vertx-http vertx-web vertx-web-jackson vertx-graphql virtual-http rest-client"
         },
         {
             "category": "Misc1",

bom/application/pom.xml

@@ -18,42 +18,42 @@
         <bouncycastle.fips.version>1.0.2</bouncycastle.fips.version>
         <bouncycastle.tls.fips.version>1.0.11</bouncycastle.tls.fips.version>
         <jandex.version>2.2.3.Final</jandex.version>
-        <resteasy.version>4.5.9.Final</resteasy.version>
-        <opentracing.version>0.31.0</opentracing.version>
-        <opentracing-jaxrs.version>0.4.1</opentracing-jaxrs.version>
-        <opentracing-web-servlet-filter.version>0.2.3</opentracing-web-servlet-filter.version>
+        <resteasy.version>4.6.0.Final</resteasy.version>
+        <opentracing.version>0.33.0</opentracing.version>
+        <opentracing-jaxrs.version>1.0.0</opentracing-jaxrs.version>
+        <opentracing-web-servlet-filter.version>0.4.0</opentracing-web-servlet-filter.version>
         <opentracing-tracerresolver.version>0.1.8</opentracing-tracerresolver.version>
-        <opentracing-concurrent.version>0.2.0</opentracing-concurrent.version>
-        <opentracing-jdbc.version>0.0.12</opentracing-jdbc.version>
+        <opentracing-concurrent.version>0.4.0</opentracing-concurrent.version>
+        <opentracing-jdbc.version>0.2.12</opentracing-jdbc.version>
         <opentracing-kafka.version>0.1.15</opentracing-kafka.version>
         <opentracing-mongo.version>0.1.5</opentracing-mongo.version>
         <opentelemetry.version>1.0.1</opentelemetry.version>
         <opentelemetry-alpha.version>1.0.1-alpha</opentelemetry-alpha.version>
-        <jaeger.version>0.34.3</jaeger.version>
-        <quarkus-http.version>3.1.0.Final</quarkus-http.version>
+        <jaeger.version>1.4.0</jaeger.version>
+        <quarkus-http.version>4.0.0.Alpha4</quarkus-http.version>
         <jboss-servlet-api_4.0_spec.version>1.0.0.Final</jboss-servlet-api_4.0_spec.version>
         <micrometer.version>1.6.5</micrometer.version> <!-- when updating, verify if com.google.auth should not be updated too -->
         <google-auth.version>0.22.0</google-auth.version>
-        <microprofile-config-api.version>1.4</microprofile-config-api.version>
-        <microprofile-metrics-api.version>2.3</microprofile-metrics-api.version>
+        <microprofile-config-api.version>2.0</microprofile-config-api.version>
+        <microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
-        <microprofile-opentracing-api.version>1.3.3</microprofile-opentracing-api.version>
+        <microprofile-opentracing-api.version>2.0</microprofile-opentracing-api.version>
         <microprofile-reactive-streams-operators.version>1.0.1</microprofile-reactive-streams-operators.version>
-        <microprofile-rest-client.version>1.4.1</microprofile-rest-client.version>
-        <microprofile-jwt.version>1.1.1</microprofile-jwt.version>
+        <microprofile-rest-client.version>2.0</microprofile-rest-client.version>
+        <microprofile-jwt.version>1.2</microprofile-jwt.version>
         <smallrye-common.version>1.6.0</smallrye-common.version>
-        <smallrye-config.version>1.12.0</smallrye-config.version>
-        <smallrye-health.version>2.2.6</smallrye-health.version>
-        <smallrye-metrics.version>2.4.6</smallrye-metrics.version>
-        <smallrye-open-api.version>2.0.26</smallrye-open-api.version>
-        <smallrye-graphql.version>1.0.26</smallrye-graphql.version>
-        <smallrye-opentracing.version>1.3.5</smallrye-opentracing.version>
-        <smallrye-fault-tolerance.version>4.3.2</smallrye-fault-tolerance.version>
-        <smallrye-jwt.version>2.4.4</smallrye-jwt.version>
+        <smallrye-config.version>2.2.0</smallrye-config.version>
+        <smallrye-health.version>3.0.1</smallrye-health.version>
+        <smallrye-metrics.version>3.0.1</smallrye-metrics.version>
+        <smallrye-open-api.version>2.1.2</smallrye-open-api.version>
+        <smallrye-graphql.version>1.1.0</smallrye-graphql.version>
+        <smallrye-opentracing.version>2.0.0</smallrye-opentracing.version>
+        <smallrye-fault-tolerance.version>5.0.0</smallrye-fault-tolerance.version>
+        <smallrye-jwt.version>3.1.0</smallrye-jwt.version>
         <smallrye-context-propagation.version>1.1.0</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.13</smallrye-reactive-streams-operators.version>
-        <smallrye-reactive-utils.version>1.6.0</smallrye-reactive-utils.version>
-        <smallrye-reactive-messaging.version>2.9.0</smallrye-reactive-messaging.version>
+        <smallrye-reactive-utils.version>2.3.0</smallrye-reactive-utils.version>
+        <smallrye-reactive-messaging.version>3.1.0</smallrye-reactive-messaging.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jakarta.annotation-api.version>1.3.5</jakarta.annotation-api.version>
         <jakarta.el-impl.version>3.0.3</jakarta.el-impl.version>
@@ -94,7 +94,7 @@
         <commons-codec.version>1.15</commons-codec.version>
         <classmate.version>1.5.1</classmate.version>
         <hibernate-orm.version>5.4.30.Final</hibernate-orm.version>
-        <hibernate-reactive.version>1.0.0.CR1</hibernate-reactive.version>
+        <hibernate-reactive.version>1.0.0.CR1.Vertx4</hibernate-reactive.version>
         <hibernate-validator.version>6.2.0.Final</hibernate-validator.version>
         <hibernate-search.version>6.0.2.Final</hibernate-search.version>
         <narayana.version>5.11.0.Final</narayana.version>
@@ -113,7 +113,7 @@
         <wildfly-elytron.version>1.15.3.Final</wildfly-elytron.version>
         <jboss-modules.version>1.8.7.Final</jboss-modules.version>
         <jboss-threads.version>3.2.0.Final</jboss-threads.version>
-        <vertx.version>3.9.6</vertx.version>
+        <vertx.version>4.0.3</vertx.version>
         <httpclient.version>4.5.13</httpclient.version>
         <httpcore.version>4.4.14</httpcore.version>
         <httpasync.version>4.1.4</httpasync.version>
@@ -136,10 +136,11 @@
         <infinispan.version>12.0.1.Final</infinispan.version>
         <infinispan.protostream.version>4.4.0.Alpha4</infinispan.protostream.version>
         <caffeine.version>2.9.0</caffeine.version>
-        <netty.version>4.1.49.Final</netty.version>
+        <netty.version>4.1.60.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>
         <jboss-logging.version>3.4.1.Final</jboss-logging.version>
         <mutiny.version>0.15.0</mutiny.version>
+        <mutiny-vertx.version>2.3.0</mutiny-vertx.version>
         <kafka2.version>2.7.0</kafka2.version>
         <zookeeper.version>3.5.7</zookeeper.version>
         <!-- Scala is used by Kafka so we need to choose a compatible version -->
@@ -196,11 +197,10 @@
         <google-http-client.version>1.38.0</google-http-client.version>
         <scram-client.version>2.1</scram-client.version>
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
-        <grpc.version>1.34.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
+        <grpc.version>1.35.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
         <grpc-jprotoc.version>1.0.1</grpc-jprotoc.version>
         <protobuf-java.version>3.14.0</protobuf-java.version>
         <protoc.version>${protobuf-java.version}</protoc.version>
-
         <picocli.version>4.6.1</picocli.version>
         <org.eclipse.sisu.inject.version>0.3.4</org.eclipse.sisu.inject.version>
         <google-cloud-functions.version>1.0.1</google-cloud-functions.version>
@@ -3182,18 +3182,6 @@
                         <groupId>org.eclipse.microprofile.config</groupId>
                         <artifactId>microprofile-config-api</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>io.smallrye</groupId>
-                        <artifactId>smallrye-config</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax</groupId>
-                        <artifactId>javaee-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.osgi</groupId>
-                        <artifactId>org.osgi.annotation.versioning</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -4336,7 +4324,7 @@
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-core</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.fasterxml.jackson.core</groupId>
@@ -4351,27 +4339,27 @@
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-sql-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-db2-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-mysql-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-pg-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <!-- Used by the Reactive PG Client -->
@@ -4382,12 +4370,12 @@
            <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-mail-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+               <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-mutiny-vertx-redis-client</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.vertx</groupId>
@@ -4641,17 +4629,17 @@
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-reactive-converter-api</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-reactive-converter-mutiny</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.smallrye.reactive</groupId>
                 <artifactId>smallrye-reactive-converter-rxjava2</artifactId>
-                <version>${smallrye-reactive-utils.version}</version>
+                <version>${mutiny-vertx.version}</version>
             </dependency>
 
             <dependency>

build-parent/pom.xml

@@ -43,7 +43,7 @@
         <mandrel.version-for-documentation>21.0</mandrel.version-for-documentation>
         <rest-assured.version>4.3.2</rest-assured.version>
         <mutiny-client.version>1.1.0</mutiny-client.version>
-        <vertx.version>3.9.2</vertx.version>
+        <vertx.version>4.0.3</vertx.version>
 
         <!-- Dev tools -->
         <freemarker.version>2.3.31</freemarker.version>
@@ -65,16 +65,16 @@
         <gradle-wrapper.version>6.8.3</gradle-wrapper.version>
 
         <!-- MicroProfile TCK versions -->
-        <microprofile-health-api.version>2.2</microprofile-health-api.version>
-        <microprofile-config-api.version>1.4</microprofile-config-api.version>
-        <microprofile-metrics-api.version>2.3.2</microprofile-metrics-api.version>
-        <microprofile-fault-tolerance-api.version>2.1.1</microprofile-fault-tolerance-api.version>
+        <microprofile-health-api.version>3.0</microprofile-health-api.version>
+        <microprofile-config-api.version>2.0</microprofile-config-api.version>
+        <microprofile-metrics-api.version>3.0</microprofile-metrics-api.version>
+        <microprofile-fault-tolerance-api.version>3.0</microprofile-fault-tolerance-api.version>
         <microprofile-reactive-messaging-api.version>1.0</microprofile-reactive-messaging-api.version>
-        <microprofile-rest-client-api.version>1.4.1</microprofile-rest-client-api.version>
-        <microprofile-open-api.version>1.1.3-RC1</microprofile-open-api.version>
-        <microprofile-opentracing-api.version>1.3.3</microprofile-opentracing-api.version>
+        <microprofile-rest-client-api.version>2.0</microprofile-rest-client-api.version>
+        <microprofile-open-api.version>2.0</microprofile-open-api.version>
+        <microprofile-opentracing-api.version>2.0</microprofile-opentracing-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
-        <microprofile-jwt-api.version>1.1.1</microprofile-jwt-api.version>
+        <microprofile-jwt-api.version>1.2</microprofile-jwt-api.version>
         <microprofile-graphql-api.version>1.0.3</microprofile-graphql-api.version>
 
         <!-- Antlr is used by the PanacheQL parser-->
@@ -107,10 +107,10 @@
         <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
 
         <!--TODO: remove when switched back to quarkus-maven-plugin for grpc stubs-->
-        <protoc.version>3.12.3</protoc.version> <!--keep in sync with the BOM-->
-        <grpc.version>1.30.2</grpc.version> <!--keep in sync with the BOM -->
+        <protoc.version>3.14.0</protoc.version> <!--keep in sync with the BOM-->
+        <grpc.version>1.35.0</grpc.version> <!--keep in sync with the BOM -->
 
-        <boring-ssl.version>2.0.30.Final</boring-ssl.version>
+        <boring-ssl.version>2.0.36.Final</boring-ssl.version>
 
         <!-- Webjars -->
         <webjar.bootstrap.version>4.6.0</webjar.bootstrap.version>

core/deployment/src/main/java/io/quarkus/deployment/Capability.java

@@ -70,7 +70,9 @@ public enum Capability {
     SPRING_WEB,
     SMALLRYE_HEALTH,
     SMALLRYE_OPENAPI,
-    OPENSHIFT_CLIENT;
+    OPENSHIFT_CLIENT,
+
+    VERTX_CORE;
 
     /**
      *

core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java

@@ -679,7 +679,7 @@ private Converter<?> getConverter(SmallRyeConfig config, Field field, ConverterT
                         throw toError(e);
                     }
                 } else {
-                    converter = config.getConverter(leaf.getLeafType());
+                    converter = config.requireConverter(leaf.getLeafType());
                 }
             } else if (valueType instanceof LowerBoundCheckOf) {
                 // todo: add in bounds checker

core/deployment/src/main/java/io/quarkus/deployment/configuration/DefaultValuesConfigurationSource.java

@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
@@ -23,6 +24,10 @@ public Map<String, String> getProperties() {
         return Collections.emptyMap();
     }
 
+    public Set<String> getPropertyNames() {
+        return Collections.emptySet();
+    }
+
     public String getValue(final String propertyName) {
         if (!propertyName.startsWith("quarkus.")) {
             return null;

core/runtime/src/main/java/io/quarkus/runtime/configuration/AbstractRawDefaultConfigSource.java

@@ -3,6 +3,7 @@
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Set;
 
 import org.eclipse.microprofile.config.spi.ConfigSource;
 
@@ -19,6 +20,10 @@ public Map<String, String> getProperties() {
         return Collections.emptyMap();
     }
 
+    public Set<String> getPropertyNames() {
+        return Collections.emptySet();
+    }
+
     public String getValue(final String propertyName) {
         return getValue(new NameIterator(propertyName));
     }

core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigInstantiator.java

@@ -118,7 +118,7 @@ private static Converter<?> getConverterFor(Type type) {
         } else if (rawType == List.class) {
             return Converters.newCollectionConverter(getConverterFor(typeOfParameter(type, 0)), ArrayList::new);
         } else {
-            return config.getConverter(rawTypeOf(type));
+            return config.requireConverter(rawTypeOf(type));
         }
     }