diff --git a/.github/native-tests.json b/.github/native-tests.json index 51c1808bf56ca9..08fb441174abfc 100644 --- a/.github/native-tests.json +++ b/.github/native-tests.json @@ -21,7 +21,7 @@ { "category": "Data3", "timeout": 70, - "test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase", + "test-modules": "flyway, hibernate-orm-panache, hibernate-orm-panache-kotlin, hibernate-orm-envers, liquibase, liquibase-mongodb", "os-name": "ubuntu-latest" }, { diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index 375315315fe8bd..c5011fc09bcec6 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -178,9 +178,10 @@ jobs: uses: actions/upload-artifact@v2 if: ${{ failure() || cancelled() }} with: - name: "build-reports-JVM Tests - JDK ${{matrix.java.name}}" + name: "build-reports-Initial JDK 11 Build" path: | target/build-report.json + LICENSE.txt retention-days: 2 calculate-test-jobs: @@ -322,6 +323,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 - name: Upload gc.log uses: actions/upload-artifact@v2 @@ -388,6 +390,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 gradle-tests: @@ -447,6 +450,7 @@ jobs: **/build/test-results/test/TEST-*.xml **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 devtools-tests: @@ -506,6 +510,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 tcks-test: @@ -564,6 +569,7 @@ jobs: path: | **/target/*-reports/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 native-tests: @@ -643,4 +649,5 @@ jobs: **/target/*-reports/TEST-*.xml **/build/test-results/test/TEST-*.xml target/build-report.json + LICENSE.txt retention-days: 2 diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f1c39ced2103be..7acd0a5f7ff49e 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -17,7 +17,7 @@ 1.69 1.0.2.1 1.0.12.2 - 2.3.1.Final + 2.4.0.Final 4.7.0.Final 0.33.0 1.0.0 @@ -45,15 +45,15 @@ 2.4.4 3.1.1 3.0.1 - 2.1.10 - 1.3.1 + 2.1.12 + 1.3.2 2.0.1 5.2.1 3.2.1 1.2.0 1.0.13 2.6.0 - 2.12.0 + 2.13.0 3.9.1 1.2.1 1.3.5 @@ -109,7 +109,7 @@ 1.16.1.Final 1.8.7.Final 3.4.2.Final - 4.1.2 + 4.1.3 4.5.13 4.4.14 4.1.4 @@ -120,7 +120,7 @@ 2.7.4 8.0.26 7.2.2.jre8 - 21.1.0.0 + 21.3.0.0 10.14.2.0 11.5.6.0 1.2.6 @@ -131,7 +131,7 @@ 12.1.7.Final 4.4.1.Final 2.9.2 - 4.1.65.Final + 4.1.67.Final 1.0.3 3.4.2.Final 1.0.0 @@ -145,7 +145,7 @@ 3.10.0 1.6 2.9.1 - 2.17.29 + 2.17.35 2.40.0 1.4.2 1.5.30 @@ -156,27 +156,28 @@ 4.1.0 1.0.9 5.12.0.202106070339-r - 7.14.0 + 7.15.0 1.0.9 4.4.3 + 4.4.3 1.29 6.0.0 4.3.4 - 4.3.1 + 4.3.2 1.2.1 2.17.0 - 0.33.8 + 0.33.9 3.14.9 5.1.2 0.1.0 - 5.7.0 + 5.7.2 2.2.0 5.2.SP4 2.1.SP2 5.2.Final 2.1.SP1 3.12.4 - 5.3.1 + 5.8.0 4.9.2 1.1.4.Final 14.0.0 @@ -352,6 +353,15 @@ import + + + com.oracle.database.jdbc + ojdbc-bom + ${oracle-jdbc.version} + pom + import + + io.smallrye.reactive @@ -818,6 +828,16 @@ quarkus-liquibase-deployment ${project.version} + + io.quarkus + quarkus-liquibase-mongodb + ${project.version} + + + io.quarkus + quarkus-liquibase-mongodb-deployment + ${project.version} + io.quarkus quarkus-hibernate-orm @@ -1540,13 +1560,6 @@ quarkus-vertx-http-deployment ${project.version} - - io.quarkus - quarkus-vertx-http-deployment - ${project.version} - test-jar - test - io.quarkus quarkus-vertx-web @@ -1607,6 +1620,11 @@ quarkus-mailer ${project.version} + + io.quarkus + quarkus-mailer-deployment + ${project.version} + io.quarkus quarkus-mongodb-client @@ -1924,6 +1942,21 @@ quarkus-amazon-common ${project.version} + + io.quarkus + quarkus-amazon-lambda-event-server + ${project.version} + + + io.quarkus + quarkus-amazon-lambda-http-event-server + ${project.version} + + + io.quarkus + quarkus-amazon-lambda-rest-event-server + ${project.version} + io.quarkus quarkus-amazon-common-deployment @@ -4488,11 +4521,6 @@ mssql-jdbc ${mssql-jdbc.version} - - com.oracle.database.jdbc - ojdbc11 - ${oracle-jdbc.version} - org.elasticsearch.client elasticsearch-rest-client @@ -5061,6 +5089,11 @@ + + org.liquibase.ext + liquibase-mongodb + ${liquibase-mongodb.version} + org.yaml snakeyaml diff --git a/build-parent/pom.xml b/build-parent/pom.xml index e7c6e7f70fe40c..605cba756dbd33 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -34,7 +34,7 @@ ${version.surefire.plugin} - 1.1.1 + 1.2.0 + + io.quarkus + quarkus-apache-httpclient + test + + + + + + + + diff --git a/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java b/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java new file mode 100644 index 00000000000000..c5f255c3ccebf4 --- /dev/null +++ b/extensions/amazon-lambda-http/http-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockHttpEventServer.java @@ -0,0 +1,149 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RoutingContext; + +public class MockHttpEventServer extends MockEventServer { + + private final ObjectMapper objectMapper; + private final ObjectWriter eventWriter; + private final ObjectReader responseReader; + + public MockHttpEventServer() { + objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventWriter = objectMapper.writerFor(APIGatewayV2HTTPEvent.class); + responseReader = objectMapper.readerFor(APIGatewayV2HTTPResponse.class); + } + + @Override + protected void defaultHanderSetup() { + router.route().handler(this::handleHttpRequests); + } + + public void handleHttpRequests(RoutingContext ctx) { + String requestId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestId == null) { + requestId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + String traceId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (traceId == null) { + traceId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + Buffer body = ctx.getBody(); + + APIGatewayV2HTTPEvent event = new APIGatewayV2HTTPEvent(); + event.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext()); + event.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http()); + event.getRequestContext().getHttp().setMethod(ctx.request().method().name()); + event.setRawPath(ctx.request().path()); + event.setRawQueryString(ctx.request().query()); + for (String header : ctx.request().headers().names()) { + if (event.getHeaders() == null) + event.setHeaders(new HashMap<>()); + List values = ctx.request().headers().getAll(header); + String value = String.join(",", values); + event.getHeaders().put(header, value); + } + if (body != null) { + String ct = ctx.request().getHeader("content-type"); + if (ct == null || isBinary(ct)) { + String encoded = Base64.getMimeEncoder().encodeToString(body.getBytes()); + event.setBody(encoded); + event.setIsBase64Encoded(true); + } else { + event.setBody(new String(body.getBytes(), StandardCharsets.UTF_8)); + } + } + + try { + byte[] mEvent = eventWriter.writeValueAsBytes(event); + ctx.put(APIGatewayV2HTTPEvent.class.getName(), mEvent); + queue.put(ctx); + } catch (Exception e) { + log.error("Publish failure", e); + ctx.fail(500); + } + } + + @Override + protected String getEventContentType(RoutingContext request) { + if (request.get(APIGatewayV2HTTPEvent.class.getName()) != null) + return "application/json"; + return super.getEventContentType(request); + } + + @Override + protected Buffer processEventBody(RoutingContext request) { + byte[] buf = request.get(APIGatewayV2HTTPEvent.class.getName()); + if (buf != null) { + return Buffer.buffer(buf); + } + return super.processEventBody(request); + } + + @Override + public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (pending.get(APIGatewayV2HTTPEvent.class.getName()) != null) { + try { + APIGatewayV2HTTPResponse res = responseReader.readValue(buffer.getBytes()); + HttpServerResponse response = pending.response(); + if (res.getHeaders() != null) { + for (Map.Entry header : res.getHeaders().entrySet()) { + for (String val : header.getValue().split(",")) { + response.headers().add(header.getKey(), val); + } + } + } + response.setStatusCode(res.getStatusCode()); + String body = res.getBody(); + if (body != null) { + if (res.getIsBase64Encoded()) { + byte[] bytes = Base64.getDecoder().decode(body); + response.end(Buffer.buffer(bytes)); + } else { + response.end(body); + } + } else { + response.end(); + } + + } catch (IOException e) { + log.error("Publish failure", e); + pending.fail(500); + } + } else { + super.processResponse(ctx, pending, buffer); + } + } + + private boolean isBinary(String contentType) { + if (contentType != null) { + String ct = contentType.toLowerCase(Locale.ROOT); + return !(ct.startsWith("text") || ct.contains("json") || ct.contains("xml") || ct.contains("yaml")); + } + return false; + } + +} diff --git a/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java new file mode 100644 index 00000000000000..831049128008b5 --- /dev/null +++ b/extensions/amazon-lambda-http/http-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -0,0 +1,82 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.util.HashMap; +import java.util.concurrent.Future; + +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent; +import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +public class EventServerTest { + + static MockEventServer server; + static ObjectMapper mapper; + static ObjectReader eventReader; + static ObjectWriter resWriter; + + @BeforeAll + public static void start() { + server = new MockHttpEventServer(); + server.start(); + mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventReader = mapper.readerFor(APIGatewayV2HTTPEvent.class); + resWriter = mapper.writerFor(APIGatewayV2HTTPResponse.class); + } + + @AfterAll + public static void end() throws Exception { + server.close(); + } + + @Test + public void testServer() throws Exception { + Client client = ClientBuilder.newBuilder().build(); + WebTarget base = client.target("http://localhost:" + MockEventServer.DEFAULT_PORT); + Future lambdaInvoke = base.request().async() + .post(Entity.text("Hello World")); + + Response next = base.path(MockEventServer.NEXT_INVOCATION).request().get(); + Assertions.assertEquals(200, next.getStatus()); + String requestId = next.getHeaderString(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + String traceId = next.getHeaderString(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + Assertions.assertNotNull(requestId); + Assertions.assertNotNull(traceId); + String json = next.readEntity(String.class); + APIGatewayV2HTTPEvent event = eventReader.readValue(json); + Assertions.assertEquals("text/plain", event.getHeaders().get("Content-Type")); + Assertions.assertEquals("Hello World", event.getBody()); + next.close(); + + APIGatewayV2HTTPResponse res = new APIGatewayV2HTTPResponse(); + res.setStatusCode(201); + res.setHeaders(new HashMap()); + res.getHeaders().put("Content-Type", "text/plain"); + res.setBody("Hi"); + Response sendResponse = base.path(MockEventServer.INVOCATION).path(requestId).path("response") + .request().post(Entity.json(resWriter.writeValueAsString(res))); + Assertions.assertEquals(204, sendResponse.getStatus()); + sendResponse.close(); + + Response lambdaResponse = lambdaInvoke.get(); + Assertions.assertEquals(201, lambdaResponse.getStatus()); + Assertions.assertEquals("Hi", lambdaResponse.readEntity(String.class)); + lambdaResponse.close(); + } +} diff --git a/extensions/amazon-lambda-http/pom.xml b/extensions/amazon-lambda-http/pom.xml index 61c49706a6b979..78c20a2fb26b2d 100644 --- a/extensions/amazon-lambda-http/pom.xml +++ b/extensions/amazon-lambda-http/pom.xml @@ -17,7 +17,9 @@ runtime + http-event-server deployment + maven-archetype diff --git a/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 3ee6b0b861cd66..295b2b80f286c1 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-http/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -11,4 +11,4 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda-http" - status: "preview" + status: "stable" diff --git a/extensions/amazon-lambda-rest/deployment/pom.xml b/extensions/amazon-lambda-rest/deployment/pom.xml index 32362c7132335c..97aa14362fcb06 100644 --- a/extensions/amazon-lambda-rest/deployment/pom.xml +++ b/extensions/amazon-lambda-rest/deployment/pom.xml @@ -39,6 +39,10 @@ io.quarkus quarkus-amazon-lambda-rest + + io.quarkus + quarkus-amazon-lambda-rest-event-server + diff --git a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java index 68242ca8e9f806..822459c06fe63c 100644 --- a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java +++ b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/AmazonLambdaHttpProcessor.java @@ -20,12 +20,10 @@ import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.pkg.builditem.ArtifactResultBuildItem; import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; -import io.quarkus.runtime.LaunchMode; import io.quarkus.vertx.http.deployment.RequireVirtualHttpBuildItem; import io.vertx.core.file.impl.FileResolver; @@ -46,8 +44,8 @@ public void setupSecurity(BuildProducer additionalBeans } @BuildStep - public RequireVirtualHttpBuildItem requestVirtualHttp(LaunchModeBuildItem launchMode) { - return launchMode.getLaunchMode() == LaunchMode.NORMAL ? RequireVirtualHttpBuildItem.MARKER : null; + public RequireVirtualHttpBuildItem requestVirtualHttp() { + return RequireVirtualHttpBuildItem.ALWAYS_VIRTUAL; } @BuildStep diff --git a/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java new file mode 100644 index 00000000000000..5e9f952f55badf --- /dev/null +++ b/extensions/amazon-lambda-rest/deployment/src/main/java/io/quarkus/amazon/lambda/http/deployment/DevServicesRestLambdaProcessor.java @@ -0,0 +1,14 @@ +package io.quarkus.amazon.lambda.http.deployment; + +import io.quarkus.amazon.lambda.deployment.EventServerOverrideBuildItem; +import io.quarkus.amazon.lambda.runtime.MockRestEventServer; +import io.quarkus.deployment.annotations.BuildStep; + +public class DevServicesRestLambdaProcessor { + + @BuildStep + public EventServerOverrideBuildItem overrideEventServer() { + return new EventServerOverrideBuildItem( + () -> new MockRestEventServer()); + } +} diff --git a/extensions/amazon-lambda-rest/pom.xml b/extensions/amazon-lambda-rest/pom.xml index 34cb1cf262363d..3e194bce78c241 100644 --- a/extensions/amazon-lambda-rest/pom.xml +++ b/extensions/amazon-lambda-rest/pom.xml @@ -17,6 +17,7 @@ runtime + rest-event-server deployment maven-archetype diff --git a/extensions/amazon-lambda-rest/rest-event-server/pom.xml b/extensions/amazon-lambda-rest/rest-event-server/pom.xml new file mode 100644 index 00000000000000..81b5fd7b97743b --- /dev/null +++ b/extensions/amazon-lambda-rest/rest-event-server/pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + + + io.quarkus + quarkus-amazon-lambda-rest-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-amazon-lambda-rest-event-server + Quarkus - Amazon Lambda REST Event Server + AWS Lambda REST Mock Lambda event server for testing and dev mode + + + + io.quarkus + quarkus-amazon-lambda-event-server + + + io.quarkus + quarkus-amazon-lambda-rest + + + org.junit.jupiter + junit-jupiter + test + + + org.jboss.resteasy + resteasy-client + test + + + commons-logging + commons-logging + + + jakarta.activation + jakarta.activation-api + + + + + + io.quarkus + quarkus-apache-httpclient + test + + + + + + + + diff --git a/extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java b/extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java new file mode 100644 index 00000000000000..4a3665eaf21889 --- /dev/null +++ b/extensions/amazon-lambda-rest/rest-event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockRestEventServer.java @@ -0,0 +1,173 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.UUID; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; +import io.quarkus.amazon.lambda.http.model.AwsProxyRequestContext; +import io.quarkus.amazon.lambda.http.model.AwsProxyResponse; +import io.quarkus.amazon.lambda.http.model.Headers; +import io.quarkus.amazon.lambda.http.model.MultiValuedTreeMap; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServerResponse; +import io.vertx.ext.web.RoutingContext; + +public class MockRestEventServer extends MockEventServer { + + private final ObjectMapper objectMapper; + private final ObjectWriter eventWriter; + private final ObjectReader responseReader; + + public MockRestEventServer() { + objectMapper = new ObjectMapper(); + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventWriter = objectMapper.writerFor(AwsProxyRequest.class); + responseReader = objectMapper.readerFor(AwsProxyResponse.class); + } + + @Override + protected void defaultHanderSetup() { + router.route().handler(this::handleHttpRequests); + } + + public void handleHttpRequests(RoutingContext ctx) { + String requestId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestId == null) { + requestId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + String traceId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (traceId == null) { + traceId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + Buffer body = ctx.getBody(); + + AwsProxyRequest event = new AwsProxyRequest(); + event.setRequestContext(new AwsProxyRequestContext()); + event.getRequestContext().setRequestId(requestId); + event.getRequestContext().setHttpMethod(ctx.request().method().name()); + event.setHttpMethod(ctx.request().method().name()); + event.setPath(ctx.request().path()); + if (ctx.request().query() != null) { + event.setMultiValueQueryStringParameters(new MultiValuedTreeMap<>()); + String[] params = ctx.request().query().split("&"); + for (String param : params) { + if (param.contains("=")) { + String[] keyval = param.split("="); + try { + event.getMultiValueQueryStringParameters().add( + URLDecoder.decode(keyval[0], StandardCharsets.UTF_8.name()), + URLDecoder.decode(keyval[1], StandardCharsets.UTF_8.name())); + } catch (UnsupportedEncodingException e) { + log.error("Failed to parse query string", e); + ctx.response().setStatusCode(400).end(); + return; + } + } + } + + } + if (ctx.request().headers() != null) { + event.setMultiValueHeaders(new Headers()); + for (String header : ctx.request().headers().names()) { + List values = ctx.request().headers().getAll(header); + for (String val : values) + event.getMultiValueHeaders().add(header, val); + } + } + if (body != null) { + String ct = ctx.request().getHeader("content-type"); + if (ct == null || isBinary(ct)) { + String encoded = Base64.getMimeEncoder().encodeToString(body.getBytes()); + event.setBody(encoded); + event.setIsBase64Encoded(true); + } else { + event.setBody(new String(body.getBytes(), StandardCharsets.UTF_8)); + } + } + + try { + byte[] mEvent = eventWriter.writeValueAsBytes(event); + ctx.put(AwsProxyRequest.class.getName(), mEvent); + queue.put(ctx); + } catch (Exception e) { + log.error("Publish failure", e); + ctx.fail(500); + } + } + + @Override + protected String getEventContentType(RoutingContext request) { + if (request.get(AwsProxyRequest.class.getName()) != null) + return "application/json"; + return super.getEventContentType(request); + } + + @Override + protected Buffer processEventBody(RoutingContext request) { + byte[] buf = request.get(AwsProxyRequest.class.getName()); + if (buf != null) { + return Buffer.buffer(buf); + } + return super.processEventBody(request); + } + + @Override + public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (pending.get(AwsProxyRequest.class.getName()) != null) { + try { + AwsProxyResponse res = responseReader.readValue(buffer.getBytes()); + HttpServerResponse response = pending.response(); + if (res.getMultiValueHeaders() != null) { + for (Map.Entry> header : res.getMultiValueHeaders().entrySet()) { + for (String val : header.getValue()) { + response.headers().add(header.getKey(), val); + } + } + } + response.setStatusCode(res.getStatusCode()); + String body = res.getBody(); + if (body != null) { + if (res.isBase64Encoded()) { + byte[] bytes = Base64.getDecoder().decode(body); + response.end(Buffer.buffer(bytes)); + } else { + response.end(body); + } + } else { + response.end(); + } + + } catch (IOException e) { + log.error("Publish failure", e); + pending.fail(500); + } + } else { + super.processResponse(ctx, pending, buffer); + } + } + + private boolean isBinary(String contentType) { + if (contentType != null) { + String ct = contentType.toLowerCase(Locale.ROOT); + return !(ct.startsWith("text") || ct.contains("json") || ct.contains("xml") || ct.contains("yaml")); + } + return false; + } + +} diff --git a/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java new file mode 100644 index 00000000000000..508ea7e4bbabb6 --- /dev/null +++ b/extensions/amazon-lambda-rest/rest-event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -0,0 +1,83 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.util.HashMap; +import java.util.concurrent.Future; + +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.ObjectWriter; + +import io.quarkus.amazon.lambda.http.model.AwsProxyRequest; +import io.quarkus.amazon.lambda.http.model.AwsProxyResponse; + +public class EventServerTest { + + static MockEventServer server; + static ObjectMapper mapper; + static ObjectReader eventReader; + static ObjectWriter resWriter; + + @BeforeAll + public static void start() { + server = new MockRestEventServer(); + server.start(); + mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); + eventReader = mapper.readerFor(AwsProxyRequest.class); + resWriter = mapper.writerFor(AwsProxyResponse.class); + } + + @AfterAll + public static void end() throws Exception { + server.close(); + } + + @Test + public void testServer() throws Exception { + Client client = ClientBuilder.newBuilder().build(); + WebTarget base = client.target("http://localhost:" + MockEventServer.DEFAULT_PORT); + Future lambdaInvoke = base.request().async() + .post(Entity.text("Hello World")); + + Response next = base.path(MockEventServer.NEXT_INVOCATION).request().get(); + Assertions.assertEquals(200, next.getStatus()); + String requestId = next.getHeaderString(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + String traceId = next.getHeaderString(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + Assertions.assertNotNull(requestId); + Assertions.assertNotNull(traceId); + String json = next.readEntity(String.class); + AwsProxyRequest event = eventReader.readValue(json); + Assertions.assertEquals("text/plain", event.getMultiValueHeaders().getFirst("Content-Type")); + Assertions.assertEquals("Hello World", event.getBody()); + next.close(); + + AwsProxyResponse res = new AwsProxyResponse(); + res.setStatusCode(201); + res.setHeaders(new HashMap()); + res.getHeaders().put("Content-Type", "text/plain"); + res.setBody("Hi"); + Response sendResponse = base.path(MockEventServer.INVOCATION).path(requestId).path("response") + .request().post(Entity.json(resWriter.writeValueAsString(res))); + Assertions.assertEquals(204, sendResponse.getStatus()); + sendResponse.close(); + + Response lambdaResponse = lambdaInvoke.get(); + Assertions.assertEquals(201, lambdaResponse.getStatus()); + Assertions.assertEquals("Hi", lambdaResponse.readEntity(String.class)); + lambdaResponse.close(); + } +} diff --git a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java index e2f2ede57953ab..d1c9ffebdd1960 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java +++ b/extensions/amazon-lambda-rest/runtime/src/main/java/io/quarkus/amazon/lambda/http/graal/LambdaContainerHandlerSubstitution.java @@ -5,7 +5,7 @@ import com.oracle.svm.core.annotate.TargetClass; @TargetClass(LambdaContainerHandler.class) -public class LambdaContainerHandlerSubstitution { +public final class LambdaContainerHandlerSubstitution { // afterburner does not work in native mode, so let's ensure it's never registered @Substitute diff --git a/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 8636a6f8832a44..992fa650deacb1 100644 --- a/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-rest/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -11,6 +11,6 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda-http" - status: "preview" + status: "stable" config: - "quarkus.lambda-http." diff --git a/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b68cb8deb0e6ad..64721449014f47 100644 --- a/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda-xray/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,4 +10,4 @@ metadata: guide: "https://quarkus.io/guides/amazon-lambda#tracing-with-aws-xray-and-graalvm" categories: - "cloud" - status: "preview" \ No newline at end of file + status: "stable" \ No newline at end of file diff --git a/extensions/amazon-lambda/common-deployment/pom.xml b/extensions/amazon-lambda/common-deployment/pom.xml index f2686d8d098c60..9e34d9282e0ce9 100644 --- a/extensions/amazon-lambda/common-deployment/pom.xml +++ b/extensions/amazon-lambda/common-deployment/pom.xml @@ -35,6 +35,10 @@ io.quarkus quarkus-amazon-lambda-common + + io.quarkus + quarkus-amazon-lambda-event-server + io.quarkus quarkus-junit5-internal diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java index df692697ed573a..eafa77114b062e 100644 --- a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaCommonProcessor.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.amazon.lambda.runtime.AmazonLambdaMapperRecorder; -import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig; import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.deployment.annotations.BuildProducer; @@ -75,12 +74,11 @@ public void initContextReaders(AmazonLambdaMapperRecorder recorder, @BuildStep @Record(value = ExecutionTime.STATIC_INIT) - void initContextReaders(LambdaBuildTimeConfig config, - AmazonLambdaMapperRecorder recorder, + void initContextReaders(AmazonLambdaMapperRecorder recorder, LambdaObjectMapperInitializedBuildItem dependency, LaunchModeBuildItem launchModeBuildItem) { LaunchMode mode = launchModeBuildItem.getLaunchMode(); - if (config.enablePollingJvmMode && mode.isDevOrTest()) { + if (mode.isDevOrTest()) { // only need context readers in native or dev or test mode recorder.initContextReaders(); } diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java new file mode 100644 index 00000000000000..6b41e5100b0c96 --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java @@ -0,0 +1,95 @@ +package io.quarkus.amazon.lambda.deployment; + +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; + +import java.util.Optional; +import java.util.function.Supplier; + +import org.jboss.logging.Logger; + +import io.quarkus.amazon.lambda.runtime.AmazonLambdaApi; +import io.quarkus.amazon.lambda.runtime.LambdaHotReplacementRecorder; +import io.quarkus.amazon.lambda.runtime.MockEventServer; +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.deployment.IsNormal; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.DevServicesNativeConfigResultBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.runtime.LaunchMode; + +public class DevServicesLambdaProcessor { + private static final Logger log = Logger.getLogger(DevServicesLambdaProcessor.class); + + static MockEventServer server; + static LaunchMode startMode; + + @BuildStep(onlyIfNot = IsNormal.class) + @Record(STATIC_INIT) + public void enableHotReplacementChecker(LaunchModeBuildItem launchMode, + LambdaHotReplacementRecorder recorder, + LambdaObjectMapperInitializedBuildItem dependency) { + if (launchMode.getLaunchMode().isDevOrTest()) { + if (!legacyTestingEnabled()) { + recorder.enable(); + } + } + } + + private boolean legacyTestingEnabled() { + try { + Class.forName("io.quarkus.amazon.lambda.test.LambdaClient"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + + @BuildStep(onlyIfNot = IsNormal.class) + public void startEventServer(LaunchModeBuildItem launchMode, + LambdaConfig config, + Optional override, + BuildProducer devServicePropertiesProducer, + BuildProducer serviceStartBuildItemBuildProducer) throws Exception { + if (!launchMode.getLaunchMode().isDevOrTest()) + return; + if (legacyTestingEnabled()) + return; + if (server != null) { + return; + } + Supplier supplier = null; + if (override.isPresent()) { + supplier = override.get().getServer(); + } else { + supplier = () -> new MockEventServer(); + } + + server = supplier.get(); + int port = launchMode.getLaunchMode() == LaunchMode.TEST ? config.mockEventServer.testPort + : config.mockEventServer.devPort; + startMode = launchMode.getLaunchMode(); + server.start(port); + String baseUrl = "localhost:" + port + MockEventServer.BASE_PATH; + System.setProperty(AmazonLambdaApi.QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API, baseUrl); + devServicePropertiesProducer.produce( + new DevServicesNativeConfigResultBuildItem(AmazonLambdaApi.QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API, baseUrl)); + Runnable closeTask = () -> { + if (server != null) { + try { + server.close(); + } catch (Throwable e) { + log.error("Failed to stop the Lambda Mock Event Server", e); + } finally { + server = null; + } + } + startMode = null; + server = null; + }; + QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); + ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + } +} diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java new file mode 100644 index 00000000000000..29644cf78b8b02 --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/EventServerOverrideBuildItem.java @@ -0,0 +1,18 @@ +package io.quarkus.amazon.lambda.deployment; + +import java.util.function.Supplier; + +import io.quarkus.amazon.lambda.runtime.MockEventServer; +import io.quarkus.builder.item.SimpleBuildItem; + +public final class EventServerOverrideBuildItem extends SimpleBuildItem { + private Supplier server; + + public EventServerOverrideBuildItem(Supplier server) { + this.server = server; + } + + public Supplier getServer() { + return server; + } +} diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java new file mode 100644 index 00000000000000..e9dcc8e4c3e61f --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/LambdaConfig.java @@ -0,0 +1,14 @@ +package io.quarkus.amazon.lambda.deployment; + +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +@ConfigRoot(phase = ConfigPhase.BUILD_TIME) +public class LambdaConfig { + + /** + * Configuration for the mock event server that is run + * in dev mode and test mode + */ + MockEventServerConfig mockEventServer; +} diff --git a/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java new file mode 100644 index 00000000000000..8722ba40f47f62 --- /dev/null +++ b/extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/MockEventServerConfig.java @@ -0,0 +1,23 @@ +package io.quarkus.amazon.lambda.deployment; + +import io.quarkus.runtime.annotations.ConfigGroup; +import io.quarkus.runtime.annotations.ConfigItem; + +/** + * Configuration for the mock event server that is run + * in dev mode and test mode + */ +@ConfigGroup +public class MockEventServerConfig { + /** + * Port to access mock event server in dev mode + */ + @ConfigItem(defaultValue = "8080") + public int devPort; + + /** + * Port to access mock event server in dev mode + */ + @ConfigItem(defaultValue = "8081") + public int testPort; +} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java index db662c1139144b..1d7052ccc766df 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java @@ -33,23 +33,42 @@ public AbstractLambdaPollLoop(ObjectMapper objectMapper, ObjectReader cognitoIdR protected abstract boolean isStream(); - public void startPollLoop(ShutdownContext context) { + protected HttpURLConnection requestConnection = null; + public void startPollLoop(ShutdownContext context) { final AtomicBoolean running = new AtomicBoolean(true); + // flag to check whether to interrupt. + final AtomicBoolean shouldInterrupt = new AtomicBoolean(true); + String baseUrl = AmazonLambdaApi.baseUrl(); final Thread pollingThread = new Thread(new Runnable() { @SuppressWarnings("unchecked") @Override public void run() { - try { - checkQuarkusBootstrapped(); - URL requestUrl = AmazonLambdaApi.invocationNext(); + if (!LambdaHotReplacementRecorder.enabled) { + // when running with continuous testing, this method fails + // because currentApplication is not set when running as an + // auxiliary application. So, just skip it if hot replacement enabled. + // this is only needed in lambda JVM mode anyways to make sure + // quarkus has started. + checkQuarkusBootstrapped(); + } + URL requestUrl = AmazonLambdaApi.invocationNext(baseUrl); + if (AmazonLambdaApi.isTestMode()) { + // FYI: This log is required as native test runner + // looks for "Listening on" in log to ensure native executable booted + log.info("Listening on: " + requestUrl.toString()); + } while (running.get()) { - HttpURLConnection requestConnection = null; try { requestConnection = (HttpURLConnection) requestUrl.openConnection(); } catch (IOException e) { + if (!running.get()) { + // just return gracefully as we were probably shut down by + // shutdown task + return; + } if (abortGracefully(e)) { return; } @@ -57,10 +76,31 @@ public void run() { } try { String requestId = requestConnection.getHeaderField(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestConnection.getResponseCode() != 200) { + // connection should be closed by finally clause + continue; + } try { + if (LambdaHotReplacementRecorder.enabled) { + try { + // do not interrupt during a hot replacement + // as shutdown will abort and do nasty things. + shouldInterrupt.set(false); + if (LambdaHotReplacementRecorder.checkHotReplacement()) { + // hot replacement happened in dev mode + // so we requeue the request as quarkus will restart + // and the message will not be processed + // FYI: this requeue endpoint is something only the mock event server implements + requeue(baseUrl, requestId); + return; + } + } finally { + shouldInterrupt.set(true); + } + } String traceId = requestConnection.getHeaderField(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); TraceId.setTraceId(traceId); - URL url = AmazonLambdaApi.invocationResponse(requestId); + URL url = AmazonLambdaApi.invocationResponse(baseUrl, requestId); if (isStream()) { HttpURLConnection responseConnection = responseStream(url); if (running.get()) { @@ -87,7 +127,7 @@ public void run() { } log.error("Failed to run lambda", e); - postError(AmazonLambdaApi.invocationError(requestId), + postError(AmazonLambdaApi.invocationError(baseUrl, requestId), new FunctionError(e.getClass().getName(), e.getMessage())); continue; } @@ -111,25 +151,34 @@ public void run() { } catch (Exception e) { try { log.error("Lambda init error", e); - postError(AmazonLambdaApi.initError(), new FunctionError(e.getClass().getName(), e.getMessage())); + postError(AmazonLambdaApi.initError(baseUrl), + new FunctionError(e.getClass().getName(), e.getMessage())); } catch (Exception ex) { log.error("Failed to report init error", ex); } finally { // our main loop is done, time to shutdown Application app = Application.currentApplication(); if (app != null) { + log.error("Shutting down Quarkus application because of error"); app.stop(); } } + } finally { + log.info("Lambda polling thread complete"); } } }, "Lambda Thread"); pollingThread.setDaemon(true); context.addShutdownTask(() -> { running.set(false); - //note that this does not seem to be 100% reliable in unblocking the thread - //which is why it is a daemon. - pollingThread.interrupt(); + try { + //note that interrupting does not seem to be 100% reliable in unblocking the thread + requestConnection.disconnect(); + } catch (Exception ignore) { + } + if (shouldInterrupt.get()) { + pollingThread.interrupt(); + } }); pollingThread.start(); @@ -167,10 +216,24 @@ private void checkQuarkusBootstrapped() { protected void postResponse(URL url, Object response) throws IOException { HttpURLConnection responseConnection = (HttpURLConnection) url.openConnection(); + if (response != null) { + getOutputWriter().writeHeaders(responseConnection); + } responseConnection.setDoOutput(true); responseConnection.setRequestMethod("POST"); - if (response != null) + if (response != null) { getOutputWriter().writeValue(responseConnection.getOutputStream(), response); + } + while (responseConnection.getInputStream().read() != -1) { + // Read data + } + } + + protected void requeue(String baseUrl, String requestId) throws IOException { + URL url = AmazonLambdaApi.requeue(baseUrl, requestId); + HttpURLConnection responseConnection = (HttpURLConnection) url.openConnection(); + responseConnection.setDoOutput(true); + responseConnection.setRequestMethod("POST"); while (responseConnection.getInputStream().read() != -1) { // Read data } @@ -178,6 +241,7 @@ protected void postResponse(URL url, Object response) throws IOException { protected void postError(URL url, Object response) throws IOException { HttpURLConnection responseConnection = (HttpURLConnection) url.openConnection(); + responseConnection.setRequestProperty("Content-Type", "application/json"); responseConnection.setDoOutput(true); responseConnection.setRequestMethod("POST"); objectMapper.writeValue(responseConnection.getOutputStream(), response); @@ -202,7 +266,7 @@ boolean abortGracefully(Exception ex) { || (ex instanceof UnknownHostException && !lambdaEnv); if (graceful) - log.warn("Aborting lambda poll loop: " + (!lambdaEnv ? "no lambda container found" : "test mode")); + log.warn("Aborting lambda poll loop: " + (lambdaEnv ? "no lambda container found" : "ending dev/test mode")); return graceful; } diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java index a768c158bc3899..ec1e528ab38753 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaApi.java @@ -28,20 +28,35 @@ public class AmazonLambdaApi { public static final String API_PATH_ERROR = "/error"; public static final String API_PATH_RESPONSE = "/response"; - static URL invocationNext() throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INVOCATION_NEXT); + // Only available in dev/test mode and points to path for mock even tserver + public static final String API_BASE_PATH_TEST = "/_lambda_"; + public static final String POST_EVENT = API_BASE_PATH_TEST; + + // this is quarkus specific endpoint for dev mode + public static final String API_PATH_REQUEUE = "/requeue"; + + static String baseUrl() { + return API_PROTOCOL + runtimeApi(); + } + + static URL invocationNext(String baseUrl) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION_NEXT); } - static URL invocationError(String requestId) throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INVOCATION + requestId + API_PATH_ERROR); + static URL invocationError(String baseUrl, String requestId) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION + requestId + API_PATH_ERROR); } - static URL invocationResponse(String requestId) throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INVOCATION + requestId + API_PATH_RESPONSE); + static URL invocationResponse(String baseUrl, String requestId) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION + requestId + API_PATH_RESPONSE); } - static URL initError() throws MalformedURLException { - return new URL(API_PROTOCOL + runtimeApi() + API_PATH_INIT_ERROR); + static URL requeue(String baseUrl, String requestId) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INVOCATION + requestId + API_PATH_REQUEUE); + } + + static URL initError(String baseUrl) throws MalformedURLException { + return new URL(baseUrl + API_PATH_INIT_ERROR); } static String logGroupName() { @@ -64,6 +79,10 @@ static String functionVersion() { return System.getenv("AWS_LAMBDA_FUNCTION_VERSION"); } + public static boolean isTestMode() { + return System.getProperty(AmazonLambdaApi.QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API) != null; + } + private static String runtimeApi() { String testApi = System.getProperty(QUARKUS_INTERNAL_AWS_LAMBDA_TEST_API); if (testApi != null) { diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java index d950a57f741cf5..137e8c75461059 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/JacksonOutputWriter.java @@ -2,6 +2,7 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.HttpURLConnection; import com.fasterxml.jackson.databind.ObjectWriter; @@ -16,4 +17,10 @@ public JacksonOutputWriter(ObjectWriter writer) { public void writeValue(OutputStream os, Object obj) throws IOException { writer.writeValue(os, obj); } + + @Override + public void writeHeaders(HttpURLConnection conn) { + conn.setRequestProperty("Content-Type", "application/json"); + } + } diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java deleted file mode 100644 index 3af310748aa107..00000000000000 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaBuildTimeConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.quarkus.amazon.lambda.runtime; - -import io.quarkus.runtime.annotations.ConfigItem; -import io.quarkus.runtime.annotations.ConfigPhase; -import io.quarkus.runtime.annotations.ConfigRoot; - -/** - * - */ -@ConfigRoot(phase = ConfigPhase.BUILD_TIME) -public class LambdaBuildTimeConfig { - - /** - * If true, this will enable the aws event poll loop within a Quarkus test run. This loop normally only runs in native - * image. This option is strictly for testing purposes. - * - */ - @ConfigItem - public boolean enablePollingJvmMode; -} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java new file mode 100644 index 00000000000000..8e187d637adad4 --- /dev/null +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaHotReplacementRecorder.java @@ -0,0 +1,49 @@ +package io.quarkus.amazon.lambda.runtime; + +import org.jboss.logging.Logger; + +import io.quarkus.dev.console.DevConsoleManager; +import io.quarkus.dev.spi.HotReplacementContext; +import io.quarkus.runtime.annotations.Recorder; + +@Recorder +public class LambdaHotReplacementRecorder { + private static final Logger log = Logger.getLogger(LambdaHotReplacementRecorder.class); + + static volatile long nextUpdate; + public static volatile boolean enabled; + private static final long HOT_REPLACEMENT_INTERVAL = 2000; + + static Object syncLock = new Object(); + + public static boolean checkHotReplacement() throws Exception { + if (!enabled) + return false; + HotReplacementContext hotReplacementContext = DevConsoleManager.getHotReplacementContext(); + if (hotReplacementContext == null) + return false; + + if ((nextUpdate > System.currentTimeMillis() && !hotReplacementContext.isTest())) { + if (hotReplacementContext.getDeploymentProblem() != null) { + throw new Exception("Hot Replacement Deployment issue", hotReplacementContext.getDeploymentProblem()); + } + return false; + } + synchronized (syncLock) { + if (nextUpdate < System.currentTimeMillis() || hotReplacementContext.isTest()) { + nextUpdate = System.currentTimeMillis() + HOT_REPLACEMENT_INTERVAL; + try { + boolean restart = hotReplacementContext.doScan(true); + return restart; + } catch (Exception e) { + throw new IllegalStateException("Unable to perform live reload scanning", e); + } + } + } + return false; + } + + public void enable() { + enabled = true; + } +} diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java index d9de5be4e9ff08..a0895ab5302277 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/LambdaOutputWriter.java @@ -2,7 +2,11 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.HttpURLConnection; public interface LambdaOutputWriter { void writeValue(OutputStream os, Object obj) throws IOException; + + default void writeHeaders(HttpURLConnection conn) { + } } diff --git a/extensions/amazon-lambda/deployment/pom.xml b/extensions/amazon-lambda/deployment/pom.xml index 6748ee9112fa6e..8e5df28f1b6d4b 100644 --- a/extensions/amazon-lambda/deployment/pom.xml +++ b/extensions/amazon-lambda/deployment/pom.xml @@ -35,6 +35,11 @@ quarkus-junit5-internal test + + io.quarkus + quarkus-junit5 + test + diff --git a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java index 128109ea225234..b755f0aae7f7b2 100644 --- a/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java +++ b/extensions/amazon-lambda/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java @@ -24,7 +24,6 @@ import io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder; import io.quarkus.amazon.lambda.runtime.FunctionError; -import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig; import io.quarkus.amazon.lambda.runtime.LambdaConfig; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.BeanContainerBuildItem; @@ -248,13 +247,12 @@ void startPoolLoop(AmazonLambdaRecorder recorder, @BuildStep @Record(value = ExecutionTime.RUNTIME_INIT) - void enableNativeEventLoop(LambdaBuildTimeConfig config, - AmazonLambdaRecorder recorder, + void startPoolLoopDevOrTest(AmazonLambdaRecorder recorder, List orderServicesFirst, // force some ordering of recorders ShutdownContextBuildItem shutdownContextBuildItem, LaunchModeBuildItem launchModeBuildItem) { LaunchMode mode = launchModeBuildItem.getLaunchMode(); - if (config.enablePollingJvmMode && mode.isDevOrTest()) { + if (mode.isDevOrTest()) { recorder.startPollLoop(shutdownContextBuildItem); } } diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java new file mode 100644 index 00000000000000..f62a7ef7eef955 --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/GreetingLambda.java @@ -0,0 +1,12 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestHandler; + +public class GreetingLambda implements RequestHandler { + + @Override + public String handleRequest(Person input, Context context) { + return "Hey " + input.getName(); + } +} diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java new file mode 100644 index 00000000000000..1565016006b699 --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaDevServicesContinuousTestingTestCase.java @@ -0,0 +1,49 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +import java.util.function.Supplier; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.QuarkusDevModeTest; + +public class LambdaDevServicesContinuousTestingTestCase { + @RegisterExtension + public static QuarkusDevModeTest test = new QuarkusDevModeTest() + .setArchiveProducer(new Supplier() { + @Override + public JavaArchive get() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(GreetingLambda.class, Person.class) + .addAsResource(new StringAsset(ContinuousTestingTestUtils.appProperties("")), + "application.properties"); + } + }).setTestArchiveProducer(new Supplier() { + @Override + public JavaArchive get() { + return ShrinkWrap.create(JavaArchive.class).addClass(LambdaHandlerET.class); + } + }); + + @Test + public void testLambda() throws Exception { + ContinuousTestingTestUtils utils = new ContinuousTestingTestUtils(); + var result = utils.waitForNextCompletion(); + Assertions.assertEquals(1, result.getTotalTestsPassed()); + Assertions.assertEquals(0, result.getTotalTestsFailed()); + test.modifySourceFile(GreetingLambda.class, s -> s.replace("Hey", "Yo")); + result = utils.waitForNextCompletion(); + Assertions.assertEquals(0, result.getTotalTestsPassed()); + Assertions.assertEquals(1, result.getTotalTestsFailed()); + test.modifyTestSourceFile(LambdaHandlerET.class, s -> s.replace("Hey", "Yo")); + result = utils.waitForNextCompletion(); + Assertions.assertEquals(1, result.getTotalTestsPassed()); + Assertions.assertEquals(0, result.getTotalTestsFailed()); + + } +} diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java new file mode 100644 index 00000000000000..e37e209b3c221f --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/LambdaHandlerET.java @@ -0,0 +1,31 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; + +import org.junit.jupiter.api.Test; + +import io.quarkus.test.junit.QuarkusTest; + +@QuarkusTest +class LambdaHandlerET { + + @Test + public void testSimpleLambdaSuccess() throws Exception { + // you test your lambas by invoking on http://localhost:8081 + // this works in dev mode too + + Person in = new Person(); + in.setName("Stu"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hey Stu")); + } + +} diff --git a/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java new file mode 100644 index 00000000000000..d2a4066a77dc29 --- /dev/null +++ b/extensions/amazon-lambda/deployment/src/test/java/io/quarkus/amazon/lambda/deployment/testing/Person.java @@ -0,0 +1,15 @@ +package io.quarkus.amazon.lambda.deployment.testing; + +public class Person { + + private String name; + + public String getName() { + return name; + } + + public Person setName(String name) { + this.name = name; + return this; + } +} diff --git a/extensions/amazon-lambda/event-server/pom.xml b/extensions/amazon-lambda/event-server/pom.xml new file mode 100644 index 00000000000000..9c2b5daf911e1b --- /dev/null +++ b/extensions/amazon-lambda/event-server/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + + io.quarkus + quarkus-amazon-lambda-parent + 999-SNAPSHOT + ../pom.xml + + + quarkus-amazon-lambda-event-server + Quarkus - Amazon Lambda Event Server + Mock Lambda event server for testing and dev mode + + + + io.vertx + vertx-web + + + com.fasterxml.jackson.core + jackson-databind + + + + + io.quarkus + quarkus-amazon-lambda-common + + + org.junit.jupiter + junit-jupiter + test + + + org.jboss.resteasy + resteasy-client + test + + + commons-logging + commons-logging + + + jakarta.activation + jakarta.activation-api + + + + + + io.quarkus + quarkus-apache-httpclient + test + + + io.rest-assured + rest-assured + test + + + + + + + + diff --git a/extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java b/extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java new file mode 100644 index 00000000000000..cea6dfd37e2315 --- /dev/null +++ b/extensions/amazon-lambda/event-server/src/main/java/io/quarkus/amazon/lambda/runtime/MockEventServer.java @@ -0,0 +1,240 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.io.Closeable; +import java.io.IOException; +import java.util.UUID; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.jboss.logging.Logger; + +import io.vertx.core.Vertx; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpServer; +import io.vertx.ext.web.Router; +import io.vertx.ext.web.RoutingContext; +import io.vertx.ext.web.handler.BodyHandler; + +public class MockEventServer implements Closeable { + protected static final Logger log = Logger.getLogger(MockEventServer.class); + public static final int DEFAULT_PORT = 8081; + + public void start() { + int port = DEFAULT_PORT; + start(port); + } + + public void start(int port) { + this.port = port; + vertx = Vertx.vertx(); + httpServer = vertx.createHttpServer(); + router = Router.router(vertx); + setupRoutes(); + httpServer.requestHandler(router).listen(port).result(); + log.info("Mock Lambda Event Server Started"); + } + + private Vertx vertx; + private int port; + protected HttpServer httpServer; + protected Router router; + protected BlockingQueue queue; + protected ConcurrentHashMap responsePending = new ConcurrentHashMap<>(); + protected ExecutorService blockingPool = Executors.newCachedThreadPool(); + public static final String BASE_PATH = AmazonLambdaApi.API_BASE_PATH_TEST; + public static final String INVOCATION = BASE_PATH + AmazonLambdaApi.API_PATH_INVOCATION; + public static final String NEXT_INVOCATION = BASE_PATH + AmazonLambdaApi.API_PATH_INVOCATION_NEXT; + public static final String POST_EVENT = BASE_PATH; + + public MockEventServer() { + queue = new LinkedBlockingQueue<>(); + } + + public HttpServer getHttpServer() { + return httpServer; + } + + public void setupRoutes() { + router.route().handler(BodyHandler.create()); + router.post(POST_EVENT).handler(this::postEvent); + router.route(NEXT_INVOCATION).blockingHandler(this::nextEvent); + router.route(INVOCATION + ":requestId" + AmazonLambdaApi.API_PATH_REQUEUE).handler(this::handleRequeue); + router.route(INVOCATION + ":requestId" + AmazonLambdaApi.API_PATH_RESPONSE).handler(this::handleResponse); + router.route(INVOCATION + ":requestId" + AmazonLambdaApi.API_PATH_ERROR).handler(this::handleError); + defaultHanderSetup(); + } + + protected void defaultHanderSetup() { + router.post().handler(this::postEvent); + } + + public void postEvent(RoutingContext ctx) { + String requestId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (requestId == null) { + requestId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + String traceId = ctx.request().getHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + if (traceId == null) { + traceId = UUID.randomUUID().toString(); + } + ctx.put(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + try { + queue.put(ctx); + } catch (InterruptedException e) { + log.error("Publish interrupted"); + ctx.fail(500); + } + } + + private RoutingContext pollNextEvent() throws InterruptedException { + for (;;) { + RoutingContext request = queue.poll(10, TimeUnit.MILLISECONDS); + if (request != null) + return request; + + } + } + + public void nextEvent(RoutingContext ctx) { + // Vert.x barfs if you block too long so we have our own executor + blockingPool.execute(() -> { + final AtomicBoolean closed = new AtomicBoolean(false); + ctx.response().closeHandler((v) -> closed.set(true)); + RoutingContext request = null; + try { + for (;;) { + request = queue.poll(10, TimeUnit.MILLISECONDS); + if (request != null) { + if (closed.get()) { + queue.put(request); + return; + } else { + break; + } + } else if (closed.get()) { + return; + } + } + } catch (InterruptedException e) { + log.error("nextEvent interrupted"); + ctx.fail(500); + } + + String contentType = getEventContentType(request); + if (contentType != null) { + ctx.response().putHeader("content-type", contentType); + } + String traceId = request.get(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + if (traceId != null) { + ctx.response().putHeader(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY, traceId); + } + String requestId = request.get(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + responsePending.put(requestId, request); + ctx.response().putHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, requestId); + Buffer body = processEventBody(request); + if (body != null) { + ctx.response().setStatusCode(200).end(body); + } else { + ctx.response().setStatusCode(200).end(); + } + }); + } + + protected String getEventContentType(RoutingContext request) { + return request.request().getHeader("content-type"); + } + + protected Buffer processEventBody(RoutingContext request) { + return request.getBody(); + } + + public void handleResponse(RoutingContext ctx) { + String requestId = ctx.pathParam("requestId"); + RoutingContext pending = responsePending.remove(requestId); + if (pending == null) { + log.error("Unknown lambda request: " + requestId); + ctx.fail(404); + return; + } + Buffer buffer = ctx.getBody(); + processResponse(ctx, pending, buffer); + ctx.response().setStatusCode(204); + ctx.end(); + } + + public void handleRequeue(RoutingContext ctx) { + String requestId = ctx.pathParam("requestId"); + RoutingContext pending = responsePending.remove(requestId); + if (pending == null) { + log.error("Unknown lambda request: " + requestId); + ctx.fail(404); + return; + } + try { + queue.put(pending); + } catch (InterruptedException e) { + log.error("Publish interrupted"); + ctx.fail(500); + } + ctx.response().setStatusCode(204); + ctx.end(); + } + + public void processResponse(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (buffer != null) { + if (ctx.request().getHeader("Content-Type") != null) { + pending.response().putHeader("Content-Type", ctx.request().getHeader("Content-Type")); + } + pending.response() + .setStatusCode(200) + .end(buffer); + } else { + pending.response() + .setStatusCode(204) + .end(); + } + } + + public void handleError(RoutingContext ctx) { + String requestId = ctx.pathParam("requestId"); + RoutingContext pending = responsePending.remove(requestId); + if (pending == null) { + log.error("Unknown lambda request: " + requestId); + ctx.fail(404); + return; + } + Buffer buffer = ctx.getBody(); + processError(ctx, pending, buffer); + ctx.response().setStatusCode(204); + ctx.end(); + } + + public void processError(RoutingContext ctx, RoutingContext pending, Buffer buffer) { + if (buffer != null) { + if (ctx.request().getHeader("Content-Type") != null) { + pending.response().putHeader("Content-Type", ctx.request().getHeader("Content-Type")); + } + pending.response() + .setStatusCode(500) + .end(buffer); + } else { + pending.response() + .setStatusCode(500) + .end(); + } + } + + @Override + public void close() throws IOException { + log.info("Stopping Mock Lambda Event Server"); + httpServer.close().result(); + vertx.close().result(); + blockingPool.shutdown(); + } +} diff --git a/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java b/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java new file mode 100644 index 00000000000000..d6f98929b281d9 --- /dev/null +++ b/extensions/amazon-lambda/event-server/src/test/java/io/quarkus/amazon/lambda/runtime/EventServerTest.java @@ -0,0 +1,66 @@ +package io.quarkus.amazon.lambda.runtime; + +import java.util.concurrent.Future; + +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; + +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +public class EventServerTest { + + static MockEventServer server; + + @BeforeAll + public static void start() { + server = new MockEventServer(); + server.start(); + } + + @AfterAll + public static void end() throws Exception { + server.close(); + } + + @Test + public void testServer() throws Exception { + Client client = ClientBuilder.newBuilder().build(); + WebTarget base = client.target("http://localhost:" + MockEventServer.DEFAULT_PORT); + WebTarget postEvent = base.path(MockEventServer.POST_EVENT); + // test posting event works at '/_lambda' + invokeTest(base, postEvent); + // make sure posting event works on '/' + invokeTest(base, base); + } + + private void invokeTest(WebTarget base, WebTarget postEvent) + throws InterruptedException, java.util.concurrent.ExecutionException { + Future lambdaInvoke = postEvent.request().async().post(Entity.json("\"hello\"")); + + Response next = base.path(MockEventServer.NEXT_INVOCATION).request().get(); + Assertions.assertEquals(200, next.getStatus()); + String requestId = next.getHeaderString(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID); + String traceId = next.getHeaderString(AmazonLambdaApi.LAMBDA_TRACE_HEADER_KEY); + Assertions.assertNotNull(requestId); + Assertions.assertNotNull(traceId); + String json = next.readEntity(String.class); + Assertions.assertEquals("\"hello\"", json); + next.close(); + + Response sendResponse = base.path(MockEventServer.INVOCATION).path(requestId).path("response") + .request().post(Entity.json("\"good day\"")); + Assertions.assertEquals(204, sendResponse.getStatus()); + sendResponse.close(); + + Response lambdaResponse = lambdaInvoke.get(); + Assertions.assertEquals(200, lambdaResponse.getStatus()); + Assertions.assertEquals("\"good day\"", lambdaResponse.readEntity(String.class)); + lambdaResponse.close(); + } +} diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle index a003f1174cfd5a..0609366f7346e9 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/build.gradle @@ -10,10 +10,8 @@ repositories { dependencies { implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}") - implementation 'io.quarkus:quarkus-resteasy' implementation 'io.quarkus:quarkus-amazon-lambda' - testImplementation "io.quarkus:quarkus-test-amazon-lambda" testImplementation 'io.quarkus:quarkus-junit5' testImplementation 'io.rest-assured:rest-assured' } diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml index b617576bb157ab..732ec60ca31e72 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml @@ -36,8 +36,8 @@ quarkus-amazon-lambda - io.quarkus - quarkus-test-amazon-lambda + io.rest-assured + rest-assured test diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java index 4f89d941f2b53b..69dc8f5452ba7c 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/java/LambdaHandlerTest.java @@ -1,22 +1,31 @@ package ${package}; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import io.quarkus.amazon.lambda.test.LambdaClient; import io.quarkus.test.junit.QuarkusTest; +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.containsString; + @QuarkusTest public class LambdaHandlerTest { @Test public void testSimpleLambdaSuccess() throws Exception { - InputObject in = new InputObject(); - in.setGreeting("Hello"); + // you test your lambas by invoking on http://localhost:8081 + // this works in dev mode too + + Person in = new Person(); in.setName("Stu"); - OutputObject out = LambdaClient.invoke(OutputObject.class, in); - Assertions.assertEquals("Hello Stu", out.getResult()); - Assertions.assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-'"); + given() + .contentType("application/json") + .accept("application/json") + .body(in) + .when() + .post() + .then() + .statusCode(200) + .body(containsString("Hello Stu")); } } diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties index 7c37ee7b060a83..6be7ba734f7956 100644 --- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties +++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/src/test/resources/application.properties @@ -1,5 +1,2 @@ quarkus.lambda.handler=test -quarkus.lambda.enable-polling-jvm-mode=true - - diff --git a/extensions/amazon-lambda/pom.xml b/extensions/amazon-lambda/pom.xml index 71ccac1880aee3..ee3640b9fbf348 100644 --- a/extensions/amazon-lambda/pom.xml +++ b/extensions/amazon-lambda/pom.xml @@ -17,6 +17,7 @@ common-runtime + event-server common-deployment runtime deployment diff --git a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml index c19be1cae40cb5..495288d1d6b539 100644 --- a/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-lambda/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,7 +8,7 @@ metadata: categories: - "cloud" guide: "https://quarkus.io/guides/amazon-lambda" - status: "preview" + status: "stable" codestart: name: "amazon-lambda" kind: "example" diff --git a/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 4ea5a1d78f630b..86c58a06796c58 100644 --- a/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/common/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,5 +8,5 @@ metadata: - "amazon" categories: - "data" - status: "preview" + status: "stable" unlisted: true \ No newline at end of file diff --git a/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index ace051cb576d94..597bec9e4fb7bc 100644 --- a/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/dynamodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,6 +10,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-dynamodb" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.dynamodb." diff --git a/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 5eb16f520dd059..0046f605a490ea 100644 --- a/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/iam/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-iam" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.iam." diff --git a/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml index c7cb65aa89ff8a..e6bc35fc57f554 100644 --- a/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/kms/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-kms" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.kms." diff --git a/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml index ed8bc6d64adc54..cfff54043b1190 100644 --- a/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/s3/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-s3" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.s3." diff --git a/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 7133851af1215a..7b8c825793fe74 100644 --- a/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/ses/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-ses" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.ses." diff --git a/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 87cab1d1233cfe..5df4b079013f87 100644 --- a/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/sns/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-sns" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.sns." diff --git a/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 58366e56f9dc92..35623c807f85bb 100644 --- a/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/sqs/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-sqs" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.sqs." diff --git a/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b3024a2dfb0878..ec7c7fbba307c1 100644 --- a/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/amazon-services/ssm/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -9,6 +9,6 @@ metadata: guide: "https://quarkus.io/guides/amazon-ssm" categories: - "data" - status: "preview" + status: "stable" config: - "quarkus.ssm." diff --git a/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java b/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java index 1147572ecc9bf9..b644e4a860a0a7 100644 --- a/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java +++ b/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java @@ -20,7 +20,10 @@ import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem; import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.console.ConsoleInstalledBuildItem; +import io.quarkus.deployment.console.StartupLogCompressor; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; +import io.quarkus.deployment.logging.LoggingSetupBuildItem; import io.quarkus.devservices.common.ContainerLocator; import io.quarkus.runtime.LaunchMode; import io.quarkus.runtime.configuration.ConfigUtils; @@ -57,7 +60,9 @@ public class DevServicesApicurioRegistryProcessor { public void startApicurioRegistryDevService(LaunchModeBuildItem launchMode, ApicurioRegistryDevServicesBuildTimeConfig apicurioRegistryDevServices, Optional devServicesSharedNetworkBuildItem, - BuildProducer devServicesConfiguration) { + BuildProducer devServicesConfiguration, + Optional consoleInstalledBuildItem, + LoggingSetupBuildItem loggingSetupBuildItem) { ApicurioRegistryDevServiceCfg configuration = getConfiguration(apicurioRegistryDevServices); @@ -69,11 +74,20 @@ public void startApicurioRegistryDevService(LaunchModeBuildItem launchMode, shutdownApicurioRegistry(); cfg = null; } - - ApicurioRegistry apicurioRegistry = startApicurioRegistry(configuration, launchMode, - devServicesSharedNetworkBuildItem.isPresent()); - if (apicurioRegistry == null) { - return; + ApicurioRegistry apicurioRegistry; + StartupLogCompressor compressor = new StartupLogCompressor( + (launchMode.isTest() ? "(test) " : "") + "Apicurio Registry Dev Services Starting:", + consoleInstalledBuildItem, loggingSetupBuildItem); + try { + apicurioRegistry = startApicurioRegistry(configuration, launchMode, + devServicesSharedNetworkBuildItem.isPresent()); + if (apicurioRegistry == null) { + return; + } + compressor.close(); + } catch (Throwable t) { + compressor.closeAndDumpCaptured(); + throw new RuntimeException(t); } cfg = configuration; diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java new file mode 100644 index 00000000000000..26aabbf1797463 --- /dev/null +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchivePredicateBuildItem.java @@ -0,0 +1,25 @@ +package io.quarkus.arc.deployment; + +import java.util.function.Predicate; + +import io.quarkus.builder.item.MultiBuildItem; +import io.quarkus.deployment.ApplicationArchive; + +/** + * + * By default, only explict/implicit bean archives (as defined by the spec) are considered during the bean discovery. However, + * extensions can register a logic to identify additional bean archives. + */ +public final class BeanArchivePredicateBuildItem extends MultiBuildItem { + + private final Predicate predicate; + + public BeanArchivePredicateBuildItem(Predicate predicate) { + this.predicate = predicate; + } + + public Predicate getPredicate() { + return predicate; + } + +} diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java index 2bb662fd5a7b04..8133de96db552a 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java @@ -1,6 +1,11 @@ package io.quarkus.arc.deployment; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.stream.Collectors; import org.jboss.jandex.AnnotationInstance; @@ -35,12 +40,13 @@ public BeanArchiveIndexBuildItem build(ArcConfig config, ApplicationArchivesBuil List additionalBeanDefiningAnnotations, List additionalBeans, List generatedBeans, LiveReloadBuildItem liveReloadBuildItem, BuildProducer generatedClass, - CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems) + CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems, + List beanArchivePredicates) throws Exception { // First build an index from application archives IndexView applicationIndex = buildApplicationIndex(config, applicationArchivesBuildItem, - additionalBeanDefiningAnnotations, customScopes, excludeDependencyBuildItems); + additionalBeanDefiningAnnotations, customScopes, excludeDependencyBuildItems, beanArchivePredicates); // Then build additional index for beans added by extensions Indexer additionalBeanIndexer = new Indexer(); @@ -81,7 +87,8 @@ public BeanArchiveIndexBuildItem build(ArcConfig config, ApplicationArchivesBuil private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBuildItem applicationArchivesBuildItem, List additionalBeanDefiningAnnotations, - CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems) { + CustomScopeAnnotationsBuildItem customScopes, List excludeDependencyBuildItems, + List beanArchivePredicates) { Set archives = applicationArchivesBuildItem.getAllApplicationArchives(); @@ -116,10 +123,8 @@ private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBui continue; } IndexView index = archive.getIndex(); - // NOTE: Implicit bean archive without beans.xml contains one or more bean classes with a bean defining annotation and no extension - if (archive.getChildPath("META-INF/beans.xml") != null || archive.getChildPath("WEB-INF/beans.xml") != null - || (index.getAllKnownImplementors(DotNames.EXTENSION).isEmpty() - && containsBeanDefiningAnnotation(index, beanDefiningAnnotations))) { + if (isExplicitBeanArchive(archive) || isImplicitBeanArchive(index, beanDefiningAnnotations) + || isAdditionalBeanArchive(archive, beanArchivePredicates)) { indexes.add(index); } } @@ -127,6 +132,26 @@ && containsBeanDefiningAnnotation(index, beanDefiningAnnotations))) { return CompositeIndex.create(indexes); } + private boolean isExplicitBeanArchive(ApplicationArchive archive) { + return archive.getChildPath("META-INF/beans.xml") != null || archive.getChildPath("WEB-INF/beans.xml") != null; + } + + private boolean isImplicitBeanArchive(IndexView index, Set beanDefiningAnnotations) { + // NOTE: Implicit bean archive without beans.xml contains one or more bean classes with a bean defining annotation and no extension + return index.getAllKnownImplementors(DotNames.EXTENSION).isEmpty() + && containsBeanDefiningAnnotation(index, beanDefiningAnnotations); + } + + private boolean isAdditionalBeanArchive(ApplicationArchive archive, + List beanArchivePredicates) { + for (BeanArchivePredicateBuildItem p : beanArchivePredicates) { + if (p.getPredicate().test(archive)) { + return true; + } + } + return false; + } + private boolean isApplicationArchiveExcluded(ArcConfig config, List excludeDependencyBuildItems, ApplicationArchive archive) { if (archive.getArtifactKey() != null) { diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java index ee60809ab577f7..a0d855f1ce38ff 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java @@ -1,12 +1,17 @@ package io.quarkus.arc.deployment; +import static io.quarkus.arc.deployment.ConfigClassBuildItem.Type.MAPPING; +import static io.quarkus.arc.deployment.ConfigClassBuildItem.Type.PROPERTIES; import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; -import static io.quarkus.deployment.configuration.ConfigMappingUtils.CONFIG_MAPPING_NAME; import static io.smallrye.config.ConfigMappings.ConfigClassWithPrefix.configClassWithPrefix; +import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; +import static org.eclipse.microprofile.config.inject.ConfigProperties.UNCONFIGURED_PREFIX; import static org.jboss.jandex.AnnotationInstance.create; import static org.jboss.jandex.AnnotationTarget.Kind.CLASS; +import static org.jboss.jandex.AnnotationTarget.Kind.FIELD; +import static org.jboss.jandex.AnnotationTarget.Kind.METHOD_PARAMETER; import static org.jboss.jandex.AnnotationValue.createStringValue; import java.util.ArrayList; @@ -14,6 +19,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Stream; @@ -25,8 +31,10 @@ import org.eclipse.microprofile.config.inject.ConfigProperties; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.ClassType; import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; import org.jboss.jandex.IndexView; @@ -46,15 +54,16 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ConfigClassBuildItem; import io.quarkus.deployment.builditem.ConfigurationBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.configuration.ConfigMappingUtils; import io.quarkus.deployment.configuration.definition.RootDefinition; import io.quarkus.deployment.recording.RecorderContext; import io.quarkus.gizmo.ResultHandle; import io.quarkus.runtime.annotations.ConfigPhase; +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.ConfigMappingLoader; +import io.smallrye.config.ConfigMappingMetadata; import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.inject.ConfigProducer; @@ -66,6 +75,7 @@ public class ConfigBuildStep { private static final DotName MP_CONFIG_PROPERTIES_NAME = DotName.createSimple(ConfigProperties.class.getName()); private static final DotName MP_CONFIG_VALUE_NAME = DotName.createSimple(ConfigValue.class.getName()); + private static final DotName CONFIG_MAPPING_NAME = DotName.createSimple(ConfigMapping.class.getName()); private static final DotName MAP_NAME = DotName.createSimple(Map.class.getName()); private static final DotName SET_NAME = DotName.createSimple(Set.class.getName()); private static final DotName LIST_NAME = DotName.createSimple(List.class.getName()); @@ -242,11 +252,79 @@ void generateConfigClasses( BuildProducer reflectiveClasses, BuildProducer configClasses) { - // TODO - Generation of Mapping interface classes can be done in core because they don't require CDI - ConfigMappingUtils.generateConfigClasses(combinedIndex, generatedClasses, reflectiveClasses, configClasses, - CONFIG_MAPPING_NAME); - ConfigMappingUtils.generateConfigClasses(combinedIndex, generatedClasses, reflectiveClasses, configClasses, - MP_CONFIG_PROPERTIES_NAME); + List mappingAnnotations = new ArrayList<>(); + mappingAnnotations.addAll(combinedIndex.getIndex().getAnnotations(CONFIG_MAPPING_NAME)); + mappingAnnotations.addAll(combinedIndex.getIndex().getAnnotations(MP_CONFIG_PROPERTIES_NAME)); + + for (AnnotationInstance instance : mappingAnnotations) { + AnnotationTarget target = instance.target(); + AnnotationValue annotationPrefix = instance.value("prefix"); + + if (target.kind().equals(FIELD)) { + if (annotationPrefix != null && !annotationPrefix.asString().equals(UNCONFIGURED_PREFIX)) { + configClasses.produce( + toConfigClassBuildItem(instance, toClass(target.asField().type().name()), + annotationPrefix.asString())); + continue; + } + } + + if (target.kind().equals(METHOD_PARAMETER)) { + if (annotationPrefix != null && !annotationPrefix.asString().equals(UNCONFIGURED_PREFIX)) { + ClassType classType = target.asMethodParameter().method().parameters() + .get(target.asMethodParameter().position()).asClassType(); + configClasses + .produce(toConfigClassBuildItem(instance, toClass(classType.name()), annotationPrefix.asString())); + continue; + } + } + + if (!target.kind().equals(CLASS)) { + continue; + } + + Class configClass = toClass(target.asClass().name()); + String prefix = Optional.ofNullable(annotationPrefix).map(AnnotationValue::asString).orElse(""); + + List configMappingsMetadata = ConfigMappingLoader.getConfigMappingsMetadata(configClass); + Set generatedClassesNames = new HashSet<>(); + Set mappingsInfo = new HashSet<>(); + configMappingsMetadata.forEach(mappingMetadata -> { + generatedClasses.produce( + new GeneratedClassBuildItem(true, mappingMetadata.getClassName(), mappingMetadata.getClassBytes())); + reflectiveClasses + .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getInterfaceType()).methods(true).build()); + reflectiveClasses + .produce(ReflectiveClassBuildItem.builder(mappingMetadata.getClassName()).constructors(true).build()); + + for (Class parent : getHierarchy(mappingMetadata.getInterfaceType())) { + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(parent).methods(true).build()); + } + + generatedClassesNames.add(mappingMetadata.getClassName()); + + ClassInfo mappingInfo = combinedIndex.getIndex() + .getClassByName(DotName.createSimple(mappingMetadata.getInterfaceType().getName())); + if (mappingInfo != null) { + mappingsInfo.add(mappingInfo); + } + }); + + // Search and register possible classes for implicit Converter methods + for (ClassInfo classInfo : mappingsInfo) { + for (MethodInfo method : classInfo.methods()) { + if (!isHandledByProducers(method.returnType()) && + mappingsInfo.stream() + .map(ClassInfo::name) + .noneMatch(name -> name.equals(method.returnType().name()))) { + reflectiveClasses + .produce(new ReflectiveClassBuildItem(true, false, method.returnType().name().toString())); + } + } + } + + configClasses.produce(toConfigClassBuildItem(instance, configClass, generatedClassesNames, prefix)); + } } @BuildStep @@ -327,6 +405,12 @@ void registerConfigClasses( configClassWithPrefix -> Stream.of(configClassWithPrefix.getKlass(), configClassWithPrefix.getPrefix()) .collect(toList())); + recorder.registerConfigMappings( + configClasses.stream() + .filter(ConfigClassBuildItem::isMapping) + .map(configMapping -> configClassWithPrefix(configMapping.getConfigClass(), configMapping.getPrefix())) + .collect(toSet())); + recorder.registerConfigProperties( configClasses.stream() .filter(ConfigClassBuildItem::isProperties) @@ -335,6 +419,45 @@ void registerConfigClasses( .collect(toSet())); } + private static Class toClass(DotName dotName) { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + try { + return classLoader.loadClass(dotName.toString()); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("The class (" + dotName.toString() + ") cannot be created during deployment.", e); + } + } + + private static ConfigClassBuildItem toConfigClassBuildItem( + AnnotationInstance instance, + Class configClass, + String prefix) { + return toConfigClassBuildItem(instance, configClass, emptySet(), prefix); + } + + private static ConfigClassBuildItem toConfigClassBuildItem( + AnnotationInstance instance, + Class configClass, + Set generatedClasses, + String prefix) { + if (instance.name().equals(CONFIG_MAPPING_NAME)) { + return new ConfigClassBuildItem(configClass, generatedClasses, prefix, MAPPING); + } else if (instance.name().equals(MP_CONFIG_PROPERTIES_NAME)) { + return new ConfigClassBuildItem(configClass, generatedClasses, prefix, PROPERTIES); + } else { + throw new IllegalArgumentException(); + } + } + + private static List> getHierarchy(Class mapping) { + List> interfaces = new ArrayList<>(); + for (Class i : mapping.getInterfaces()) { + interfaces.add(i); + interfaces.addAll(getHierarchy(i)); + } + return interfaces; + } + private String getPropertyName(String name, ClassInfo declaringClass) { StringBuilder builder = new StringBuilder(); if (declaringClass.enclosingClass() == null) { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigClassBuildItem.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigClassBuildItem.java similarity index 94% rename from core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigClassBuildItem.java rename to extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigClassBuildItem.java index fb3e80e17225e2..1d011ddbe5824d 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/ConfigClassBuildItem.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigClassBuildItem.java @@ -1,4 +1,4 @@ -package io.quarkus.deployment.builditem; +package io.quarkus.arc.deployment; import java.util.Set; @@ -48,6 +48,6 @@ public boolean isProperties() { public enum Type { MAPPING, - PROPERTIES + PROPERTIES; } } diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java index 7c19fb0eba2f2e..019633add73fb9 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigMappingTest.java @@ -39,6 +39,7 @@ public class ConfigMappingTest { static final QuarkusUnitTest TEST = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addAsResource(new StringAsset("config.my.prop=1234\n" + + "config.override.my.prop=5678\n" + "group.host=localhost\n" + "group.port=8080\n" + "types.int=9\n" + @@ -354,15 +355,22 @@ void hierarchy() { @Dependent public static class ConstructorInjection { private String myProp; + private String overrideProp; @Inject - public ConstructorInjection(@ConfigMapping(prefix = "config") MyConfigMapping myConfigMapping) { + public ConstructorInjection(@ConfigMapping(prefix = "config") MyConfigMapping myConfigMapping, + @ConfigMapping(prefix = "config.override") MyConfigMapping override) { this.myProp = myConfigMapping.myProp(); + this.overrideProp = override.myProp(); } public String getMyProp() { return myProp; } + + public String getOverrideProp() { + return overrideProp; + } } @Inject @@ -371,5 +379,6 @@ public String getMyProp() { @Test void constructorInjection() { assertEquals("1234", constructorInjection.getMyProp()); + assertEquals("5678", constructorInjection.getOverrideProp()); } } diff --git a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java index e2afb940d65e58..dba24339b49038 100644 --- a/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java +++ b/extensions/container-image/container-image-docker/deployment/src/main/java/io/quarkus/container/image/docker/deployment/DockerProcessor.java @@ -136,7 +136,7 @@ private String createContainerImage(ContainerImageConfig containerImageConfig, D PackageConfig packageConfig) { DockerfilePaths dockerfilePaths = getDockerfilePaths(dockerConfig, forNative, packageConfig, out); - String[] dockerArgs = getDockerArgs(containerImageInfo.getImage(), dockerfilePaths, dockerConfig); + String[] dockerArgs = getDockerArgs(containerImageInfo.getImage(), dockerfilePaths, containerImageConfig, dockerConfig); log.infof("Executing the following command to build docker image: '%s %s'", dockerConfig.executableName, String.join(" ", dockerArgs)); boolean buildSuccessful = ExecUtil.exec(out.getOutputDirectory().toFile(), reader, dockerConfig.executableName, @@ -178,12 +178,16 @@ private String createContainerImage(ContainerImageConfig containerImageConfig, D return containerImageInfo.getImage(); } - private String[] getDockerArgs(String image, DockerfilePaths dockerfilePaths, DockerConfig dockerConfig) { + private String[] getDockerArgs(String image, DockerfilePaths dockerfilePaths, ContainerImageConfig containerImageConfig, + DockerConfig dockerConfig) { List dockerArgs = new ArrayList<>(6 + dockerConfig.buildArgs.size()); dockerArgs.addAll(Arrays.asList("build", "-f", dockerfilePaths.getDockerfilePath().toAbsolutePath().toString())); for (Map.Entry entry : dockerConfig.buildArgs.entrySet()) { dockerArgs.addAll(Arrays.asList("--build-arg", entry.getKey() + "=" + entry.getValue())); } + for (Map.Entry entry : containerImageConfig.labels.entrySet()) { + dockerArgs.addAll(Arrays.asList("--label", String.format("%s=%s", entry.getKey(), entry.getValue()))); + } if (dockerConfig.cacheFrom.isPresent()) { List cacheFrom = dockerConfig.cacheFrom.get(); if (!cacheFrom.isEmpty()) { diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java index c1d476e7e52d99..f8f74492a59795 100644 --- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java +++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibConfig.java @@ -85,8 +85,11 @@ public class JibConfig { /** * Custom labels to add to the generated image + * + * @deprecated Use 'quarkus.container-image.labels' instead */ @ConfigItem + @Deprecated public Map labels; /** diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java index 83e01cdd95028e..910bc79d776cca 100644 --- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java +++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java @@ -119,10 +119,11 @@ public void buildFromJar(ContainerImageConfig containerImageConfig, JibConfig ji JibContainerBuilder jibContainerBuilder; String packageType = packageConfig.type; if (packageConfig.isLegacyJar() || packageType.equalsIgnoreCase(PackageConfig.UBER_JAR)) { - jibContainerBuilder = createContainerBuilderFromLegacyJar(jibConfig, + jibContainerBuilder = createContainerBuilderFromLegacyJar(jibConfig, containerImageConfig, sourceJar, outputTarget, mainClass, containerImageLabels); } else if (packageConfig.isFastJar()) { - jibContainerBuilder = createContainerBuilderFromFastJar(jibConfig, sourceJar, curateOutcome, containerImageLabels, + jibContainerBuilder = createContainerBuilderFromFastJar(jibConfig, containerImageConfig, sourceJar, curateOutcome, + containerImageLabels, appCDSResult); } else { throw new IllegalArgumentException( @@ -161,7 +162,7 @@ public void buildFromNative(ContainerImageConfig containerImageConfig, JibConfig "The native binary produced by the build is not a Linux binary and therefore cannot be used in a Linux container image. Consider adding \"quarkus.native.container-build=true\" to your configuration"); } - JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(containerImageConfig, jibConfig, + JibContainerBuilder jibContainerBuilder = createContainerBuilderFromNative(jibConfig, containerImageConfig, nativeImage, containerImageLabels); setUser(jibConfig, jibContainerBuilder); setPlatforms(jibConfig, jibContainerBuilder); @@ -280,6 +281,7 @@ private Logger.Level toJBossLoggingLevel(LogEvent.Level level) { * */ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfig, + ContainerImageConfig containerImageConfig, JarBuildItem sourceJarBuildItem, CurateOutcomeBuildItem curateOutcome, List containerImageLabels, Optional appCDSResult) { @@ -427,7 +429,7 @@ private JibContainerBuilder createContainerBuilderFromFastJar(JibConfig jibConfi .setWorkingDirectory(workDirInContainer) .setEntrypoint(entrypoint) .setEnvironment(getEnvironmentVariables(jibConfig)) - .setLabels(allLabels(jibConfig, containerImageLabels)) + .setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels)) .setCreationTime(Instant.now()); for (int port : jibConfig.ports) { jibContainerBuilder.addExposedPort(Port.tcp(port)); @@ -468,6 +470,7 @@ private void setPlatforms(JibConfig jibConfig, JibContainerBuilder jibContainerB } private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibConfig, + ContainerImageConfig containerImageConfig, JarBuildItem sourceJarBuildItem, OutputTargetBuildItem outputTargetBuildItem, MainClassBuildItem mainClassBuildItem, @@ -502,7 +505,7 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon JibContainerBuilder jibContainerBuilder = javaContainerBuilder.toContainerBuilder() .setEnvironment(getEnvironmentVariables(jibConfig)) - .setLabels(allLabels(jibConfig, containerImageLabels)) + .setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels)) .setCreationTime(Instant.now()); if (jibConfig.jvmEntrypoint.isPresent()) { @@ -517,7 +520,7 @@ private JibContainerBuilder createContainerBuilderFromLegacyJar(JibConfig jibCon } } - private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfig containerImageConfig, JibConfig jibConfig, + private JibContainerBuilder createContainerBuilderFromNative(JibConfig jibConfig, ContainerImageConfig containerImageConfig, NativeImageBuildItem nativeImageBuildItem, List containerImageLabels) { List entrypoint; @@ -532,8 +535,8 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi try { AbsoluteUnixPath workDirInContainer = AbsoluteUnixPath.get("/work"); JibContainerBuilder jibContainerBuilder = Jib - .from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), containerImageConfig.username, - containerImageConfig.password)) + .from(toRegistryImage(ImageReference.parse(jibConfig.baseNativeImage), jibConfig.baseRegistryUsername, + jibConfig.baseRegistryPassword)) .addFileEntriesLayer(FileEntriesLayer.builder() .addEntry(nativeImageBuildItem.getPath(), workDirInContainer.resolve(BINARY_NAME_IN_CONTAINER), FilePermissions.fromOctalString("775")) @@ -541,7 +544,7 @@ private JibContainerBuilder createContainerBuilderFromNative(ContainerImageConfi .setWorkingDirectory(workDirInContainer) .setEntrypoint(entrypoint) .setEnvironment(getEnvironmentVariables(jibConfig)) - .setLabels(allLabels(jibConfig, containerImageLabels)) + .setLabels(allLabels(jibConfig, containerImageConfig, containerImageLabels)) .setCreationTime(Instant.now()); for (int port : jibConfig.ports) { jibContainerBuilder.addExposedPort(Port.tcp(port)); @@ -604,12 +607,14 @@ private void handleExtraFiles(OutputTargetBuildItem outputTarget, JibContainerBu } } - private Map allLabels(JibConfig jibConfig, List containerImageLabels) { + private Map allLabels(JibConfig jibConfig, ContainerImageConfig containerImageConfig, + List containerImageLabels) { if (jibConfig.labels.isEmpty() && containerImageLabels.isEmpty()) { return Collections.emptyMap(); } final Map allLabels = new HashMap<>(jibConfig.labels); + allLabels.putAll(containerImageConfig.labels); for (ContainerImageLabelBuildItem containerImageLabel : containerImageLabels) { // we want the user supplied labels to take precedence so the user can override labels generated from other extensions if desired allLabels.putIfAbsent(containerImageLabel.getName(), containerImageLabel.getValue()); diff --git a/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 5f6b78609781c9..9c1ee15c7c8bb0 100644 --- a/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/container-image/container-image-openshift/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,4 +8,4 @@ metadata: - "image" categories: - "cloud" - status: "preview" \ No newline at end of file + status: "stable" diff --git a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java index 87547b9f92a7b8..986326cfe50c79 100644 --- a/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java +++ b/extensions/container-image/deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java @@ -1,10 +1,13 @@ package io.quarkus.container.image.deployment; import java.util.List; +import java.util.Map; import java.util.Optional; import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigRoot; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigRoot public class ContainerImageConfig { @@ -13,12 +16,14 @@ public class ContainerImageConfig { * The group the container image will be part of */ @ConfigItem(defaultValue = "${user.name}") + @ConvertWith(TrimmedStringConverter.class) public Optional group; /** * The name of the container image. If not set defaults to the application name */ @ConfigItem(defaultValue = "${quarkus.application.name:unset}") + @ConvertWith(TrimmedStringConverter.class) public Optional name; /** @@ -33,6 +38,12 @@ public class ContainerImageConfig { @ConfigItem public Optional> additionalTags; + /** + * Custom labels to add to the generated image. + */ + @ConfigItem + public Map labels; + /** * The container registry to use */ @@ -95,6 +106,9 @@ public Optional getEffectiveGroup() { if (group.isPresent()) { String originalGroup = group.get(); if (originalGroup.equals(System.getProperty("user.name"))) { + if (originalGroup.isEmpty()) { + return Optional.empty(); + } return Optional.of(originalGroup.toLowerCase().replace(' ', '-')); } } diff --git a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java index 0881c79369314e..537dbbec2327c1 100644 --- a/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java +++ b/extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java @@ -27,7 +27,10 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.console.ConsoleInstalledBuildItem; +import io.quarkus.deployment.console.StartupLogCompressor; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; +import io.quarkus.deployment.logging.LoggingSetupBuildItem; import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; import io.quarkus.runtime.LaunchMode; @@ -50,7 +53,9 @@ DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem cura DataSourcesBuildTimeConfig dataSourceBuildTimeConfig, LaunchModeBuildItem launchMode, List configurationHandlerBuildItems, - BuildProducer devServicesResultBuildItemBuildProducer) { + BuildProducer devServicesResultBuildItemBuildProducer, + Optional consoleInstalledBuildItem, + LoggingSetupBuildItem loggingSetupBuildItem) { //figure out if we need to shut down and restart existing databases //if not and the DB's have already started we just return if (databases != null) { @@ -111,60 +116,70 @@ DevServicesDatasourceResultBuildItem launchDatabases(CurateOutcomeBuildItem cura Map devDBProviderMap = devDBProviders.stream() .collect(Collectors.toMap(DevServicesDatasourceProviderBuildItem::getDatabase, DevServicesDatasourceProviderBuildItem::getDevServicesProvider)); - - defaultResult = startDevDb(null, curateOutcomeBuildItem, installedDrivers, - !dataSourceBuildTimeConfig.namedDataSources.isEmpty(), - devDBProviderMap, - dataSourceBuildTimeConfig.defaultDataSource, - configHandlersByDbType, propertiesMap, closeableList, launchMode.getLaunchMode()); - List dbConfig = new ArrayList<>(); - if (defaultResult != null) { - for (Map.Entry i : defaultResult.getConfigProperties().entrySet()) { - dbConfig.add(new DevServicesConfigResultBuildItem(i.getKey(), i.getValue())); - } - } - for (Map.Entry entry : dataSourceBuildTimeConfig.namedDataSources.entrySet()) { - DevServicesDatasourceResultBuildItem.DbResult result = startDevDb(entry.getKey(), curateOutcomeBuildItem, - installedDrivers, true, - devDBProviderMap, entry.getValue(), configHandlersByDbType, propertiesMap, closeableList, - launchMode.getLaunchMode()); - if (result != null) { - namedResults.put(entry.getKey(), result); - for (Map.Entry i : result.getConfigProperties().entrySet()) { + StartupLogCompressor compressor = new StartupLogCompressor( + (launchMode.isTest() ? "(test) " : "") + "Database Starting:", + consoleInstalledBuildItem, + loggingSetupBuildItem); + try { + defaultResult = startDevDb(null, curateOutcomeBuildItem, installedDrivers, + !dataSourceBuildTimeConfig.namedDataSources.isEmpty(), + devDBProviderMap, + dataSourceBuildTimeConfig.defaultDataSource, + configHandlersByDbType, propertiesMap, closeableList, launchMode.getLaunchMode()); + List dbConfig = new ArrayList<>(); + if (defaultResult != null) { + for (Map.Entry i : defaultResult.getConfigProperties().entrySet()) { dbConfig.add(new DevServicesConfigResultBuildItem(i.getKey(), i.getValue())); } } - } - for (DevServicesConfigResultBuildItem i : dbConfig) { - devServicesResultBuildItemBuildProducer - .produce(i); - } + for (Map.Entry entry : dataSourceBuildTimeConfig.namedDataSources.entrySet()) { + DevServicesDatasourceResultBuildItem.DbResult result = startDevDb(entry.getKey(), curateOutcomeBuildItem, + installedDrivers, true, + devDBProviderMap, entry.getValue(), configHandlersByDbType, propertiesMap, closeableList, + launchMode.getLaunchMode()); + if (result != null) { + namedResults.put(entry.getKey(), result); + for (Map.Entry i : result.getConfigProperties().entrySet()) { + dbConfig.add(new DevServicesConfigResultBuildItem(i.getKey(), i.getValue())); + } + } + } + for (DevServicesConfigResultBuildItem i : dbConfig) { + devServicesResultBuildItemBuildProducer + .produce(i); + } - if (first) { - first = false; - Runnable closeTask = new Runnable() { - @Override - public void run() { - if (databases != null) { - for (Closeable i : databases) { - try { - i.close(); - } catch (Throwable t) { - log.error("Failed to stop database", t); + if (first) { + first = false; + Runnable closeTask = new Runnable() { + @Override + public void run() { + if (databases != null) { + for (Closeable i : databases) { + try { + i.close(); + } catch (Throwable t) { + log.error("Failed to stop database", t); + } } } + first = true; + databases = null; + cachedProperties = null; } - first = true; - databases = null; - cachedProperties = null; - } - }; - QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); - ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + }; + QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); + ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + } + databases = closeableList; + cachedProperties = propertiesMap; + compressor.close(); + log.info("Dev Services for datasources started."); + return new DevServicesDatasourceResultBuildItem(defaultResult, namedResults); + } catch (Throwable t) { + compressor.closeAndDumpCaptured(); + throw new RuntimeException(t); } - databases = closeableList; - cachedProperties = propertiesMap; - return new DevServicesDatasourceResultBuildItem(defaultResult, namedResults); } private DevServicesDatasourceResultBuildItem.DbResult startDevDb(String dbName, diff --git a/extensions/elytron-security-jdbc/deployment/pom.xml b/extensions/elytron-security-jdbc/deployment/pom.xml index 0e71187e66be69..44c3c8f921931b 100644 --- a/extensions/elytron-security-jdbc/deployment/pom.xml +++ b/extensions/elytron-security-jdbc/deployment/pom.xml @@ -46,12 +46,6 @@ quarkus-resteasy-deployment test - - io.quarkus - quarkus-vertx-http-deployment - test-jar - test - io.quarkus quarkus-junit5-internal diff --git a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java index b55a8c75daf900..772ebd49aeecf4 100644 --- a/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java +++ b/extensions/elytron-security-jdbc/deployment/src/test/java/io/quarkus/elytron/security/jdbc/CustomRoleDecoderDevModeTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.deployment.util.FileUtil; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.restassured.RestAssured; //see https://github.com/quarkusio/quarkus/issues/9296 diff --git a/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java b/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java index f6b374d81e519b..82887800d171c2 100644 --- a/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java +++ b/extensions/funqy/funqy-amazon-lambda/deployment/src/main/java/io/quarkus/funqy/deployment/bindings/FunqyLambdaBuildStep.java @@ -7,7 +7,6 @@ import java.util.Optional; import io.quarkus.amazon.lambda.deployment.LambdaObjectMapperInitializedBuildItem; -import io.quarkus.amazon.lambda.runtime.LambdaBuildTimeConfig; import io.quarkus.arc.deployment.BeanContainerBuildItem; import io.quarkus.builder.item.SimpleBuildItem; import io.quarkus.deployment.annotations.BuildProducer; @@ -67,14 +66,13 @@ public void startPoolLoop(FunqyLambdaBindingRecorder recorder, @BuildStep @Record(RUNTIME_INIT) - public void enableNativeEventLoop(LambdaBuildTimeConfig config, - RuntimeComplete ignored, + public void startPoolLoopDevOrTest(RuntimeComplete ignored, FunqyLambdaBindingRecorder recorder, List orderServicesFirst, // force some ordering of recorders ShutdownContextBuildItem shutdownContextBuildItem, LaunchModeBuildItem launchModeBuildItem) { LaunchMode mode = launchModeBuildItem.getLaunchMode(); - if (config.enablePollingJvmMode && mode.isDevOrTest()) { + if (mode.isDevOrTest()) { recorder.startPollLoop(shutdownContextBuildItem); } } diff --git a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java index dab50d36a386ca..ec726faa57c9ff 100644 --- a/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java +++ b/extensions/grpc/deployment/src/main/java/io/quarkus/grpc/deployment/GrpcServerProcessor.java @@ -40,6 +40,7 @@ import io.grpc.internal.ServerImpl; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.arc.deployment.BeanArchivePredicateBuildItem; import io.quarkus.arc.deployment.CustomScopeAnnotationsBuildItem; import io.quarkus.arc.deployment.GeneratedBeanBuildItem; import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor; @@ -49,6 +50,7 @@ import io.quarkus.arc.processor.AnnotationsTransformer; import io.quarkus.arc.processor.BeanInfo; import io.quarkus.arc.processor.BuiltinScope; +import io.quarkus.deployment.ApplicationArchive; import io.quarkus.deployment.IsDevelopment; import io.quarkus.deployment.IsNormal; import io.quarkus.deployment.annotations.BuildProducer; @@ -546,6 +548,18 @@ void configureMetrics(GrpcBuildTimeConfig configuration, Optional() { + + @Override + public boolean test(ApplicationArchive archive) { + // Every archive that contains a generated implementor of MutinyBean is considered a bean archive + return !archive.getIndex().getKnownDirectImplementors(GrpcDotNames.MUTINY_BEAN).isEmpty(); + } + }); + } + private static class GrpcInterceptors { final Set globalInterceptors; final Set nonGlobalInterceptors; diff --git a/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml index ba8a04ffba04bc..2a2f8152e8fe75 100644 --- a/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/grpc/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -8,7 +8,7 @@ metadata: - "web" - "serialization" - "reactive" - status: "experimental" + status: "stable" codestart: name: "grpc" languages: diff --git a/extensions/hibernate-orm/deployment/pom.xml b/extensions/hibernate-orm/deployment/pom.xml index 75cea02da2efea..f1cd0a90c9730d 100644 --- a/extensions/hibernate-orm/deployment/pom.xml +++ b/extensions/hibernate-orm/deployment/pom.xml @@ -87,12 +87,6 @@ quarkus-smallrye-metrics-deployment test - - io.quarkus - quarkus-vertx-http-deployment - test - test-jar - org.awaitility awaitility diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java index 214456677d76fc..b51cb54fb66412 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java @@ -41,6 +41,7 @@ import javax.persistence.spi.PersistenceUnitTransactionType; import javax.transaction.TransactionManager; +import org.eclipse.microprofile.config.ConfigProvider; import org.hibernate.MultiTenancyStrategy; import org.hibernate.boot.archive.scan.spi.ClassDescriptor; import org.hibernate.boot.archive.scan.spi.PackageDescriptor; @@ -87,12 +88,14 @@ import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.DevServicesLauncherConfigResultBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; import io.quarkus.deployment.builditem.LiveReloadBuildItem; import io.quarkus.deployment.builditem.LogCategoryBuildItem; +import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem; import io.quarkus.deployment.builditem.ServiceStartBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem; @@ -177,6 +180,55 @@ void includeArchivesHostingEntityPackagesInIndex(HibernateOrmConfig hibernateOrm } } + @BuildStep + void devServicesAutoGenerateByDefault(DevServicesLauncherConfigResultBuildItem devServicesResult, + List schemaReadyBuildItems, + HibernateOrmConfig config, + BuildProducer runTimeConfigurationDefaultBuildItemBuildProducer) { + if (!schemaReadyBuildItems.isEmpty()) { + //we don't want to enable auto generation if somebody else is managing the schema + return; + } + String dsName; + if (config.defaultPersistenceUnit.datasource.isEmpty()) { + dsName = "quarkus.datasource.username"; + } else { + dsName = "quarkus.datasource." + config.defaultPersistenceUnit.datasource.get() + ".username"; + } + + if (ConfigProvider.getConfig().getOptionalValue(dsName, String.class).isEmpty()) { + if (devServicesResult.getConfig().containsKey(dsName)) { + if (ConfigProvider.getConfig().getOptionalValue("quarkus.hibernate-orm.database.generation", String.class) + .isEmpty()) { + LOG.info( + "Setting quarkus.hibernate-orm.database.generation=drop-and-create to initialize Dev Services managed database"); + runTimeConfigurationDefaultBuildItemBuildProducer.produce(new RunTimeConfigurationDefaultBuildItem( + "quarkus.hibernate-orm.database.generation", "drop-and-create")); + } + } + } + + for (Entry entry : config.persistenceUnits.entrySet()) { + + if (entry.getValue().datasource.isEmpty()) { + dsName = "quarkus.datasource.jdbc.url"; + } else { + dsName = "quarkus.datasource." + entry.getValue().datasource.get() + ".username"; + } + if (ConfigProvider.getConfig().getOptionalValue(dsName, String.class).isEmpty()) { + if (devServicesResult.getConfig().containsKey(dsName)) { + String propertyName = "quarkus.hibernate-orm." + entry.getKey() + ".database.generation"; + if (ConfigProvider.getConfig().getOptionalValue(propertyName, String.class).isEmpty()) { + LOG.info("Setting " + propertyName + "=drop-and-create to initialize Dev Services managed database"); + runTimeConfigurationDefaultBuildItemBuildProducer + .produce(new RunTimeConfigurationDefaultBuildItem(propertyName, "drop-and-create")); + } + } + } + } + + } + @BuildStep AdditionalIndexedClassesBuildItem addPersistenceUnitAnnotationToIndex() { return new AdditionalIndexedClassesBuildItem(ClassNames.QUARKUS_PERSISTENCE_UNIT.toString()); diff --git a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java index 64a86b95bfe2b1..52c1bb4fb2f018 100644 --- a/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java +++ b/extensions/hibernate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/HibernateHotReloadTestCase.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.test.ContinuousTestingTestUtils; +import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; -import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus; -import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils; import io.restassured.RestAssured; public class HibernateHotReloadTestCase { diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java index 3ca13e90a43542..3be50c5a488342 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java @@ -72,6 +72,9 @@ public static class HibernateOrmConfigPersistenceUnitDatabaseGeneration { * * `drop-and-create` is awesome in development mode. * + * This defaults to 'none', however if Dev Services is in use and no other extensions that manage the schema are present + * this will default to 'drop-and-create'. + * * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`. */ @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none") diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java index 2f16877db3326a..895182ae9e072c 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleInfoSupplier.java @@ -58,6 +58,12 @@ public static void pushPersistenceUnit(String persistenceUnitName, } } + public static void clearData() { + INSTANCE.persistenceUnits.clear(); + INSTANCE.createDDLs.clear(); + INSTANCE.dropDDLs.clear(); + } + private static String generateDDL(SchemaExport.Action action, Metadata metadata, ServiceRegistry serviceRegistry, String importFiles) { SchemaExport schemaExport = new SchemaExport(); diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java index 59bb961e01c2cf..a7dae284eb97fe 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/devconsole/HibernateOrmDevConsoleIntegrator.java @@ -21,6 +21,6 @@ public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactor @Override public void disintegrate(SessionFactoryImplementor sessionFactoryImplementor, SessionFactoryServiceRegistry sessionFactoryServiceRegistry) { - // Nothing to do + HibernateOrmDevConsoleInfoSupplier.clearData(); } } diff --git a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java index b854dcada8f552..aea65fd304db8d 100644 --- a/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java +++ b/extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java @@ -49,6 +49,7 @@ import io.quarkus.arc.deployment.AutoAddScopeBuildItem; import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; import io.quarkus.arc.deployment.BeanContainerListenerBuildItem; +import io.quarkus.arc.deployment.ConfigClassBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.arc.processor.BeanInfo; @@ -62,11 +63,11 @@ import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.ConfigClassBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; import io.quarkus.deployment.builditem.ShutdownContextBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveFieldBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem; import io.quarkus.deployment.logging.LogCleanupFilterBuildItem; @@ -349,9 +350,13 @@ NativeImageConfigBuildItem nativeImageConfig() { } @BuildStep - ExceptionMapperBuildItem mapper() { - return new ExceptionMapperBuildItem(ResteasyReactiveViolationExceptionMapper.class.getName(), - ValidationException.class.getName(), Priorities.USER + 1, true); + void exceptionMapper(BuildProducer exceptionMapperProducer, + BuildProducer reflectiveClassProducer) { + exceptionMapperProducer.produce(new ExceptionMapperBuildItem(ResteasyReactiveViolationExceptionMapper.class.getName(), + ValidationException.class.getName(), Priorities.USER + 1, true)); + reflectiveClassProducer.produce( + new ReflectiveClassBuildItem(true, true, ResteasyReactiveViolationExceptionMapper.ViolationReport.class, + ResteasyReactiveViolationExceptionMapper.ViolationReport.Violation.class)); } private static void contributeBuiltinConstraints(Set builtinConstraints, diff --git a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java index 38366401d34e95..9f4023f7186993 100644 --- a/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java +++ b/extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java @@ -18,6 +18,11 @@ public ResteasyReactiveContextLocaleResolver(HttpHeaders headers) { @Override protected HttpHeaders getHeaders() { - return headers; + try { + headers.getLength(); // this forces the creation of the actual object which will fail if there is no request in flight + return headers; + } catch (IllegalStateException e) { + return null; + } } } diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java new file mode 100644 index 00000000000000..3970870f72b534 --- /dev/null +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java @@ -0,0 +1,105 @@ +package io.quarkus.jdbc.oracle.deployment; + +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageAllowIncompleteClasspathBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; + +/** + * The Oracle JDBC driver includes a {@literal META-INF/native-image} which enables a set + * of global flags we need to control better, so to ensure such flags do not interfere + * with requirements of other libraries. + *

+ * For this reason, the {@literal META-INF/native-image/native-image.properties} resource + * is excluded explicitly; then we re-implement the equivalent directives using Quarkus + * build items. + *

+ * Other resources such as {@literal jni-config.json} and {@literal resource-config.json} + * are not excluded, so to ensure we match the recommendations from the Oracle JDBC + * engineering team and make it easier to pick up improvements in these when the driver + * gets updated. + *

+ * Regarding {@literal reflect-config.json}, we also prefer excluding it for the time + * being even though it's strictly not necessary: the reason is that the previous driver + * version had a build-breaking mistake; this was fixed in version 21.3 so should no + * longer be necessary, but the previous driver had been tested more widely and would + * require it, so this would facilitate the option to revert to the older version in + * case of problems. + */ +public final class OracleMetadataOverrides { + + static final String DRIVER_JAR_MATCH_REGEX = ".*com\\.oracle\\.database\\.jdbc.*"; + static final String NATIVE_IMAGE_RESOURCE_MATCH_REGEX = "/META-INF/native-image/(?:native-image\\.properties|reflect-config\\.json)"; + + /** + * Should match the contents of {@literal reflect-config.json} + * + * @param reflectiveClass builItem producer + */ + @BuildStep + void build(BuildProducer reflectiveClass) { + //This is to match the Oracle metadata (which we excluded so that we can apply fixes): + reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, "oracle.jdbc.internal.ACProxyable")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.T4CDriverExtension")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.T2CDriverExtension")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.ShardingDriverExtension")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.Ano")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.AuthenticationService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.DataIntegrityService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.EncryptionService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.net.ano.SupervisorService")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.jdbc.driver.Message11")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, true, "oracle.sql.TypeDescriptor")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.sql.TypeDescriptorFactory")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, false, "oracle.sql.AnyDataFactory")); + reflectiveClass + .produce(new ReflectiveClassBuildItem(true, false, false, "com.sun.rowset.providers.RIOptimisticProvider")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, "oracle.jdbc.logging.annotations.Supports")); + reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false, "oracle.jdbc.logging.annotations.Feature")); + } + + @BuildStep + void runtimeInitializeDriver(BuildProducer runtimeInitialized) { + //These re-implement all the "--initialize-at-build-time" arguments found in the native-image.properties : + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.OracleDriver")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleDriver")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("java.sql.DriverManager")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.LogicalConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.pool.OraclePooledConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.pool.OracleDataSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.datasource.impl.OracleDataSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.pool.OracleOCIConnectionPool")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleTimeoutThreadPerVM")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TimeoutInterruptHandler")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.HAManager")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.Clock")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer$LazyHolder")); + runtimeInitialized + .produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem( + "oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXADataSource")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.replay.OracleXADataSourceImpl")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.datasource.OracleXAConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXAConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXAHeteroConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.T4CXAConnection")); + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.security.o5logon.O5Logon")); + } + + @BuildStep + ExcludeConfigBuildItem excludeOracleDirectives() { + // Excludes both native-image.properties and reflect-config.json, which are reimplemented above + return new ExcludeConfigBuildItem(DRIVER_JAR_MATCH_REGEX, NATIVE_IMAGE_RESOURCE_MATCH_REGEX); + } + + @BuildStep + NativeImageAllowIncompleteClasspathBuildItem naughtyDriver() { + return new NativeImageAllowIncompleteClasspathBuildItem("quarkus-jdbc-oracle"); + } + +} diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java index 53854430001ff2..118a24d4c1fddb 100644 --- a/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java +++ b/extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleReflections.java @@ -3,7 +3,6 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; /** * Registers the {@code oracle.jdbc.driver.OracleDriver} so that it can be loaded @@ -24,22 +23,4 @@ void build(BuildProducer reflectiveClass) { reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, driverName)); } - @BuildStep - void runtimeInitializeDriver(BuildProducer runtimeInitialized) { - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleDriver")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.SQLUtil$XMLFactory")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.NamedTypeAccessor$XMLFactory")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.OracleTimeoutThreadPerVM")); - runtimeInitialized - .produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.T4CTTIoauthenticate")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TcpMultiplexer$LazyHolder")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.security.o5logon.O5Logon")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem( - "oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.TimeoutInterruptHandler")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.net.nt.Clock")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.NoSupportHAManager")); - runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.driver.LogicalConnection")); - } } diff --git a/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java b/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java new file mode 100644 index 00000000000000..5a66b4d51b26ab --- /dev/null +++ b/extensions/jdbc/jdbc-oracle/deployment/src/test/java/io/quarkus/jdbc/oracle/deployment/RegexMatchTest.java @@ -0,0 +1,45 @@ +package io.quarkus.jdbc.oracle.deployment; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.junit.jupiter.api.Test; + +import io.smallrye.common.constraint.Assert; + +/** + * The metadata override facility of GraalVM's native-image + * works with regular expressions. + * We're testing our expressions here to match against the + * constants the compiler is expecting (inferred by debugging + * the compiler) as it's otherwise a bit tricky to assert + * if they have been applied. + */ +public class RegexMatchTest { + + @Test + public void jarRegexIsMatching() { + final String EXAMPLE_CLASSPATH = "/home/sanne/sources/quarkus/integration-tests/jpa-oracle/target/quarkus-integration-test-jpa-oracle-999-SNAPSHOT-native-image-source-jar/lib/com.oracle.database.jdbc.ojdbc11-21.3.0.0.jar"; + final Pattern pattern = Pattern.compile(OracleMetadataOverrides.DRIVER_JAR_MATCH_REGEX); + final Matcher matcher = pattern.matcher(EXAMPLE_CLASSPATH); + Assert.assertTrue(matcher.find()); + } + + @Test + public void resourceRegexIsMatching() { + //We need to exclude both of these: + final String RES1 = "/META-INF/native-image/native-image.properties"; + final String RES2 = "/META-INF/native-image/reflect-config.json"; + final Pattern pattern = Pattern.compile(OracleMetadataOverrides.NATIVE_IMAGE_RESOURCE_MATCH_REGEX); + + Assert.assertTrue(pattern.matcher(RES1).find()); + Assert.assertTrue(pattern.matcher(RES2).find()); + + //While this one should NOT be ignored: + final String RES3 = "/META-INF/native-image/resource-config.json"; + final String RES4 = "/META-INF/native-image/jni-config.json"; + Assert.assertFalse(pattern.matcher(RES3).find()); + Assert.assertFalse(pattern.matcher(RES4).find()); + } + +} diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java index 25d1eb9a06cc7f..00cc224903b825 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java @@ -42,7 +42,10 @@ import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem; import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.console.ConsoleInstalledBuildItem; +import io.quarkus.deployment.console.StartupLogCompressor; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; +import io.quarkus.deployment.logging.LoggingSetupBuildItem; import io.quarkus.devservices.common.ContainerAddress; import io.quarkus.devservices.common.ContainerLocator; import io.quarkus.runtime.LaunchMode; @@ -76,7 +79,9 @@ public DevServicesKafkaBrokerBuildItem startKafkaDevService( LaunchModeBuildItem launchMode, KafkaBuildTimeConfig kafkaClientBuildTimeConfig, Optional devServicesSharedNetworkBuildItem, - BuildProducer devServicePropertiesProducer) { + BuildProducer devServicePropertiesProducer, + Optional consoleInstalledBuildItem, + LoggingSetupBuildItem loggingSetupBuildItem) { KafkaDevServiceCfg configuration = getConfiguration(kafkaClientBuildTimeConfig); @@ -88,14 +93,25 @@ public DevServicesKafkaBrokerBuildItem startKafkaDevService( shutdownBroker(); cfg = null; } - - KafkaBroker kafkaBroker = startKafka(configuration, launchMode, devServicesSharedNetworkBuildItem.isPresent()); - DevServicesKafkaBrokerBuildItem bootstrapServers = null; - if (kafkaBroker != null) { - closeable = kafkaBroker.getCloseable(); - devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem( - KAFKA_BOOTSTRAP_SERVERS, kafkaBroker.getBootstrapServers())); - bootstrapServers = new DevServicesKafkaBrokerBuildItem(kafkaBroker.getBootstrapServers()); + KafkaBroker kafkaBroker; + DevServicesKafkaBrokerBuildItem bootstrapServers; + StartupLogCompressor compressor = new StartupLogCompressor( + (launchMode.isTest() ? "(test) " : "") + "Kafka Dev Services Starting:", + consoleInstalledBuildItem, loggingSetupBuildItem); + try { + + kafkaBroker = startKafka(configuration, launchMode, devServicesSharedNetworkBuildItem.isPresent()); + bootstrapServers = null; + if (kafkaBroker != null) { + closeable = kafkaBroker.getCloseable(); + devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem( + KAFKA_BOOTSTRAP_SERVERS, kafkaBroker.getBootstrapServers())); + bootstrapServers = new DevServicesKafkaBrokerBuildItem(kafkaBroker.getBootstrapServers()); + } + compressor.close(); + } catch (Throwable t) { + compressor.closeAndDumpCaptured(); + throw new RuntimeException(t); } // Configure the watch dog @@ -361,6 +377,7 @@ protected void containerIsStarting(InspectContainerResponse containerInfo, boole // Start and configure the advertised address String command = "#!/bin/bash\n"; command += "/usr/bin/rpk redpanda start --check=false --node-id 0 --smp 1 "; + command += "--memory 1G --overprovisioned --reserve-memory 0M "; command += "--kafka-addr PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 "; command += String.format("--advertise-kafka-addr PLAINTEXT://%s:29092,OUTSIDE://%s:%d", getHostToUse(), getHostToUse(), getPortToUse()); diff --git a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java index ed127a722a83bb..58f3eff0b634ef 100644 --- a/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java +++ b/extensions/kubernetes-client/deployment-internal/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientErrorHandler.java @@ -12,11 +12,11 @@ public static void handle(Exception e) { if (e.getCause() instanceof SSLHandshakeException) { LOG.error( "The application could not be deployed to the cluster because the Kubernetes API Server certificates are not trusted. The certificates can be configured using the relevant configuration properties under the 'quarkus.kubernetes-client' config root, or \"quarkus.kubernetes-client.trust-certs=true\" can be set to explicitly trust the certificates (not recommended)"); - if (e instanceof RuntimeException) { - throw (RuntimeException) e; - } else { - throw new RuntimeException(e); - } + } + if (e instanceof RuntimeException) { + throw (RuntimeException) e; + } else { + throw new RuntimeException(e); } } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index c358fb29ea50d5..362b63ae063578 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -11,11 +11,12 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Path; -import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -25,6 +26,7 @@ import io.dekorate.utils.Serialization; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesList; +import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.openshift.api.model.Route; @@ -42,7 +44,6 @@ import io.quarkus.deployment.pkg.builditem.OutputTargetBuildItem; import io.quarkus.kubernetes.client.deployment.KubernetesClientErrorHandler; import io.quarkus.kubernetes.client.spi.KubernetesClientBuildItem; -import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem; public class KubernetesDeployer { @@ -60,7 +61,7 @@ public void selectDeploymentTarget(ContainerImageInfoBuildItem containerImageInf Optional activeContainerImageCapability = ContainerImageCapabilitiesUtil .getActiveContainerImageCapability(capabilities); - if (!activeContainerImageCapability.isPresent()) { + if (activeContainerImageCapability.isEmpty()) { // we can't thrown an exception here, because it could prevent the Kubernetes resources from being generated return; } @@ -85,10 +86,10 @@ public void deploy(KubernetesClientBuildItem kubernetesClient, return; } - if (!selectedDeploymentTarget.isPresent()) { + if (selectedDeploymentTarget.isEmpty()) { - if (!ContainerImageCapabilitiesUtil - .getActiveContainerImageCapability(capabilities).isPresent()) { + if (ContainerImageCapabilitiesUtil + .getActiveContainerImageCapability(capabilities).isEmpty()) { throw new RuntimeException( "A Kubernetes deployment was requested but no extension was found to build a container image. Consider adding one of following extensions: " + CONTAINER_IMAGE_EXTENSIONS_STR + "."); @@ -158,11 +159,6 @@ private DeploymentTargetEntry determineDeploymentTarget( return selectedTarget; } - private Optional getOptionalDeploymentTarget( - List deploymentTargets, String name) { - return deploymentTargets.stream().filter(d -> name.equals(d.getName())).findFirst(); - } - private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, KubernetesClient client, Path outputDir, OpenshiftConfig openshiftConfig, ApplicationInfoBuildItem applicationInfo) { @@ -174,12 +170,13 @@ private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, try (FileInputStream fis = new FileInputStream(manifest)) { KubernetesList list = Serialization.unmarshalAsList(fis); - distinct(list.getItems()).forEach(i -> { - if (KNATIVE.equals(deploymentTarget.getName().toLowerCase())) { - client.resource(i).inNamespace(namespace).deletingExisting().createOrReplace(); - } else { - client.resource(i).inNamespace(namespace).createOrReplace(); + list.getItems().stream().filter(distinctByResourceKey()).forEach(i -> { + final var r = client.resource(i).inNamespace(namespace); + if (shouldDeleteExisting(deploymentTarget, i)) { + r.delete(); + r.waitUntilCondition(Objects::isNull, 10, TimeUnit.SECONDS); } + r.createOrReplace(); log.info("Applied: " + i.getKind() + " " + i.getMetadata().getName() + "."); }); @@ -221,13 +218,15 @@ private void printExposeInformation(KubernetesClient client, KubernetesList list } } - public static Predicate distictByResourceKey() { + private static boolean shouldDeleteExisting(DeploymentTargetEntry deploymentTarget, HasMetadata resource) { + return KNATIVE.equalsIgnoreCase(deploymentTarget.getName()) + || resource instanceof Service + || (Objects.equals("v1", resource.getApiVersion()) && Objects.equals("Service", resource.getKind())); + } + + private static Predicate distinctByResourceKey() { Map seen = new ConcurrentHashMap<>(); return t -> seen.putIfAbsent(t.getApiVersion() + "/" + t.getKind() + ":" + t.getMetadata().getName(), Boolean.TRUE) == null; } - - private static Collection distinct(Collection resources) { - return resources.stream().filter(distictByResourceKey()).collect(Collectors.toList()); - } } diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java index 0f8251b1cc9064..d9b05f5a4123a6 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java @@ -169,7 +169,6 @@ public void build(ApplicationInfoBuildItem applicationInfo, Path targetPath = outputTarget.getOutputDirectory().resolve(KUBERNETES).resolve(fileName); String relativePath = targetPath.toAbsolutePath().toString().replace(root.toAbsolutePath().toString(), ""); - resourceEntry.getKey().replace(root.toAbsolutePath().toString(), KUBERNETES); if (fileName.endsWith(".yml") || fileName.endsWith(".json")) { String target = fileName.substring(0, fileName.lastIndexOf(".")); if (!deploymentTargets.contains(target)) { diff --git a/extensions/liquibase-mongodb/deployment/pom.xml b/extensions/liquibase-mongodb/deployment/pom.xml new file mode 100644 index 00000000000000..6cac71b48c6cd6 --- /dev/null +++ b/extensions/liquibase-mongodb/deployment/pom.xml @@ -0,0 +1,48 @@ + + + + quarkus-liquibase-mongodb-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-liquibase-mongodb-deployment + Quarkus - Liquibase MongoDB - Deployment + + + + io.quarkus + quarkus-liquibase-mongodb + + + io.quarkus + quarkus-mongodb-client-deployment + + + + io.quarkus + quarkus-junit5-internal + test + + + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${project.version} + + + + + + + diff --git a/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java b/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java new file mode 100644 index 00000000000000..ec9ddc2a910ded --- /dev/null +++ b/extensions/liquibase-mongodb/deployment/src/main/java/io/quarkus/liquibase/mongodb/deployment/LiquibaseProcessor.java @@ -0,0 +1,325 @@ +package io.quarkus.liquibase.mongodb.deployment; + +import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT; + +import java.io.IOException; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; + +import javax.enterprise.context.ApplicationScoped; + +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.DotName; +import org.jboss.logging.Logger; + +import io.quarkus.arc.deployment.SyntheticBeanBuildItem; +import io.quarkus.arc.deployment.SyntheticBeansRuntimeInitBuildItem; +import io.quarkus.deployment.Feature; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.ServiceStartBuildItem; +import io.quarkus.deployment.builditem.SystemPropertyBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; +import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; +import io.quarkus.deployment.util.ServiceUtil; +import io.quarkus.liquibase.LiquibaseMongodbFactory; +import io.quarkus.liquibase.runtime.LiquibaseMongodbBuildTimeConfig; +import io.quarkus.liquibase.runtime.LiquibaseMongodbConfig; +import io.quarkus.liquibase.runtime.LiquibaseMongodbRecorder; +import io.quarkus.mongodb.runtime.MongodbConfig; +import liquibase.change.Change; +import liquibase.change.DatabaseChangeProperty; +import liquibase.change.core.CreateProcedureChange; +import liquibase.change.core.CreateViewChange; +import liquibase.change.core.LoadDataChange; +import liquibase.change.core.SQLFileChange; +import liquibase.changelog.ChangeLogParameters; +import liquibase.changelog.ChangeSet; +import liquibase.changelog.DatabaseChangeLog; +import liquibase.exception.LiquibaseException; +import liquibase.parser.ChangeLogParser; +import liquibase.parser.ChangeLogParserFactory; +import liquibase.resource.ClassLoaderResourceAccessor; + +class LiquibaseProcessor { + + private static final Logger LOGGER = Logger.getLogger(LiquibaseProcessor.class); + + private static final String LIQUIBASE_BEAN_NAME_PREFIX = "liquibase_"; + + private static final DotName DATABASE_CHANGE_PROPERTY = DotName.createSimple(DatabaseChangeProperty.class.getName()); + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(Feature.LIQUIBASE_MONGODB); + } + + @BuildStep + public SystemPropertyBuildItem disableHub() { + // Don't block app startup with prompt: + // Do you want to see this operation's report in Liquibase Hub, which improves team collaboration? + // If so, enter your email. If not, enter [N] to no longer be prompted, or [S] to skip for now, but ask again next time (default "S"): + return new SystemPropertyBuildItem("liquibase.hub.mode", "off"); + } + + @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) + @Record(STATIC_INIT) + void nativeImageConfiguration( + LiquibaseMongodbRecorder recorder, + LiquibaseMongodbBuildTimeConfig liquibaseBuildConfig, + CombinedIndexBuildItem combinedIndex, + BuildProducer reflective, + BuildProducer resource, + BuildProducer services, + BuildProducer runtimeInitialized, + BuildProducer resourceBundle) { + + runtimeInitialized.produce(new RuntimeInitializedClassBuildItem(liquibase.diff.compare.CompareControl.class.getName())); + + reflective.produce(new ReflectiveClassBuildItem(false, true, false, + liquibase.change.AbstractSQLChange.class.getName(), + liquibase.database.jvm.JdbcConnection.class.getName())); + + reflective.produce(new ReflectiveClassBuildItem(true, true, true, + liquibase.parser.ChangeLogParserCofiguration.class.getName(), + liquibase.hub.HubServiceFactory.class.getName(), + liquibase.logging.core.DefaultLoggerConfiguration.class.getName(), + liquibase.configuration.GlobalConfiguration.class.getName(), + com.datical.liquibase.ext.config.LiquibaseProConfiguration.class.getName(), + liquibase.license.LicenseServiceFactory.class.getName(), + liquibase.executor.ExecutorService.class.getName(), + liquibase.change.ChangeFactory.class.getName(), + liquibase.logging.core.LogServiceFactory.class.getName(), + liquibase.logging.LogFactory.class.getName(), + liquibase.change.ColumnConfig.class.getName(), + liquibase.change.AddColumnConfig.class.getName(), + liquibase.change.core.LoadDataColumnConfig.class.getName(), + liquibase.sql.visitor.PrependSqlVisitor.class.getName(), + liquibase.sql.visitor.ReplaceSqlVisitor.class.getName(), + liquibase.sql.visitor.AppendSqlVisitor.class.getName(), + liquibase.sql.visitor.RegExpReplaceSqlVisitor.class.getName())); + + reflective.produce(new ReflectiveClassBuildItem(false, false, true, + liquibase.change.ConstraintsConfig.class.getName())); + + // register classes marked with @DatabaseChangeProperty for reflection + Set classesMarkedWithDatabaseChangeProperty = new HashSet<>(); + for (AnnotationInstance databaseChangePropertyInstance : combinedIndex.getIndex() + .getAnnotations(DATABASE_CHANGE_PROPERTY)) { + // the annotation is only supported on methods but let's be safe + AnnotationTarget annotationTarget = databaseChangePropertyInstance.target(); + if (annotationTarget.kind() == AnnotationTarget.Kind.METHOD) { + classesMarkedWithDatabaseChangeProperty.add(annotationTarget.asMethod().declaringClass().name().toString()); + } + } + reflective.produce( + new ReflectiveClassBuildItem(true, true, true, classesMarkedWithDatabaseChangeProperty.toArray(new String[0]))); + + resource.produce( + new NativeImageResourceBuildItem(getChangeLogs(liquibaseBuildConfig).toArray(new String[0]))); + + Stream.of(liquibase.change.Change.class, + liquibase.changelog.ChangeLogHistoryService.class, + liquibase.command.LiquibaseCommand.class, + liquibase.database.Database.class, + liquibase.database.DatabaseConnection.class, + liquibase.datatype.LiquibaseDataType.class, + liquibase.diff.compare.DatabaseObjectComparator.class, + liquibase.diff.DiffGenerator.class, + liquibase.diff.output.changelog.ChangeGenerator.class, + liquibase.executor.Executor.class, + liquibase.license.LicenseService.class, + liquibase.lockservice.LockService.class, + liquibase.logging.LogService.class, + liquibase.parser.ChangeLogParser.class, + liquibase.parser.NamespaceDetails.class, + liquibase.parser.SnapshotParser.class, + liquibase.precondition.Precondition.class, + liquibase.serializer.ChangeLogSerializer.class, + liquibase.serializer.SnapshotSerializer.class, + liquibase.servicelocator.ServiceLocator.class, + liquibase.snapshot.SnapshotGenerator.class, + liquibase.sqlgenerator.SqlGenerator.class, + liquibase.structure.DatabaseObject.class, + liquibase.hub.HubService.class) + .forEach(t -> addService(services, reflective, t, false)); + + // Register Precondition services, and the implementation class for reflection while also registering fields for reflection + addService(services, reflective, liquibase.precondition.Precondition.class, true); + + // liquibase XSD + resource.produce(new NativeImageResourceBuildItem( + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.7.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.10.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.0.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd", + "www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-3.9.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-3.10.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-4.0.xsd", + "www.liquibase.org/xml/ns/pro/liquibase-pro-4.1.xsd", + "liquibase.build.properties")); + + // liquibase resource bundles + resourceBundle.produce(new NativeImageResourceBundleBuildItem("liquibase/i18n/liquibase-core")); + } + + private void addService(BuildProducer services, + BuildProducer reflective, Class serviceClass, + boolean shouldRegisterFieldForReflection) { + try { + String service = "META-INF/services/" + serviceClass.getName(); + Set implementations = ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(), + service); + services.produce(new ServiceProviderBuildItem(serviceClass.getName(), implementations.toArray(new String[0]))); + + reflective.produce(new ReflectiveClassBuildItem(true, true, shouldRegisterFieldForReflection, + implementations.toArray(new String[0]))); + } catch (IOException ex) { + throw new IllegalStateException(ex); + } + } + + @BuildStep + @Record(ExecutionTime.RUNTIME_INIT) + void createBeans(LiquibaseMongodbRecorder recorder, + LiquibaseMongodbConfig liquibaseMongodbConfig, + LiquibaseMongodbBuildTimeConfig liquibaseMongodbBuildTimeConfig, + MongodbConfig mongodbConfig, + BuildProducer syntheticBeanBuildItemBuildProducer) { + + SyntheticBeanBuildItem.ExtendedBeanConfigurator configurator = SyntheticBeanBuildItem + .configure(LiquibaseMongodbFactory.class) + .scope(ApplicationScoped.class) // this is what the existing code does, but it doesn't seem reasonable + .setRuntimeInit() + .unremovable() + .supplier(recorder.liquibaseSupplier(liquibaseMongodbConfig, liquibaseMongodbBuildTimeConfig, mongodbConfig)); + + syntheticBeanBuildItemBuildProducer.produce(configurator.done()); + } + + @BuildStep + @Record(ExecutionTime.RUNTIME_INIT) + @Consume(SyntheticBeansRuntimeInitBuildItem.class) + ServiceStartBuildItem startLiquibase(LiquibaseMongodbRecorder recorder) { + // will actually run the actions at runtime + recorder.doStartActions(); + + return new ServiceStartBuildItem("liquibase-mongodb"); + } + + /** + * Collect the configured changeLog file for the default and all named datasources. + *

+ * A {@link LinkedHashSet} is used to avoid duplications. + */ + private List getChangeLogs(LiquibaseMongodbBuildTimeConfig liquibaseBuildConfig) { + ChangeLogParameters changeLogParameters = new ChangeLogParameters(); + ClassLoaderResourceAccessor classLoaderResourceAccessor = new ClassLoaderResourceAccessor( + Thread.currentThread().getContextClassLoader()); + + ChangeLogParserFactory changeLogParserFactory = ChangeLogParserFactory.getInstance(); + + Set resources = new LinkedHashSet<>(); + + resources.addAll(findAllChangeLogFiles(liquibaseBuildConfig.changeLog, changeLogParserFactory, + classLoaderResourceAccessor, changeLogParameters)); + + LOGGER.debugf("Liquibase changeLogs: %s", resources); + + return new ArrayList<>(resources); + } + + /** + * Finds all resource files for the given change log file + */ + private Set findAllChangeLogFiles(String file, ChangeLogParserFactory changeLogParserFactory, + ClassLoaderResourceAccessor classLoaderResourceAccessor, + ChangeLogParameters changeLogParameters) { + try { + ChangeLogParser parser = changeLogParserFactory.getParser(file, classLoaderResourceAccessor); + DatabaseChangeLog changelog = parser.parse(file, changeLogParameters, classLoaderResourceAccessor); + + if (changelog != null) { + Set result = new LinkedHashSet<>(); + // get all changeSet files + for (ChangeSet changeSet : changelog.getChangeSets()) { + result.add(changeSet.getFilePath()); + + changeSet.getChanges().stream() + .map(change -> extractChangeFile(change, changeSet.getFilePath())) + .forEach(changeFile -> changeFile.ifPresent(result::add)); + + // get all parents of the changeSet + DatabaseChangeLog parent = changeSet.getChangeLog(); + while (parent != null) { + result.add(parent.getFilePath()); + parent = parent.getParentChangeLog(); + } + } + result.add(changelog.getFilePath()); + return result; + } + } catch (LiquibaseException ex) { + throw new IllegalStateException(ex); + } + return Collections.emptySet(); + } + + private Optional extractChangeFile(Change change, String changeSetFilePath) { + String path = null; + Boolean relative = null; + if (change instanceof LoadDataChange) { + LoadDataChange loadDataChange = (LoadDataChange) change; + path = loadDataChange.getFile(); + relative = loadDataChange.isRelativeToChangelogFile(); + } else if (change instanceof SQLFileChange) { + SQLFileChange sqlFileChange = (SQLFileChange) change; + path = sqlFileChange.getPath(); + relative = sqlFileChange.isRelativeToChangelogFile(); + } else if (change instanceof CreateProcedureChange) { + CreateProcedureChange createProcedureChange = (CreateProcedureChange) change; + path = createProcedureChange.getPath(); + relative = createProcedureChange.isRelativeToChangelogFile(); + } else if (change instanceof CreateViewChange) { + CreateViewChange createViewChange = (CreateViewChange) change; + path = createViewChange.getPath(); + relative = createViewChange.getRelativeToChangelogFile(); + } + + // unrelated change or change does not reference a file (e.g. inline view) + if (path == null) { + return Optional.empty(); + } + // absolute file path or changeSet has no file path + if (relative == null || !relative || changeSetFilePath == null) { + return Optional.of(path); + } + + // relative file path needs to be resolved against changeSetFilePath + // notes: ClassLoaderResourceAccessor does not provide a suitable method and CLRA.getFinalPath() is not visible + return Optional.of(Paths.get(changeSetFilePath).resolveSibling(path).toString().replace('\\', '/')); + } +} diff --git a/extensions/liquibase-mongodb/pom.xml b/extensions/liquibase-mongodb/pom.xml new file mode 100644 index 00000000000000..f9432f43440cb1 --- /dev/null +++ b/extensions/liquibase-mongodb/pom.xml @@ -0,0 +1,22 @@ + + + + quarkus-extensions-parent + io.quarkus + 999-SNAPSHOT + ../pom.xml + + 4.0.0 + + quarkus-liquibase-mongodb-parent + Quarkus - Liquibase MongoDB + pom + + + runtime + deployment + + + \ No newline at end of file diff --git a/extensions/liquibase-mongodb/runtime/pom.xml b/extensions/liquibase-mongodb/runtime/pom.xml new file mode 100644 index 00000000000000..e027988136da56 --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/pom.xml @@ -0,0 +1,71 @@ + + + + quarkus-liquibase-mongodb-parent + io.quarkus + 999-SNAPSHOT + + 4.0.0 + + quarkus-liquibase-mongodb + Quarkus - Liquibase MongoDB - Runtime + Handle your MongoDB schema migrations with Liquibase + + + io.quarkus + quarkus-mongodb-client + + + org.liquibase + liquibase-core + + + org.yaml + snakeyaml + + + org.liquibase.ext + liquibase-mongodb + + + org.graalvm.nativeimage + svm + provided + + + + + io.quarkus + quarkus-junit5-internal + test + + + + + + + io.quarkus + quarkus-bootstrap-maven-plugin + + + io.quarkus.liquibase.mongodb + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${project.version} + + + + + + + diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java new file mode 100644 index 00000000000000..5369cfdad6b3bf --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/LiquibaseMongodbFactory.java @@ -0,0 +1,95 @@ +package io.quarkus.liquibase; + +import java.util.Map; +import java.util.regex.Pattern; + +import io.quarkus.liquibase.runtime.LiquibaseMongodbBuildTimeConfig; +import io.quarkus.liquibase.runtime.LiquibaseMongodbConfig; +import io.quarkus.mongodb.runtime.MongoClientConfig; +import liquibase.Contexts; +import liquibase.LabelExpression; +import liquibase.Liquibase; +import liquibase.database.Database; +import liquibase.database.DatabaseFactory; +import liquibase.resource.ClassLoaderResourceAccessor; +import liquibase.resource.ResourceAccessor; + +public class LiquibaseMongodbFactory { + + private final MongoClientConfig mongoClientConfig; + private final LiquibaseMongodbConfig liquibaseMongodbConfig; + private final LiquibaseMongodbBuildTimeConfig liquibaseMongodbBuildTimeConfig; + + //connection-string format, see https://docs.mongodb.com/manual/reference/connection-string/ + Pattern HAS_DB = Pattern.compile("(mongodb|mongodb\\+srv)://[^/]*/.*"); + + public LiquibaseMongodbFactory(LiquibaseMongodbConfig config, + LiquibaseMongodbBuildTimeConfig liquibaseMongodbBuildTimeConfig, MongoClientConfig mongoClientConfig) { + this.liquibaseMongodbConfig = config; + this.liquibaseMongodbBuildTimeConfig = liquibaseMongodbBuildTimeConfig; + this.mongoClientConfig = mongoClientConfig; + } + + public Liquibase createLiquibase() { + try { + ResourceAccessor resourceAccessor = new ClassLoaderResourceAccessor(Thread.currentThread().getContextClassLoader()); + String connectionString = this.mongoClientConfig.connectionString.orElse("mongodb://localhost:27017"); + if (!HAS_DB.matcher(connectionString).matches()) { + connectionString += "/" + this.mongoClientConfig.database.orElseThrow( + () -> new IllegalArgumentException( + "Config property 'quarkus.mongodb.database' must be defined when no database " + + "exist in the connection string")); + } + Database database = DatabaseFactory.getInstance().openDatabase(connectionString, + this.mongoClientConfig.credentials.username.orElse(null), + this.mongoClientConfig.credentials.password.orElse(null), + null, resourceAccessor); + + ; + if (database != null) { + liquibaseMongodbConfig.liquibaseCatalogName.ifPresent(database::setLiquibaseCatalogName); + liquibaseMongodbConfig.liquibaseSchemaName.ifPresent(database::setLiquibaseSchemaName); + liquibaseMongodbConfig.liquibaseTablespaceName.ifPresent(database::setLiquibaseTablespaceName); + + if (liquibaseMongodbConfig.defaultCatalogName.isPresent()) { + database.setDefaultCatalogName(liquibaseMongodbConfig.defaultCatalogName.get()); + } + if (liquibaseMongodbConfig.defaultSchemaName.isPresent()) { + database.setDefaultSchemaName(liquibaseMongodbConfig.defaultSchemaName.get()); + } + } + Liquibase liquibase = new Liquibase(liquibaseMongodbBuildTimeConfig.changeLog, resourceAccessor, database); + + for (Map.Entry entry : liquibaseMongodbConfig.changeLogParameters.entrySet()) { + liquibase.getChangeLogParameters().set(entry.getKey(), entry.getValue()); + } + + return liquibase; + + } catch (Exception ex) { + throw new IllegalStateException(ex); + } + } + + public LiquibaseMongodbConfig getConfiguration() { + return liquibaseMongodbConfig; + } + + /** + * Creates the default labels base on the configuration + * + * @return the label expression + */ + public LabelExpression createLabels() { + return new LabelExpression(liquibaseMongodbConfig.labels.orElse(null)); + } + + /** + * Creates the default contexts base on the configuration + * + * @return the contexts + */ + public Contexts createContexts() { + return new Contexts(liquibaseMongodbConfig.contexts.orElse(null)); + } +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java new file mode 100644 index 00000000000000..8945d1d07b549c --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbBuildTimeConfig.java @@ -0,0 +1,18 @@ +package io.quarkus.liquibase.runtime; + +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +/** + * The liquibase configuration + */ +@ConfigRoot(name = "liquibase-mongodb", phase = ConfigPhase.BUILD_TIME) +public class LiquibaseMongodbBuildTimeConfig { + + /** + * The change log file + */ + @ConfigItem(defaultValue = "db/changeLog.xml") + public String changeLog; +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java new file mode 100644 index 00000000000000..0917e5204285e1 --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbConfig.java @@ -0,0 +1,84 @@ +package io.quarkus.liquibase.runtime; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConfigPhase; +import io.quarkus.runtime.annotations.ConfigRoot; + +/** + * The liquibase configuration + */ +@ConfigRoot(name = "liquibase-mongodb", phase = ConfigPhase.RUN_TIME) +public class LiquibaseMongodbConfig { + + /** + * The migrate at start flag + */ + @ConfigItem + public boolean migrateAtStart; + + /** + * The validate on update flag + */ + @ConfigItem(defaultValue = "true") + public boolean validateOnMigrate; + + /** + * The clean at start flag + */ + @ConfigItem + public boolean cleanAtStart; + + /** + * The parameters to be passed to the changelog. + * Defined as key value pairs. + */ + @ConfigItem + public Map changeLogParameters = new HashMap<>();; + + /** + * The list of contexts + */ + @ConfigItem + public Optional> contexts = Optional.empty(); + + /** + * The list of labels + */ + @ConfigItem + public Optional> labels = Optional.empty(); + + /** + * The default catalog name + */ + @ConfigItem + public Optional defaultCatalogName = Optional.empty(); + + /** + * The default schema name + */ + @ConfigItem + public Optional defaultSchemaName = Optional.empty(); + + /** + * The liquibase tables catalog name + */ + @ConfigItem + public Optional liquibaseCatalogName = Optional.empty(); + + /** + * The liquibase tables schema name + */ + @ConfigItem + public Optional liquibaseSchemaName = Optional.empty(); + + /** + * The liquibase tables tablespace name + */ + @ConfigItem + public Optional liquibaseTablespaceName = Optional.empty(); +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java new file mode 100644 index 00000000000000..84759f8ac1e6cd --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/LiquibaseMongodbRecorder.java @@ -0,0 +1,63 @@ +package io.quarkus.liquibase.runtime; + +import java.util.function.Supplier; + +import javax.enterprise.inject.Any; +import javax.enterprise.inject.UnsatisfiedResolutionException; + +import io.quarkus.arc.Arc; +import io.quarkus.arc.InjectableInstance; +import io.quarkus.arc.InstanceHandle; +import io.quarkus.liquibase.LiquibaseMongodbFactory; +import io.quarkus.mongodb.runtime.MongodbConfig; +import io.quarkus.runtime.annotations.Recorder; +import liquibase.Liquibase; + +@Recorder +public class LiquibaseMongodbRecorder { + + public Supplier liquibaseSupplier(LiquibaseMongodbConfig config, + LiquibaseMongodbBuildTimeConfig buildTimeConfig, MongodbConfig mongodbConfig) { + return new Supplier() { + @Override + public LiquibaseMongodbFactory get() { + return new LiquibaseMongodbFactory(config, buildTimeConfig, mongodbConfig.defaultMongoClientConfig); + } + }; + } + + public void doStartActions() { + try { + InjectableInstance liquibaseFactoryInstance = Arc.container() + .select(LiquibaseMongodbFactory.class, Any.Literal.INSTANCE); + if (liquibaseFactoryInstance.isUnsatisfied()) { + return; + } + + for (InstanceHandle liquibaseFactoryHandle : liquibaseFactoryInstance.handles()) { + try { + LiquibaseMongodbFactory liquibaseFactory = liquibaseFactoryHandle.get(); + if (liquibaseFactory.getConfiguration().cleanAtStart) { + try (Liquibase liquibase = liquibaseFactory.createLiquibase()) { + liquibase.dropAll(); + } + } + if (liquibaseFactory.getConfiguration().migrateAtStart) { + if (liquibaseFactory.getConfiguration().validateOnMigrate) { + try (Liquibase liquibase = liquibaseFactory.createLiquibase()) { + liquibase.validate(); + } + } + try (Liquibase liquibase = liquibaseFactory.createLiquibase()) { + liquibase.update(liquibaseFactory.createContexts(), liquibaseFactory.createLabels()); + } + } + } catch (UnsatisfiedResolutionException e) { + //ignore, the DS is not configured + } + } + } catch (Exception e) { + throw new IllegalStateException("Error starting Liquibase", e); + } + } +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java new file mode 100644 index 00000000000000..d4f28a00e8464f --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/runtime/graal/SubstituteStringUtil.java @@ -0,0 +1,37 @@ +package io.quarkus.liquibase.runtime.graal; + +import java.security.SecureRandom; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.InjectAccessors; +import com.oracle.svm.core.annotate.TargetClass; + +@TargetClass(className = "liquibase.util.StringUtil") +final class SubstituteStringUtil { + + @Alias + @InjectAccessors(SecureRandomAccessors.class) + private static SecureRandom rnd; + + public static final class SecureRandomAccessors { + + private static volatile SecureRandom volatileRandom; + + public static SecureRandom get() { + SecureRandom localVolatileRandom = volatileRandom; + if (localVolatileRandom == null) { + synchronized (SecureRandomAccessors.class) { + localVolatileRandom = volatileRandom; + if (localVolatileRandom == null) { + volatileRandom = localVolatileRandom = new SecureRandom(); + } + } + } + return localVolatileRandom; + } + + public static void set(SecureRandom rnd) { + throw new IllegalStateException("The setter for liquibase.util.StringUtil#rnd shouldn't be called."); + } + } +} diff --git a/extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 00000000000000..8cacc679b79752 --- /dev/null +++ b/extensions/liquibase-mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,11 @@ +--- +artifact: ${project.groupId}:${project.artifactId}:${project.version} +name: "Liquibase MongoDB" +metadata: + keywords: + - "liquibase" + - "mongodb" + - "data" + categories: + - "data" + status: "experimental" \ No newline at end of file diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java index 1564f2fbbf38f6..1f49d9c9bca880 100644 --- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java +++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/DevServicesMongoProcessor.java @@ -27,7 +27,11 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem; import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.console.ConsoleInstalledBuildItem; +import io.quarkus.deployment.console.StartupLogCompressor; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; +import io.quarkus.deployment.logging.LoggingSetupBuildItem; import io.quarkus.devservices.common.ConfigureUtil; import io.quarkus.mongodb.runtime.MongodbConfig; import io.quarkus.runtime.configuration.ConfigUtils; @@ -46,7 +50,10 @@ public class DevServicesMongoProcessor { public void startMongo(List mongoConnections, MongoClientBuildTimeConfig mongoClientBuildTimeConfig, Optional devServicesSharedNetworkBuildItem, - BuildProducer devServices) { + BuildProducer devServices, + Optional consoleInstalledBuildItem, + LaunchModeBuildItem launchMode, + LoggingSetupBuildItem loggingSetupBuildItem) { List connectionNames = new ArrayList<>(mongoConnections.size()); for (MongoConnectionNameBuildItem mongoConnection : mongoConnections) { @@ -86,8 +93,18 @@ public void startMongo(List mongoConnections, // TODO: we need to go through each connection String connectionName = connectionNames.get(0); - StartResult startResult = startMongo(connectionName, currentCapturedProperties.get(connectionName), - devServicesSharedNetworkBuildItem.isPresent()); + StartResult startResult; + StartupLogCompressor compressor = new StartupLogCompressor( + (launchMode.isTest() ? "(test) " : "") + "Mongo Dev Services Starting:", consoleInstalledBuildItem, + loggingSetupBuildItem); + try { + startResult = startMongo(connectionName, currentCapturedProperties.get(connectionName), + devServicesSharedNetworkBuildItem.isPresent()); + compressor.close(); + } catch (Throwable t) { + compressor.closeAndDumpCaptured(); + throw new RuntimeException(t); + } if (startResult != null) { currentCloseables.add(startResult.getCloseable()); String connectionStringPropertyName = getConfigPrefix(connectionName) + "connection-string"; diff --git a/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 658ebabc08beaf..001d82655819ad 100644 --- a/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/mutiny/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,4 +10,4 @@ metadata: - "Reactor" categories: - "reactive" - status: "preview" \ No newline at end of file + status: "stable" \ No newline at end of file diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java index db0f965516b85e..d8caf9dc874873 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/CDIDelegatingTransactionManager.java @@ -20,12 +20,15 @@ import org.jboss.logging.Logger; +import io.quarkus.arc.Unremovable; + /** * A delegating transaction manager which receives an instance of Narayana transaction manager * and delegates all calls to it. * On top of it the implementation adds the CDI events processing for {@link TransactionScoped}. */ @Singleton +@Unremovable // used by Arc for transactional observers public class CDIDelegatingTransactionManager implements TransactionManager, Serializable { private static final Logger log = Logger.getLogger(CDIDelegatingTransactionManager.class); diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java index a6c13e63d8df23..85e4b99d2e17e2 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaProducers.java @@ -39,7 +39,7 @@ public XAResourceRecoveryRegistry xaResourceRecoveryRegistry() { @Produces @ApplicationScoped - @Unremovable // needed by Arc for transactional observers + @Unremovable public TransactionSynchronizationRegistry transactionSynchronizationRegistry() { return new TransactionSynchronizationRegistryImple(); } diff --git a/extensions/oidc-client-filter/runtime/pom.xml b/extensions/oidc-client-filter/runtime/pom.xml index c590a6b40ca155..a942bd43fc823a 100644 --- a/extensions/oidc-client-filter/runtime/pom.xml +++ b/extensions/oidc-client-filter/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-client-filter Quarkus - OpenID Connect Client Filter - Runtime - Use JAX-RS client filter to get and refresh the access tokens and set them as HTTP Authorization Bearer values + Use JAX-RS Client filter to get and refresh access tokens with OpenId Connect Client and send them as HTTP Authorization Bearer tokens io.quarkus diff --git a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 6b87f37707e2cd..a88e19aebb088d 100644 --- a/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/oidc-client-filter/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -11,6 +11,6 @@ metadata: guide: "https://quarkus.io/guides/security-openid-connect-client" categories: - "security" - status: "preview" + status: "stable" config: - "quarkus.oidc-client." diff --git a/extensions/oidc-client-reactive-filter/runtime/pom.xml b/extensions/oidc-client-reactive-filter/runtime/pom.xml index 31034ca04b9a7e..9fbb3bd9b2593c 100644 --- a/extensions/oidc-client-reactive-filter/runtime/pom.xml +++ b/extensions/oidc-client-reactive-filter/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-client-reactive-filter Quarkus - OpenID Connect Client Reactive Filter - Runtime - Use Reactive RestClient filter to get and refresh the access tokens and set them as HTTP Authorization Bearer values + Use Reactive RestClient filter to get and refresh access tokens with OpenId Connect Client and send them as HTTP Authorization Bearer tokens io.quarkus diff --git a/extensions/oidc-client/runtime/pom.xml b/extensions/oidc-client/runtime/pom.xml index e3825023299458..7becfd54a8a8d4 100644 --- a/extensions/oidc-client/runtime/pom.xml +++ b/extensions/oidc-client/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-client Quarkus - OpenID Connect Client - Runtime - Use OpenID Connect Client to get and refresh access tokens + Get and refresh access tokens from OpenID Connect providers io.quarkus diff --git a/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml index b3b4af7ed627e4..434ccf025932b2 100644 --- a/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/oidc-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -10,7 +10,7 @@ metadata: guide: "https://quarkus.io/guides/security-openid-connect-client" categories: - "security" - status: "preview" + status: "stable" config: - "quarkus.oidc-client." - "quarkus.oidc." diff --git a/extensions/oidc-token-propagation/runtime/pom.xml b/extensions/oidc-token-propagation/runtime/pom.xml index 1b9d5e48774f96..3f47c7e1982eac 100644 --- a/extensions/oidc-token-propagation/runtime/pom.xml +++ b/extensions/oidc-token-propagation/runtime/pom.xml @@ -12,7 +12,7 @@ quarkus-oidc-token-propagation Quarkus - OpenID Connect Token Propagation - Runtime - Use JAX-RS client filter to propagate the current access token as HTTP Authorization Bearer value + Use JAX-RS Client filter to propagate the incoming Bearer access token or token acquired from Authorization Code Flow as HTTP Authorization Bearer token io.quarkus diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java index a3075712a3bfe5..2debaf34ecd775 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessToken.java @@ -6,6 +6,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * When this annotation is added to a MicroProfile REST Client interface, the {@link AccessTokenRequestFilter} will be added to + * the request pipeline. + * The end result is that the request propagates the Bearer token present in the current active request or the token acquired + * from the Authorization Code Flow, + * as the HTTP {@code Authorization} header's {@code Bearer} scheme value. + */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java index 0a5df9d7a98e10..0ec0b0877ae9b0 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/AccessTokenRequestFilter.java @@ -20,6 +20,9 @@ public class AccessTokenRequestFilter extends AbstractTokenRequestFilter { private static final String EXCHANGE_SUBJECT_TOKEN = "subject_token"; + // note: We can't use constructor injection for these fields because they are registered by RESTEasy + // which doesn't know about CDI at the point of registration + @Inject Instance accessToken; diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java index e7b8601602bd62..81649761f76cf6 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebToken.java @@ -6,6 +6,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * When this annotation is added to a MicroProfile REST Client interface, the {@link JsonWebTokenRequestFilter} will be added to + * the request pipeline. + * The end result is that the request propagates the JWT token present in the current active request or the token acquired from + * the Authorization Code Flow, + * as the HTTP {@code Authorization} header's {@code Bearer} scheme value. + */ @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java index 4151e696ac946e..1be3a3795359c3 100644 --- a/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java +++ b/extensions/oidc-token-propagation/runtime/src/main/java/io/quarkus/oidc/token/propagation/JsonWebTokenRequestFilter.java @@ -12,6 +12,10 @@ import io.smallrye.jwt.build.Jwt; public class JsonWebTokenRequestFilter extends AbstractTokenRequestFilter { + + // note: We can't use constructor injection for these fields because they are registered by RESTEasy + // which doesn't know about CDI at the point of registration + @Inject Instance jwtAccessToken; diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java index b0b958807c0da4..fad473c1b05b78 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/OidcBuildStep.java @@ -38,6 +38,7 @@ import io.quarkus.oidc.runtime.TenantConfigBean; import io.quarkus.runtime.TlsConfig; import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; +import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem; import io.smallrye.jwt.auth.cdi.ClaimValueProducer; import io.smallrye.jwt.auth.cdi.CommonJwtProducer; import io.smallrye.jwt.auth.cdi.JsonValueProducer; @@ -51,6 +52,14 @@ FeatureBuildItem featureBuildItem() { return new FeatureBuildItem(Feature.OIDC); } + @BuildStep(onlyIf = IsEnabled.class) + public void provideSecurityInformation(BuildProducer securityInformationProducer) { + // TODO: By default quarkus.oidc.application-type = service + // Also look at other options (web-app, hybrid) + securityInformationProducer + .produce(SecurityInformationBuildItem.OPENIDCONNECT("quarkus.oidc.auth-server-url")); + } + @BuildStep(onlyIf = IsEnabled.class) AdditionalBeanBuildItem jwtClaimIntegration(Capabilities capabilities) { if (!capabilities.isPresent(Capability.JWT)) { diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakAuthorizationCodePostHandler.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcAuthorizationCodePostHandler.java similarity index 67% rename from extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakAuthorizationCodePostHandler.java rename to extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcAuthorizationCodePostHandler.java index df550d73225cd2..2b9d9b7becf125 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakAuthorizationCodePostHandler.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcAuthorizationCodePostHandler.java @@ -1,10 +1,13 @@ -package io.quarkus.oidc.deployment.devservices.keycloak; +package io.quarkus.oidc.deployment.devservices; + +import java.time.Duration; import org.jboss.logging.Logger; import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; import io.quarkus.oidc.common.runtime.OidcCommonUtils; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.RoutingContext; import io.vertx.mutiny.core.buffer.Buffer; @@ -12,24 +15,32 @@ import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; -public class KeycloakAuthorizationCodePostHandler extends DevConsolePostHandler { - private static final Logger LOG = Logger.getLogger(KeycloakAuthorizationCodePostHandler.class); +public class OidcAuthorizationCodePostHandler extends DevConsolePostHandler { + private static final Logger LOG = Logger.getLogger(OidcAuthorizationCodePostHandler.class); + + Vertx vertxInstance; + Duration timeout; + + public OidcAuthorizationCodePostHandler(Vertx vertxInstance, Duration timeout) { + this.vertxInstance = vertxInstance; + this.timeout = timeout; + } @Override protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { - WebClient client = KeycloakDevServicesUtils.createWebClient(); - String keycloakUrl = form.get("keycloakUrl") + "/realms/" + form.get("realm") + "/protocol/openid-connect/token"; + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); + String tokenUrl = form.get("tokenUrl"); try { - LOG.infof("Using authorization_code grant to get a token from '%s' in realm '%s' with client id '%s'", - keycloakUrl, form.get("realm"), form.get("client")); + LOG.infof("Using authorization_code grant to get a token from '%s' with client id '%s'", + tokenUrl, form.get("client")); - HttpRequest request = client.postAbs(keycloakUrl); + HttpRequest request = client.postAbs(tokenUrl); request.putHeader(HttpHeaders.CONTENT_TYPE.toString(), HttpHeaders.APPLICATION_X_WWW_FORM_URLENCODED.toString()); io.vertx.mutiny.core.MultiMap props = new io.vertx.mutiny.core.MultiMap(MultiMap.caseInsensitiveMultiMap()); props.add("client_id", form.get("client")); - if (form.get("clientSecret") != null) { + if (form.get("clientSecret") != null && !form.get("clientSecret").isBlank()) { props.add("client_secret", form.get("clientSecret")); } props.add("grant_type", "authorization_code"); @@ -38,12 +49,12 @@ protected void handlePostAsync(RoutingContext event, MultiMap form) throws Excep String tokens = request.sendBuffer(OidcCommonUtils.encodeForm(props)).onItem() .transform(resp -> getBodyAsString(resp)) - .await().atMost(KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout); + .await().atMost(timeout); event.put("tokens", tokens); } catch (Throwable t) { - LOG.errorf("Token can not be acquired from Keycloak: %s", t.toString()); + LOG.errorf("Token can not be acquired from OpenId Connect provider: %s", t.toString()); } finally { client.close(); } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java new file mode 100644 index 00000000000000..c1975727214feb --- /dev/null +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevConsoleProcessor.java @@ -0,0 +1,146 @@ +package io.quarkus.oidc.deployment.devservices; + +import java.time.Duration; + +import org.eclipse.microprofile.config.ConfigProvider; +import org.jboss.logging.Logger; + +import io.quarkus.bootstrap.classloading.QuarkusClassLoader; +import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; +import io.quarkus.deployment.builditem.RuntimeConfigSetupCompleteBuildItem; +import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; +import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; +import io.quarkus.oidc.common.runtime.OidcConstants; +import io.quarkus.runtime.configuration.ConfigUtils; +import io.vertx.core.Vertx; +import io.vertx.core.http.HttpHeaders; +import io.vertx.core.json.JsonObject; +import io.vertx.mutiny.core.buffer.Buffer; +import io.vertx.mutiny.ext.web.client.HttpResponse; +import io.vertx.mutiny.ext.web.client.WebClient; + +public class OidcDevConsoleProcessor { + static volatile Vertx vertxInstance; + private static final Logger LOG = Logger.getLogger(OidcDevConsoleProcessor.class); + + private static final String CONFIG_PREFIX = "quarkus.oidc."; + private static final String TENANT_ENABLED_CONFIG_KEY = CONFIG_PREFIX + "tenant-enabled"; + private static final String AUTH_SERVER_URL_CONFIG_KEY = CONFIG_PREFIX + "auth-server-url"; + private static final String APP_TYPE_CONFIG_KEY = CONFIG_PREFIX + "application-type"; + private static final String SERVICE_APP_TYPE = "service"; + private static final String CLIENT_ID_CONFIG_KEY = CONFIG_PREFIX + "client-id"; + private static final String CLIENT_SECRET_CONFIG_KEY = CONFIG_PREFIX + "credentials.secret"; + + @BuildStep(onlyIf = IsDevelopment.class) + @Consume(RuntimeConfigSetupCompleteBuildItem.class) + void prepareOidcDevConsole(BuildProducer console, + BuildProducer devConsoleRoute) { + if (isOidcTenantEnabled() && isAuthServerUrlSet() && isClientIdSet() && isServiceAuthType()) { + + if (vertxInstance == null) { + vertxInstance = Vertx.vertx(); + + Runnable closeTask = new Runnable() { + @Override + public void run() { + if (vertxInstance != null) { + try { + vertxInstance.close(); + } catch (Throwable t) { + LOG.error("Failed to close Vertx instance", t); + } + } + vertxInstance = null; + } + }; + QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); + ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + Thread closeHookThread = new Thread(closeTask, "OIDC DevConsole Vertx close thread"); + Runtime.getRuntime().addShutdownHook(closeHookThread); + ((QuarkusClassLoader) cl.parent()).addCloseTask(new Runnable() { + @Override + public void run() { + Runtime.getRuntime().removeShutdownHook(closeHookThread); + } + }); + } + + String authServerUrl = getConfigProperty(AUTH_SERVER_URL_CONFIG_KEY); + JsonObject metadata = discoverMetadata(authServerUrl); + if (metadata == null) { + return; + } + if (authServerUrl.contains("/realms/")) { + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakAdminUrl", + authServerUrl.substring(0, authServerUrl.indexOf("/realms/")))); + } + console.produce(new DevConsoleTemplateInfoBuildItem("oidcApplicationType", SERVICE_APP_TYPE)); + console.produce(new DevConsoleTemplateInfoBuildItem("clientId", getConfigProperty(CLIENT_ID_CONFIG_KEY))); + console.produce(new DevConsoleTemplateInfoBuildItem("clientSecret", getClientSecret())); + + console.produce(new DevConsoleTemplateInfoBuildItem("tokenUrl", metadata.getString("token_endpoint"))); + console.produce( + new DevConsoleTemplateInfoBuildItem("authorizationUrl", metadata.getString("authorization_endpoint"))); + if (metadata.containsKey("end_session_endpoint")) { + console.produce(new DevConsoleTemplateInfoBuildItem("logoutUrl", metadata.getString("end_session_endpoint"))); + } + console.produce(new DevConsoleTemplateInfoBuildItem("oidcGrantType", "code")); + + devConsoleRoute.produce(new DevConsoleRouteBuildItem("testServiceWithToken", "POST", + new OidcTestServiceHandler(vertxInstance, Duration.ofSeconds(3)))); + devConsoleRoute.produce(new DevConsoleRouteBuildItem("exchangeCodeForTokens", "POST", + new OidcAuthorizationCodePostHandler(vertxInstance, Duration.ofSeconds(3)))); + } + } + + private JsonObject discoverMetadata(String authServerUrl) { + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); + try { + String metadataUrl = authServerUrl + OidcConstants.WELL_KNOWN_CONFIGURATION; + LOG.infof("OIDC Dev Console: discovering the provider metadata at %s", metadataUrl); + + HttpResponse resp = client.getAbs(metadataUrl) + .putHeader(HttpHeaders.ACCEPT.toString(), "application/json").send().await().indefinitely(); + if (resp.statusCode() == 200) { + return resp.bodyAsJsonObject(); + } else { + LOG.errorf("OIDC metadata discovery failed: %s", resp.bodyAsString()); + return null; + } + } catch (Throwable t) { + LOG.errorf("OIDC metadata discovery failed: %s", t.toString()); + return null; + } finally { + client.close(); + } + } + + private String getConfigProperty(String name) { + return ConfigProvider.getConfig().getValue(name, String.class); + } + + private static boolean isOidcTenantEnabled() { + return ConfigProvider.getConfig().getOptionalValue(TENANT_ENABLED_CONFIG_KEY, Boolean.class).orElse(true); + } + + private static boolean isClientIdSet() { + return ConfigUtils.isPropertyPresent(CLIENT_ID_CONFIG_KEY); + } + + private static String getClientSecret() { + return ConfigProvider.getConfig().getOptionalValue(CLIENT_SECRET_CONFIG_KEY, String.class).orElse(""); + } + + private static boolean isAuthServerUrlSet() { + return ConfigUtils.isPropertyPresent(AUTH_SERVER_URL_CONFIG_KEY); + } + + private boolean isServiceAuthType() { + return SERVICE_APP_TYPE.equals( + ConfigProvider.getConfig().getOptionalValue(APP_TYPE_CONFIG_KEY, String.class).orElse(SERVICE_APP_TYPE)); + } + +} diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java index 78a7c59e677f3b..6fafbb817a38cb 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesBuildItem.java @@ -2,6 +2,10 @@ import io.quarkus.builder.item.SimpleBuildItem; +/** + * Marker build item which indicates that Dev Services for OIDC are provided by another extension. + * Dev Services for Keycloak will be disabled if this item is detected. + */ public class OidcDevServicesBuildItem extends SimpleBuildItem { } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesUtils.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesUtils.java similarity index 83% rename from extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesUtils.java rename to extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesUtils.java index 5fb008965ea2b1..5666973d58bf3f 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesUtils.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcDevServicesUtils.java @@ -1,9 +1,10 @@ -package io.quarkus.oidc.deployment.devservices.keycloak; +package io.quarkus.oidc.deployment.devservices; import java.time.Duration; import io.quarkus.oidc.common.runtime.OidcCommonUtils; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonObject; import io.vertx.mutiny.core.buffer.Buffer; @@ -11,23 +12,23 @@ import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; -public final class KeycloakDevServicesUtils { - private KeycloakDevServicesUtils() { +public final class OidcDevServicesUtils { + private OidcDevServicesUtils() { } - public static WebClient createWebClient() { - return WebClient.create(new io.vertx.mutiny.core.Vertx(KeycloakDevServicesProcessor.vertxInstance)); + public static WebClient createWebClient(Vertx vertx) { + return WebClient.create(new io.vertx.mutiny.core.Vertx(vertx)); } public static String getPasswordAccessToken(WebClient client, - String keycloakUrl, + String tokenUrl, String clientId, String clientSecret, String userName, String userPassword, Duration timeout) throws Exception { - HttpRequest request = client.postAbs(keycloakUrl); + HttpRequest request = client.postAbs(tokenUrl); request.putHeader(HttpHeaders.CONTENT_TYPE.toString(), HttpHeaders.APPLICATION_X_WWW_FORM_URLENCODED.toString()); io.vertx.mutiny.core.MultiMap props = new io.vertx.mutiny.core.MultiMap(MultiMap.caseInsensitiveMultiMap()); @@ -45,11 +46,11 @@ public static String getPasswordAccessToken(WebClient client, } public static String getClientCredAccessToken(WebClient client, - String keycloakUrl, + String tokenUrl, String clientId, String clientSecret, Duration timeout) throws Exception { - HttpRequest request = client.postAbs(keycloakUrl); + HttpRequest request = client.postAbs(tokenUrl); request.putHeader(HttpHeaders.CONTENT_TYPE.toString(), HttpHeaders.APPLICATION_X_WWW_FORM_URLENCODED.toString()); io.vertx.mutiny.core.MultiMap props = new io.vertx.mutiny.core.MultiMap(MultiMap.caseInsensitiveMultiMap()); diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakImplicitGrantPostHandler.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcTestServiceHandler.java similarity index 67% rename from extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakImplicitGrantPostHandler.java rename to extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcTestServiceHandler.java index 6e57f35b85b4dd..6f578d6b9c90ef 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakImplicitGrantPostHandler.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/OidcTestServiceHandler.java @@ -1,28 +1,33 @@ -package io.quarkus.oidc.deployment.devservices.keycloak; +package io.quarkus.oidc.deployment.devservices; + +import java.time.Duration; import org.jboss.logging.Logger; import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; import io.vertx.core.MultiMap; +import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.RoutingContext; import io.vertx.mutiny.ext.web.client.WebClient; -public class KeycloakImplicitGrantPostHandler extends DevConsolePostHandler { - private static final Logger LOG = Logger.getLogger(KeycloakImplicitGrantPostHandler.class); +public class OidcTestServiceHandler extends DevConsolePostHandler { + private static final Logger LOG = Logger.getLogger(OidcTestServiceHandler.class); + + Vertx vertxInstance; + Duration timeout; + + public OidcTestServiceHandler(Vertx vertxInstance, Duration timeout) { + this.vertxInstance = vertxInstance; + this.timeout = timeout; + } @Override protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { - WebClient client = KeycloakDevServicesUtils.createWebClient(); + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); try { - String token = form.get("token"); - - LOG.infof("Test token: %s", token); - LOG.infof("Sending token to '%s'", form.get("serviceUrl")); - testServiceInternal(event, client, form.get("serviceUrl"), token); - } catch (Throwable t) { - LOG.errorf("Token can not be acquired from Keycloak: %s", t.toString()); + testServiceInternal(event, client, form.get("serviceUrl"), form.get("token")); } finally { client.close(); } @@ -30,9 +35,11 @@ protected void handlePostAsync(RoutingContext event, MultiMap form) throws Excep private void testServiceInternal(RoutingContext event, WebClient client, String serviceUrl, String token) { try { + LOG.infof("Test token: %s", token); + LOG.infof("Sending token to '%s'", serviceUrl); int statusCode = client.getAbs(serviceUrl) .putHeader(HttpHeaders.AUTHORIZATION.toString(), "Bearer " + token).send().await() - .atMost(KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout) + .atMost(timeout) .statusCode(); LOG.infof("Result: %d", statusCode); event.put("result", String.valueOf(statusCode)); diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java index 754bc3e7db2d2b..b3a31eef22a25e 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java @@ -65,12 +65,27 @@ public class DevServicesConfig { */ @ConfigItem public Optional javaOpts; + /** - * The Keycloak realm. - * This property will be used to create the realm if the realm file pointed to by the 'realm-path' property does not exist. + * The Keycloak realm name. + * This property will be used to create the realm if the realm file pointed to by the 'realm-path' property does not exist, + * default value is 'quarkus' in this case. + * If the realm file pointed to by the 'realm-path' property exists then it is still recommended to set this property + * for Dev Services for Keycloak to avoid parsing the realm file in order to determine the realm name. + * */ - @ConfigItem(defaultValue = "quarkus") - public String realmName; + @ConfigItem + public Optional realmName; + + /** + * Indicates if the Keycloak realm has to be created when the realm file pointed to by the 'realm-path' property does not + * exist. + * + * Disable it if you'd like to create a realm using Keycloak Administration Console + * or Keycloak Admin API from {@linkplain io.quarkus.test.common.QuarkusTestResourceLifecycleManager}. + */ + @ConfigItem(defaultValue = "true") + public boolean createRealm; /** * The Keycloak users map containing the user name and password pairs. diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java index 8faa62619bf32b..3ec790d7fecb95 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsolePostHandler.java @@ -5,6 +5,7 @@ import org.jboss.logging.Logger; import io.quarkus.devconsole.runtime.spi.DevConsolePostHandler; +import io.quarkus.oidc.deployment.devservices.OidcDevServicesUtils; import io.vertx.core.MultiMap; import io.vertx.core.http.HttpHeaders; import io.vertx.ext.web.RoutingContext; @@ -20,33 +21,31 @@ public KeycloakDevConsolePostHandler(Map users) { @Override protected void handlePostAsync(RoutingContext event, MultiMap form) throws Exception { - WebClient client = KeycloakDevServicesUtils.createWebClient(); - String keycloakUrl = form.get("keycloakUrl") + "/realms/" + form.get("realm") + "/protocol/openid-connect/token"; + WebClient client = OidcDevServicesUtils.createWebClient(KeycloakDevServicesProcessor.vertxInstance); + String tokenUrl = form.get("tokenUrl"); try { String token = null; if ("password".equals(form.get("grant"))) { - LOG.infof("Using a password grant to get a token from '%s' for user '%s' in realm '%s' with client id '%s'", - keycloakUrl, form.get("user"), form.get("realm"), form.get("client")); + LOG.infof("Using a password grant to get a token from '%s' for user '%s' with client id '%s'", + tokenUrl, form.get("user"), form.get("client")); String userName = form.get("user"); - token = KeycloakDevServicesUtils.getPasswordAccessToken(client, keycloakUrl, + token = OidcDevServicesUtils.getPasswordAccessToken(client, tokenUrl, form.get("client"), form.get("clientSecret"), userName, users.get(userName), KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout); } else { - LOG.infof("Using a client_credentials grant to get a token token from '%s' in realm '%s' with client id '%s'", - keycloakUrl, form.get("realm"), form.get("client")); + LOG.infof("Using a client_credentials grant to get a token token from '%s' with client id '%s'", + tokenUrl, form.get("client")); - token = KeycloakDevServicesUtils.getClientCredAccessToken(client, keycloakUrl, + token = OidcDevServicesUtils.getClientCredAccessToken(client, tokenUrl, form.get("client"), form.get("clientSecret"), KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout); } - LOG.infof("Test token: %s", token); - LOG.infof("Sending token to '%s'", form.get("serviceUrl")); testServiceInternal(event, client, form.get("serviceUrl"), token); } catch (Throwable t) { LOG.errorf("Token can not be acquired from Keycloak: %s", t.toString()); @@ -57,6 +56,8 @@ protected void handlePostAsync(RoutingContext event, MultiMap form) throws Excep private void testServiceInternal(RoutingContext event, WebClient client, String serviceUrl, String token) { try { + LOG.infof("Test token: %s", token); + LOG.infof("Sending token to '%s'", serviceUrl); int statusCode = client.getAbs(serviceUrl) .putHeader(HttpHeaders.AUTHORIZATION.toString(), "Bearer " + token).send().await().indefinitely() .statusCode(); diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java index 67e911d91a10f8..6404c3ba67be71 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java @@ -10,6 +10,8 @@ import io.quarkus.deployment.builditem.RuntimeConfigSetupCompleteBuildItem; import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem; +import io.quarkus.oidc.deployment.devservices.OidcAuthorizationCodePostHandler; +import io.quarkus.oidc.deployment.devservices.OidcTestServiceHandler; public class KeycloakDevConsoleProcessor { @@ -19,21 +21,25 @@ public class KeycloakDevConsoleProcessor { @Consume(RuntimeConfigSetupCompleteBuildItem.class) public void setConfigProperties(BuildProducer console, Optional configProps) { - if (configProps.isPresent()) { - console.produce( - new DevConsoleTemplateInfoBuildItem("devServicesEnabled", config.devservices.enabled)); - console.produce( - new DevConsoleTemplateInfoBuildItem("keycloakUrl", configProps.get().getProperties().get("keycloak.url"))); + if (configProps.isPresent() && configProps.get().getProperties().containsKey("keycloak.url")) { + String keycloakUrl = (String) configProps.get().getProperties().get("keycloak.url"); + String realmUrl = keycloakUrl + "/realms/" + configProps.get().getProperties().get("keycloak.realm"); + + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakUrl", keycloakUrl)); + console.produce(new DevConsoleTemplateInfoBuildItem("keycloakAdminUrl", keycloakUrl)); console.produce(new DevConsoleTemplateInfoBuildItem("oidcApplicationType", configProps.get().getProperties().get("quarkus.oidc.application-type"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakClient", + console.produce(new DevConsoleTemplateInfoBuildItem("clientId", configProps.get().getProperties().get("quarkus.oidc.client-id"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakClientSecret", + console.produce(new DevConsoleTemplateInfoBuildItem("clientSecret", configProps.get().getProperties().get("quarkus.oidc.credentials.secret"))); console.produce( new DevConsoleTemplateInfoBuildItem("keycloakUsers", configProps.get().getProperties().get("oidc.users"))); - console.produce(new DevConsoleTemplateInfoBuildItem("keycloakRealm", config.devservices.realmName)); + console.produce(new DevConsoleTemplateInfoBuildItem("tokenUrl", realmUrl + "/protocol/openid-connect/token")); + console.produce( + new DevConsoleTemplateInfoBuildItem("authorizationUrl", realmUrl + "/protocol/openid-connect/auth")); + console.produce(new DevConsoleTemplateInfoBuildItem("logoutUrl", realmUrl + "/protocol/openid-connect/logout")); console.produce(new DevConsoleTemplateInfoBuildItem("oidcGrantType", config.devservices.grant.type.getGrantType())); } } @@ -41,15 +47,19 @@ public void setConfigProperties(BuildProducer c @BuildStep(onlyIf = IsDevelopment.class) void invokeEndpoint(BuildProducer devConsoleRoute, Optional configProps) { - if (configProps.isPresent()) { + if (configProps.isPresent() && configProps.get().getProperties().containsKey("keycloak.url")) { @SuppressWarnings("unchecked") Map users = (Map) configProps.get().getProperties().get("oidc.users"); devConsoleRoute.produce( new DevConsoleRouteBuildItem("testService", "POST", new KeycloakDevConsolePostHandler(users))); devConsoleRoute.produce( - new DevConsoleRouteBuildItem("testServiceWithToken", "POST", new KeycloakImplicitGrantPostHandler())); + new DevConsoleRouteBuildItem("testServiceWithToken", "POST", + new OidcTestServiceHandler(KeycloakDevServicesProcessor.vertxInstance, + KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout))); devConsoleRoute.produce( - new DevConsoleRouteBuildItem("exchangeCodeForTokens", "POST", new KeycloakAuthorizationCodePostHandler())); + new DevConsoleRouteBuildItem("exchangeCodeForTokens", "POST", + new OidcAuthorizationCodePostHandler(KeycloakDevServicesProcessor.vertxInstance, + KeycloakDevServicesProcessor.capturedDevServicesConfiguration.webClienTimeout))); } } } diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java index 1a0658f65fe06e..111a2857704e0a 100644 --- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java +++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevServicesProcessor.java @@ -2,6 +2,10 @@ import java.io.Closeable; import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -41,15 +45,21 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem; import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem; +import io.quarkus.deployment.builditem.LaunchModeBuildItem; +import io.quarkus.deployment.console.ConsoleInstalledBuildItem; +import io.quarkus.deployment.console.StartupLogCompressor; import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig; +import io.quarkus.deployment.logging.LoggingSetupBuildItem; import io.quarkus.devservices.common.ContainerAddress; import io.quarkus.devservices.common.ContainerLocator; import io.quarkus.oidc.deployment.OidcBuildStep.IsEnabled; import io.quarkus.oidc.deployment.devservices.OidcDevServicesBuildItem; +import io.quarkus.oidc.deployment.devservices.OidcDevServicesUtils; import io.quarkus.runtime.LaunchMode; import io.quarkus.runtime.configuration.ConfigUtils; import io.vertx.core.Vertx; import io.vertx.core.http.HttpHeaders; +import io.vertx.core.json.JsonObject; import io.vertx.mutiny.core.buffer.Buffer; import io.vertx.mutiny.ext.web.client.HttpResponse; import io.vertx.mutiny.ext.web.client.WebClient; @@ -67,6 +77,7 @@ public class KeycloakDevServicesProcessor { private static final String CLIENT_ID_CONFIG_KEY = CONFIG_PREFIX + "client-id"; private static final String CLIENT_SECRET_CONFIG_KEY = CONFIG_PREFIX + "credentials.secret"; private static final String KEYCLOAK_URL_KEY = "keycloak.url"; + private static final String KEYCLOAK_REALM_KEY = "keycloak.realm"; private static final int KEYCLOAK_PORT = 8080; private static final String JAVA_OPTS = "JAVA_OPTS"; @@ -93,13 +104,17 @@ public class KeycloakDevServicesProcessor { private static volatile String capturedKeycloakUrl; private static volatile FileTime capturedRealmFileLastModifiedDate; private final IsDockerWorking isDockerWorking = new IsDockerWorking(true); + private static volatile KeycloakDevServicesConfigBuildItem existingDevServiceConfig; @BuildStep(onlyIfNot = IsNormal.class, onlyIf = { IsEnabled.class, GlobalDevServicesConfig.Enabled.class }) public KeycloakDevServicesConfigBuildItem startKeycloakContainer( Optional devServicesSharedNetworkBuildItem, BuildProducer devServices, Optional oidcProviderBuildItem, - KeycloakBuildTimeConfig config) { + KeycloakBuildTimeConfig config, + LaunchModeBuildItem launchMode, + Optional consoleInstalledBuildItem, + LoggingSetupBuildItem loggingSetupBuildItem) { if (oidcProviderBuildItem.isPresent()) { // Dev Services for the alternative OIDC provider are enabled @@ -121,7 +136,7 @@ public KeycloakDevServicesConfigBuildItem startKeycloakContainer( } } if (!restartRequired) { - return null; + return existingDevServiceConfig; } for (Closeable closeable : closeables) { try { @@ -133,62 +148,73 @@ public KeycloakDevServicesConfigBuildItem startKeycloakContainer( closeables = null; capturedDevServicesConfiguration = null; capturedKeycloakUrl = null; + existingDevServiceConfig = null; } capturedDevServicesConfiguration = currentDevServicesConfiguration; + StartResult startResult; + StartupLogCompressor compressor = new StartupLogCompressor( + (launchMode.isTest() ? "(test) " : "") + "KeyCloak Dev Services Starting:", + consoleInstalledBuildItem, loggingSetupBuildItem); + try { + startResult = startContainer(devServicesSharedNetworkBuildItem.isPresent()); + if (startResult == null) { + return null; + } - StartResult startResult = startContainer(devServicesSharedNetworkBuildItem.isPresent()); - if (startResult == null) { - return null; - } - - closeables = startResult.closeable != null ? Collections.singletonList(startResult.closeable) : null; - - if (first) { - first = false; - Runnable closeTask = new Runnable() { - @Override - public void run() { - if (closeables != null) { - for (Closeable closeable : closeables) { + closeables = startResult.closeable != null ? Collections.singletonList(startResult.closeable) : null; + + if (first) { + first = false; + Runnable closeTask = new Runnable() { + @Override + public void run() { + if (closeables != null) { + for (Closeable closeable : closeables) { + try { + closeable.close(); + } catch (Throwable t) { + LOG.error("Failed to stop Keycloak container", t); + } + } + } + if (vertxInstance != null) { try { - closeable.close(); + vertxInstance.close(); } catch (Throwable t) { - LOG.error("Failed to stop Keycloak container", t); + LOG.error("Failed to close Vertx instance", t); } } + first = true; + closeables = null; + capturedDevServicesConfiguration = null; + vertxInstance = null; + capturedRealmFileLastModifiedDate = null; } - if (vertxInstance != null) { - try { - vertxInstance.close(); - } catch (Throwable t) { - LOG.error("Failed to close Vertx instance", t); - } - } - first = true; - closeables = null; - capturedDevServicesConfiguration = null; - vertxInstance = null; - capturedRealmFileLastModifiedDate = null; - } - }; - QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); - ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); - } + }; + QuarkusClassLoader cl = (QuarkusClassLoader) Thread.currentThread().getContextClassLoader(); + ((QuarkusClassLoader) cl.parent()).addCloseTask(closeTask); + } - capturedKeycloakUrl = startResult.url + "/auth"; - if (vertxInstance == null) { - vertxInstance = Vertx.vertx(); + capturedKeycloakUrl = startResult.url + "/auth"; + if (vertxInstance == null) { + vertxInstance = Vertx.vertx(); + } + capturedRealmFileLastModifiedDate = getRealmFileLastModifiedDate(capturedDevServicesConfiguration.realmPath); + compressor.close(); + } catch (Throwable t) { + compressor.closeAndDumpCaptured(); + throw new RuntimeException(t); } - capturedRealmFileLastModifiedDate = getRealmFileLastModifiedDate(capturedDevServicesConfiguration.realmPath); - LOG.info("Dev Services for Keycloak started."); - return prepareConfiguration(startResult.createDefaultRealm, devServices, startResult.shared); + return prepareConfiguration(capturedDevServicesConfiguration.createRealm && startResult.createDefaultRealm, + startResult.realmNameToUse, devServices, startResult.shared); } - private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRealm, + private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRealm, String realmNameToUse, BuildProducer devServices, boolean shared) { - final String authServerUrl = capturedKeycloakUrl + "/realms/" + capturedDevServicesConfiguration.realmName; + final String realmName = realmNameToUse != null ? realmNameToUse : getDefaultRealmName(); + final String authServerUrl = capturedKeycloakUrl + "/realms/" + realmName; String oidcClientId = getOidcClientId(); String oidcClientSecret = getOidcClientSecret(); @@ -206,13 +232,19 @@ private KeycloakDevServicesConfigBuildItem prepareConfiguration(boolean createRe Map configProperties = new HashMap<>(); configProperties.put(KEYCLOAK_URL_KEY, capturedKeycloakUrl); + configProperties.put(KEYCLOAK_REALM_KEY, realmName); configProperties.put(AUTH_SERVER_URL_CONFIG_KEY, authServerUrl); configProperties.put(APPLICATION_TYPE_CONFIG_KEY, oidcApplicationType); configProperties.put(CLIENT_ID_CONFIG_KEY, oidcClientId); configProperties.put(CLIENT_SECRET_CONFIG_KEY, oidcClientSecret); configProperties.put(OIDC_USERS, users); - return new KeycloakDevServicesConfigBuildItem(configProperties); + existingDevServiceConfig = new KeycloakDevServicesConfigBuildItem(configProperties); + return existingDevServiceConfig; + } + + private String getDefaultRealmName() { + return capturedDevServicesConfiguration.realmName.orElse("quarkus"); } private StartResult startContainer(boolean useSharedContainer) { @@ -236,7 +268,7 @@ private StartResult startContainer(boolean useSharedContainer) { } final Optional maybeContainerAddress = keycloakDevModeContainerLocator.locateContainer( - capturedDevServicesConfiguration.realmName, + capturedDevServicesConfiguration.serviceName, capturedDevServicesConfiguration.shared, LaunchMode.current()); @@ -247,6 +279,7 @@ private StartResult startContainer(boolean useSharedContainer) { QuarkusOidcContainer oidcContainer = new QuarkusOidcContainer(dockerImageName, capturedDevServicesConfiguration.port, useSharedContainer, + capturedDevServicesConfiguration.realmName, capturedDevServicesConfiguration.realmPath, capturedDevServicesConfiguration.serviceName, capturedDevServicesConfiguration.shared, @@ -257,6 +290,7 @@ private StartResult startContainer(boolean useSharedContainer) { String url = "http://" + oidcContainer.getHost() + ":" + oidcContainer.getPort(); return new StartResult(url, !oidcContainer.realmFileExists, + oidcContainer.realmNameToUse, new Closeable() { @Override public void close() { @@ -269,7 +303,8 @@ public void close() { }; return maybeContainerAddress - .map(containerAddress -> new StartResult(getSharedContainerUrl(containerAddress), false, null, true)) + .map(containerAddress -> new StartResult(getSharedContainerUrl(containerAddress), false, + null, null, true)) .orElseGet(defaultKeycloakContainerSupplier); } @@ -281,12 +316,14 @@ private String getSharedContainerUrl(ContainerAddress containerAddress) { private static class StartResult { private final String url; private final boolean createDefaultRealm; + private String realmNameToUse; private final Closeable closeable; private final boolean shared; - public StartResult(String url, boolean createDefaultRealm, Closeable closeable, boolean shared) { + public StartResult(String url, boolean createDefaultRealm, String realmNameToUse, Closeable closeable, boolean shared) { this.url = url; this.createDefaultRealm = createDefaultRealm; + this.realmNameToUse = realmNameToUse; this.closeable = closeable; this.shared = shared; } @@ -295,18 +332,22 @@ public StartResult(String url, boolean createDefaultRealm, Closeable closeable, private static class QuarkusOidcContainer extends GenericContainer { private final OptionalInt fixedExposedPort; private final boolean useSharedNetwork; + private final Optional configuredRealmName; private final Optional realmPath; private final String containerLabelValue; private final Optional javaOpts; private final boolean sharedContainer; private boolean realmFileExists; private String hostName = null; + private String realmNameToUse; public QuarkusOidcContainer(DockerImageName dockerImageName, OptionalInt fixedExposedPort, boolean useSharedNetwork, - Optional realmPath, String containerLabelValue, boolean sharedContainer, Optional javaOpts) { + Optional configuredRealmName, Optional realmPath, String containerLabelValue, + boolean sharedContainer, Optional javaOpts) { super(dockerImageName); this.fixedExposedPort = fixedExposedPort; this.useSharedNetwork = useSharedNetwork; + this.configuredRealmName = configuredRealmName; this.realmPath = realmPath; this.containerLabelValue = containerLabelValue; this.sharedContainer = sharedContainer; @@ -343,14 +384,19 @@ protected void configure() { } if (realmPath.isPresent()) { - if (Thread.currentThread().getContextClassLoader().getResource(realmPath.get()) != null) { + URL realmPathUrl = null; + if ((realmPathUrl = Thread.currentThread().getContextClassLoader().getResource(realmPath.get())) != null) { realmFileExists = true; + realmNameToUse = configuredRealmName.isPresent() ? null + : getRealmNameFromRealmFile(realmPathUrl, realmPath.get()); withClasspathResourceMapping(realmPath.get(), KEYCLOAK_DOCKER_REALM_PATH, BindMode.READ_ONLY); addEnv(KEYCLOAK_IMPORT_PROP, KEYCLOAK_DOCKER_REALM_PATH); } else { Path filePath = Paths.get(realmPath.get()); if (Files.exists(filePath)) { realmFileExists = true; + realmNameToUse = configuredRealmName.isPresent() ? null + : getRealmNameFromRealmFile(filePath.toUri(), realmPath.get()); withFileSystemBind(realmPath.get(), KEYCLOAK_DOCKER_REALM_PATH, BindMode.READ_ONLY); addEnv(KEYCLOAK_IMPORT_PROP, KEYCLOAK_DOCKER_REALM_PATH); } else { @@ -362,6 +408,28 @@ protected void configure() { super.setWaitStrategy(Wait.forHttp("/auth").forPort(KEYCLOAK_PORT)); } + private String getRealmNameFromRealmFile(URI uri, String realmPath) { + try { + return getRealmNameFromRealmFile(uri.toURL(), realmPath); + } catch (MalformedURLException ex) { + // Will not happen as this method is called only when it is confirmed the file exists + throw new RuntimeException(ex); + } + } + + private String getRealmNameFromRealmFile(URL url, String realmPath) { + try { + try (InputStream is = url.openStream()) { + JsonObject realmJson = new JsonObject(io.vertx.core.buffer.Buffer.buffer(is.readAllBytes())); + String realmName = realmJson.getString("realm"); + return realmName; + } + } catch (IOException ex) { + LOG.errorf("Realm %s resource can not be opened: %s", realmPath, ex.getMessage()); + } + return null; + } + @Override public String getHost() { if (useSharedNetwork) { @@ -401,9 +469,9 @@ private void createRealm(String keycloakUrl, Map users, String o realm.getUsers().add(createUser(entry.getKey(), entry.getValue(), getUserRoles(entry.getKey()))); } - WebClient client = KeycloakDevServicesUtils.createWebClient(); + WebClient client = OidcDevServicesUtils.createWebClient(vertxInstance); try { - String token = KeycloakDevServicesUtils.getPasswordAccessToken(client, + String token = OidcDevServicesUtils.getPasswordAccessToken(client, keycloakUrl + "/realms/master/protocol/openid-connect/token", "admin-cli", null, "admin", "admin", capturedDevServicesConfiguration.webClienTimeout); @@ -444,7 +512,7 @@ private String[] getUserRoles(String user) { private RealmRepresentation createRealmRep() { RealmRepresentation realm = new RealmRepresentation(); - realm.setRealm(capturedDevServicesConfiguration.realmName); + realm.setRealm(getDefaultRealmName()); realm.setEnabled(true); realm.setUsers(new ArrayList<>()); realm.setClients(new ArrayList<>()); diff --git a/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html b/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html index 69c0914f3782ef..bc2b692b4d3475 100644 --- a/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html +++ b/extensions/oidc/deployment/src/main/resources/dev-templates/embedded.html @@ -6,5 +6,8 @@ Provider: Keycloak -{#else} +{#else if info:authorizationUrl??} + + + Dev Console {/if} diff --git a/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html b/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html index 14779285ad7470..ff78e4b8353619 100644 --- a/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html +++ b/extensions/oidc/deployment/src/main/resources/dev-templates/provider.html @@ -1,5 +1,11 @@ {#include main fluid=true} -{#title}Keycloak{/title} +{#title} +{#if info:keycloakUrl??} +Keycloak +{#else} +OpenId Connect Dev Console +{/if} +{/title} {#script} var port = {config:property('quarkus.http.port')}; @@ -28,8 +34,8 @@ loggedIn === true; $('.implicitLoggedOut').hide(); $('.implicitLoggedIn').show(); - var hash = window.location.hash; - var code = hash.match(/code=([^&]+)/)[1]; + var search = window.location.search; + var code = search.match(/code=([^&]+)/)[1]; exchangeCodeForTokens(code); }else{ loggedIn === false; @@ -71,18 +77,18 @@ return false; } - function signInToKeycloakAndGetTokens() { + function signInToOidcProviderAndGetTokens() { {#if info:oidcGrantType is 'implicit'} - window.location.href = '{info:keycloakUrl}' + "/realms/" + '{info:keycloakRealm}' + "/protocol/openid-connect/auth" - + "?client_id=" + '{info:keycloakClient}' + window.location.href = '{info:authorizationUrl}' + + "?client_id=" + '{info:clientId}' + "&redirect_uri=" + "http%3A%2F%2Flocalhost%3A" + port + "%2Fq%2Fdev%2Fio.quarkus.quarkus-oidc%2Fprovider" - + "&scope=openid&response_type=token id_token&response_mode=fragment&prompt=login" + + "&scope=openid&response_type=token id_token&response_mode=query&prompt=login" + "&nonce=" + makeid(); {#else} - window.location.href = '{info:keycloakUrl}' + "/realms/" + '{info:keycloakRealm}' + "/protocol/openid-connect/auth" - + "?client_id=" + '{info:keycloakClient}' + window.location.href = '{info:authorizationUrl}' + + "?client_id=" + '{info:clientId}' + "&redirect_uri=" + "http%3A%2F%2Flocalhost%3A" + port + "%2Fq%2Fdev%2Fio.quarkus.quarkus-oidc%2Fprovider" - + "&scope=openid&response_type=code&response_mode=fragment&prompt=login" + + "&scope=openid&response_type=code&response_mode=query&prompt=login" + "&nonce=" + makeid(); {/if} } @@ -140,17 +146,16 @@ } function logout() { - window.location.assign('{info:keycloakUrl}' + "/realms/" + '{info:keycloakRealm}' + "/protocol/openid-connect/logout" + window.location.assign('{info:logoutUrl??}' + "?post_logout_redirect_uri=" + "http%3A%2F%2Flocalhost%3A" + port + "%2Fq%2Fdev%2Fio.quarkus.quarkus-oidc%2Fprovider"); } function exchangeCodeForTokens(code){ $.post("exchangeCodeForTokens", { - keycloakUrl: '{info:keycloakUrl}', - realm: '{info:keycloakRealm}', - client: '{info:keycloakClient}', - clientSecret: '{info:keycloakClientSecret}', + tokenUrl: '{info:tokenUrl}', + client: '{info:clientId}', + clientSecret: '{info:clientSecret}', authorizationCode: code, redirectUri: "http://localhost:" + port + "/q/dev/io.quarkus.quarkus-oidc/provider" }, @@ -178,7 +183,9 @@ userName = jsonPayload.preferred_username; } if (userName) { - $('#loggedInUser').append(" Logged in as " + userName); + $('#loggedInUser').append("Logged in as " + userName + " "); + } else { + $('#loggedInUser').append("Logged in "); } } return "

" + 
@@ -212,11 +219,10 @@
     function testServiceWithPassword(userName, servicePath){
         $.post("testService",
             {
-              keycloakUrl: '{info:keycloakUrl}',
+              tokenUrl: '{info:tokenUrl}',
               serviceUrl: "http://localhost:" + port + servicePath,
-              realm: '{info:keycloakRealm}',
-              client: '{info:keycloakClient}',
-              clientSecret: '{info:keycloakClientSecret}',
+              client: '{info:clientId}',
+              clientSecret: '{info:clientSecret}',
               user: userName,
               grant: '{info:oidcGrantType}'
             },
@@ -230,11 +236,10 @@
     function testServiceWithClientCredentials(servicePath) {
         $.post("testService",
             {
-              keycloakUrl: '{info:keycloakUrl}',
+              tokenUrl: '{info:tokenUrl}',
               serviceUrl: "http://localhost:" + port + servicePath,
-              realm: '{info:keycloakRealm}',
-              client: '{info:keycloakClient}',
-              clientSecret: '{info:keycloakClientSecret}',
+              client: '{info:clientId}',
+              clientSecret: '{info:clientSecret}',
               grant: '{info:oidcGrantType}'
             },
             function(data, status){
@@ -264,9 +269,9 @@
 {#body}
 

 
-{#if info:keycloakUrl??}
+{#if info:keycloakAdminUrl??}
 

-    
+    
         Keycloak Admin
     
 

@@ -278,7 +283,7 @@
         
         

             

-                
+                
                      Log into Single Page Application
                 
             

@@ -289,9 +294,12 @@
                     Your tokens
                 

                 

-                    
-                        
+                    
+                    {#if info:logoutUrl??}
+                    
+                        
                     
+                    {/if}
                 

             
             

@@ -430,7 +438,7 @@ 
Decoded

     {#else if info:oidcGrantType is 'client_credentials'}
         

             

-                Get access token for {info:keycloakClient} and test your service
+                Get access token for {info:clientId} and test your service
             

             

                 

diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java
index fe82852eafb169..5cb10d6bf605f9 100644
--- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java
+++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeDefaultTenantTestCase.java
@@ -40,15 +40,15 @@ public void testAccessAndRefreshTokenInjectionDevMode() throws IOException, Inte
 
             try {
                 webClient.getPage("http://localhost:8080/protected");
-                fail("Exception is expected because auth-server-url is not available and the authentication can not be completed");
+                fail("Exception is expected because by default the bearer token is required");
             } catch (FailingHttpStatusCodeException ex) {
                 // Reported by Quarkus
-                assertEquals(500, ex.getStatusCode());
+                assertEquals(401, ex.getStatusCode());
             }
 
-            // Enable auth-server-url
+            // Enable 'web-app' application type
             test.modifyResourceFile("application.properties",
-                    s -> s.replace("#quarkus.oidc.auth-server-url", "quarkus.oidc.auth-server-url"));
+                    s -> s.replace("#quarkus.oidc.application-type=web-app", "quarkus.oidc.application-type=web-app"));
 
             HtmlPage page = webClient.getPage("http://localhost:8080/protected");
 
diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java
index 1d55d0df736eea..ed0704e02aae7e 100644
--- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java
+++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CodeFlowDevModeTestCase.java
@@ -1,10 +1,12 @@
 package io.quarkus.oidc.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
+import java.net.URI;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -14,6 +16,8 @@
 import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
 import com.gargoylesoftware.htmlunit.SilentCssErrorHandler;
 import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.WebRequest;
+import com.gargoylesoftware.htmlunit.WebResponse;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
@@ -87,6 +91,12 @@ public void testAccessAndRefreshTokenInjectionDevMode() throws IOException, Inte
 
             assertEquals("custom", page.getWebClient().getCookieManager().getCookie("q_session").getValue().split("\\|")[3]);
 
+            webClient.getOptions().setRedirectEnabled(false);
+            WebResponse webResponse = webClient
+                    .loadWebResponse(new WebRequest(URI.create("http://localhost:8080/protected/logout").toURL()));
+            assertEquals(302, webResponse.getStatusCode());
+            assertNull(webClient.getCookieManager().getCookie("q_session"));
+
             webClient.getCookieManager().clearCookies();
         }
     }
diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java
index 220d89e1ff0edc..4a57c25770a12b 100644
--- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java
+++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/CustomTokenStateManager.java
@@ -8,6 +8,7 @@
 import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.TokenStateManager;
 import io.quarkus.oidc.runtime.DefaultTokenStateManager;
+import io.smallrye.mutiny.Uni;
 import io.vertx.ext.web.RoutingContext;
 
 @ApplicationScoped
@@ -18,25 +19,29 @@ public class CustomTokenStateManager implements TokenStateManager {
     DefaultTokenStateManager tokenStateManager;
 
     @Override
-    public String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
-            AuthorizationCodeTokens sessionContent) {
-        return tokenStateManager.createTokenState(routingContext, oidcConfig, sessionContent) + "|custom";
+    public Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            AuthorizationCodeTokens sessionContent, TokenStateManager.CreateTokenStateRequestContext requestContext) {
+        return tokenStateManager.createTokenState(routingContext, oidcConfig, sessionContent, requestContext)
+                .map(t -> (t + "|custom"));
     }
 
     @Override
-    public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig,
-            String tokenState) {
+    public Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            String tokenState, TokenStateManager.GetTokensRequestContext requestContext) {
         if (!tokenState.endsWith("|custom")) {
             throw new IllegalStateException();
         }
         String defaultState = tokenState.substring(0, tokenState.length() - 7);
-        return tokenStateManager.getTokens(routingContext, oidcConfig, defaultState);
+        return tokenStateManager.getTokens(routingContext, oidcConfig, defaultState, requestContext);
     }
 
     @Override
-    public void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+    public Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState,
+            TokenStateManager.DeleteTokensRequestContext requestContext) {
         if (!tokenState.endsWith("|custom")) {
             throw new IllegalStateException();
         }
+        String defaultState = tokenState.substring(0, tokenState.length() - 7);
+        return tokenStateManager.deleteTokens(routingContext, oidcConfig, defaultState, requestContext);
     }
 }
diff --git a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java
index fa87a328bd5c83..9c1c73e03987bc 100644
--- a/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java
+++ b/extensions/oidc/deployment/src/test/java/io/quarkus/oidc/test/ProtectedResource.java
@@ -28,4 +28,10 @@ public String getName() {
     public String getTenantName(@PathParam("id") String tenantId) {
         return tenantId + ":" + idToken.getName();
     }
+
+    @GET
+    @Path("logout")
+    public void logout() {
+        throw new RuntimeException("Logout must be handled by CodeAuthenticationMechanism");
+    }
 }
diff --git a/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties b/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties
index 989e5ebc777c83..2853d435e676f6 100644
--- a/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties
+++ b/extensions/oidc/deployment/src/test/resources/application-dev-mode-default-tenant.properties
@@ -1,9 +1,6 @@
-#quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus
 quarkus.oidc.client-id=quarkus-web-app
 quarkus.oidc.credentials.secret=secret
-quarkus.oidc.application-type=web-app
-
-quarkus.keycloak.devservices.enabled=false
+#quarkus.oidc.application-type=web-app
 
 quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL
 
diff --git a/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties b/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties
index 15b1c51e72f529..ee7c873dd6e01f 100644
--- a/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties
+++ b/extensions/oidc/deployment/src/test/resources/application-dev-mode.properties
@@ -5,6 +5,7 @@ quarkus.oidc.client-id=client-dev
 quarkus.oidc.credentials.client-secret.provider.name=vault-secret-provider
 quarkus.oidc.credentials.client-secret.provider.key=secret-from-vault
 quarkus.oidc.application-type=web-app
+quarkus.oidc.logout.path=/protected/logout
 
 quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=FATAL
 
diff --git a/extensions/oidc/runtime/pom.xml b/extensions/oidc/runtime/pom.xml
index 162f0a5c95ea4e..d0d4cb9319de46 100644
--- a/extensions/oidc/runtime/pom.xml
+++ b/extensions/oidc/runtime/pom.xml
@@ -11,7 +11,7 @@
 
     quarkus-oidc
     Quarkus - OpenID Connect Adapter - Runtime
-    Secure your applications with OpenID Connect Adapter
+    Verify Bearer access tokens and authenticate users with Authorization Code Flow
     
         
             io.quarkus
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java
index c0f9143cef2f97..59fa463895eed0 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TenantConfigResolver.java
@@ -21,10 +21,12 @@ public interface TenantConfigResolver {
      *
      * @param context the routing context
      * @return the tenant configuration. If {@code null}, indicates that the default configuration/tenant should be chosen
+     *
+     * @deprecated Use {@link #resolve(RoutingContext, TenantConfigRequestContext))} instead.
      */
     @Deprecated
     default OidcTenantConfig resolve(RoutingContext context) {
-        throw new UnsupportedOperationException("resolve not implemented");
+        throw new UnsupportedOperationException("resolve is not implemented");
     }
 
     /**
@@ -39,10 +41,10 @@ default Uni resolve(RoutingContext routingContext, TenantConfi
     }
 
     /**
-     * A context object that can be used to run blocking tasks
+     * A context object that can be used to run blocking tasks.
      * 

-     * Blocking config providers should used this context object to run blocking tasks, to prevent excessive and
-     * unnecessary delegation to thread pools
+     * Blocking {@code TenantConfigResolver} providers should use this context object to run blocking tasks, to prevent
+     * excessive and unnecessary delegation to thread pools.
      */
     interface TenantConfigRequestContext {
 
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java
index 94cf60539cc73b..ecda06f10e225e 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/TokenStateManager.java
@@ -1,5 +1,8 @@
 package io.quarkus.oidc;
 
+import java.util.function.Supplier;
+
+import io.smallrye.mutiny.Uni;
 import io.vertx.ext.web.RoutingContext;
 
 /**
@@ -13,9 +16,125 @@
  */
 public interface TokenStateManager {
 
-    String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig, AuthorizationCodeTokens tokens);
+    /**
+     * Convert the authorization code flow tokens into a token state.
+     *
+     * @param routingContext the request context
+     * @param oidcConfig the tenant configuration
+     * @param tokens the authorization code flow tokens
+     *
+     * @return the token state
+     *
+     * @deprecated Use
+     *             {@link #createTokenState(RoutingContext, OidcTenantConfig, AuthorizationCodeTokens, CreateTokenStateRequestContext)}
+     *
+     */
+    @Deprecated
+    default String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            AuthorizationCodeTokens tokens) {
+        throw new UnsupportedOperationException("createTokenState is not implemented");
+    }
+
+    /**
+     * Convert the authorization code flow tokens into a token state.
+     *
+     * @param routingContext the request context
+     * @param oidcConfig the tenant configuration
+     * @param tokens the authorization code flow tokens
+     * @param requestContext the request context
+     *
+     * @return the token state
+     */
+    default Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            AuthorizationCodeTokens tokens, CreateTokenStateRequestContext requestContext) {
+        return Uni.createFrom().item(createTokenState(routingContext, oidcConfig, tokens));
+    }
+
+    /**
+     * Convert the token state into the authorization code flow tokens.
+     *
+     * @param routingContext the request context
+     * @param oidcConfig the tenant configuration
+     * @param tokens the token state
+     *
+     * @return the authorization code flow tokens
+     *
+     * @deprecated Use {@link #getTokens(RoutingContext, OidcTenantConfig, String, GetTokensRequestContext)} instead.
+     */
+    @Deprecated
+    default AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+        throw new UnsupportedOperationException("getTokens is not implemented");
+    }
+
+    /**
+     * Convert the token state into the authorization code flow tokens.
+     *
+     * @param routingContext the request context
+     * @param oidcConfig the tenant configuration
+     * @param tokens the token state
+     * @param requestContext the request context
+     *
+     * @return the authorization code flow tokens
+     */
+    default Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            String tokenState, GetTokensRequestContext requestContext) {
+        return Uni.createFrom().item(getTokens(routingContext, oidcConfig, tokenState));
+    }
+
+    /**
+     * Delete the token state.
+     *
+     * @param routingContext the request context
+     * @param oidcConfig the tenant configuration
+     * @param tokens the token state
+     *
+     * @deprecated Use {@link #deleteTokens(RoutingContext, OidcTenantConfig, String, DeleteTokensRequestContext)} instead
+     */
+    @Deprecated
+    default void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+        throw new UnsupportedOperationException("deleteTokens is not implemented");
+    }
+
+    /**
+     * Delete the token state.
+     *
+     * @param routingContext the request context
+     * @param oidcConfig the tenant configuration
+     * @param tokens the token state
+     */
+    default Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState,
+            DeleteTokensRequestContext requestContext) {
+        deleteTokens(routingContext, oidcConfig, tokenState);
+        return Uni.createFrom().voidItem();
+    }
+
+    /**
+     * A context object that can be used to create a token state by running a blocking task.
+     * 

+     * Blocking providers should use this context to prevent excessive and unnecessary delegation to thread pools.
+     */
+    interface CreateTokenStateRequestContext {
+
+        Uni runBlocking(Supplier function);
+    }
+
+    /**
+     * A context object that can be used to convert the token state to the tokens by running a blocking task.
+     * 

+     * Blocking providers should use this context to prevent excessive and unnecessary delegation to thread pools.
+     */
+    interface GetTokensRequestContext {
+
+        Uni runBlocking(Supplier function);
+    }
 
-    AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState);
+    /**
+     * A context object that can be used to delete the token state by running a blocking task.
+     * 

+     * Blocking providers should use this context to prevent excessive and unnecessary delegation to thread pools.
+     */
+    interface DeleteTokensRequestContext {
 
-    void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState);
+        Uni runBlocking(Supplier function);
+    }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
index cb4bb8ccd77016..8e6e5e656fa491 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
@@ -10,7 +10,9 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.BiFunction;
+import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
 import org.jboss.logging.Logger;
@@ -23,8 +25,11 @@
 import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.OidcTenantConfig.Authentication;
 import io.quarkus.oidc.SecurityEvent;
+import io.quarkus.oidc.TokenStateManager;
 import io.quarkus.oidc.common.runtime.OidcCommonUtils;
 import io.quarkus.oidc.common.runtime.OidcConstants;
+import io.quarkus.runtime.BlockingOperationControl;
+import io.quarkus.runtime.ExecutorRecorder;
 import io.quarkus.security.AuthenticationCompletionException;
 import io.quarkus.security.AuthenticationFailedException;
 import io.quarkus.security.AuthenticationRedirectException;
@@ -32,6 +37,7 @@
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.vertx.http.runtime.security.ChallengeData;
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.subscription.UniEmitter;
 import io.vertx.core.http.Cookie;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.impl.CookieImpl;
@@ -47,12 +53,17 @@ public class CodeAuthenticationMechanism extends AbstractOidcAuthenticationMecha
     static final Pattern COOKIE_PATTERN = Pattern.compile("\\" + COOKIE_DELIM);
     static final String SESSION_COOKIE_NAME = "q_session";
     static final String SESSION_MAX_AGE_PARAM = "session-max-age";
+    static final Uni VOID_UNI = Uni.createFrom().voidItem();
 
     private static final Logger LOG = Logger.getLogger(CodeAuthenticationMechanism.class);
 
     private static final String STATE_COOKIE_NAME = "q_auth";
     private static final String POST_LOGOUT_COOKIE_NAME = "q_post_logout";
 
+    private final CreateTokenStateRequestContext createTokenStateRequestContext = new CreateTokenStateRequestContext();
+    private final GetTokensRequestContext getTokenStateRequestContext = new GetTokensRequestContext();
+    private final DeleteTokensRequestContext deleteTokensRequestContext = new DeleteTokensRequestContext();
+
     public Uni authenticate(RoutingContext context,
             IdentityProviderManager identityProviderManager) {
         return resolver.resolveConfig(context).chain(new Function>() {
@@ -96,51 +107,60 @@ private Uni reAuthenticate(Cookie sessionCookie,
             IdentityProviderManager identityProviderManager,
             TenantConfigContext configContext) {
 
-        AuthorizationCodeTokens session = resolver.getTokenStateManager().getTokens(context, configContext.oidcConfig,
-                sessionCookie.getValue());
-
-        context.put(OidcConstants.ACCESS_TOKEN_VALUE, session.getAccessToken());
-        context.put(AuthorizationCodeTokens.class.getName(), session);
-        return authenticate(identityProviderManager, context, new IdTokenCredential(session.getIdToken(), context))
-                .map(new Function() {
-                    @Override
-                    public SecurityIdentity apply(SecurityIdentity identity) {
-                        if (isLogout(context, configContext)) {
-                            fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity);
-                            throw redirectToLogoutEndpoint(context, configContext, session.getIdToken());
-                        }
-                        return identity;
-                    }
-                }).onFailure().recoverWithUni(new Function>() {
+        return resolver.getTokenStateManager().getTokens(context, configContext.oidcConfig,
+                sessionCookie.getValue(), getTokenStateRequestContext)
+                .chain(new Function>() {
                     @Override
-                    public Uni apply(Throwable t) {
-                        if (t instanceof AuthenticationRedirectException) {
-                            throw (AuthenticationRedirectException) t;
-                        }
+                    public Uni apply(AuthorizationCodeTokens session) {
+                        context.put(OidcConstants.ACCESS_TOKEN_VALUE, session.getAccessToken());
+                        context.put(AuthorizationCodeTokens.class.getName(), session);
+                        return authenticate(identityProviderManager, context,
+                                new IdTokenCredential(session.getIdToken(), context))
+                                        .call(new Function>() {
+                                            @Override
+                                            public Uni apply(SecurityIdentity identity) {
+                                                if (isLogout(context, configContext)) {
+                                                    fireEvent(SecurityEvent.Type.OIDC_LOGOUT_RP_INITIATED, identity);
+                                                    return buildLogoutRedirectUriUni(context, configContext,
+                                                            session.getIdToken());
+                                                }
+                                                return VOID_UNI;
+                                            }
+                                        }).onFailure()
+                                        .recoverWithUni(new Function>() {
+                                            @Override
+                                            public Uni apply(Throwable t) {
+                                                if (t instanceof AuthenticationRedirectException) {
+                                                    throw (AuthenticationRedirectException) t;
+                                                }
 
-                        if (!(t instanceof TokenAutoRefreshException)) {
-                            boolean expired = (t.getCause() instanceof InvalidJwtException)
-                                    && ((InvalidJwtException) t.getCause()).hasErrorCode(ErrorCodes.EXPIRED);
+                                                if (!(t instanceof TokenAutoRefreshException)) {
+                                                    boolean expired = (t.getCause() instanceof InvalidJwtException)
+                                                            && ((InvalidJwtException) t.getCause())
+                                                                    .hasErrorCode(ErrorCodes.EXPIRED);
 
-                            if (!expired) {
-                                LOG.debugf("Authentication failure: %s", t.getCause());
-                                throw new AuthenticationCompletionException(t.getCause());
-                            }
-                            if (!configContext.oidcConfig.token.refreshExpired) {
-                                LOG.debug("Token has expired, token refresh is not allowed");
-                                throw new AuthenticationCompletionException(t.getCause());
-                            }
-                            LOG.debug("Token has expired, trying to refresh it");
-                            return refreshSecurityIdentity(configContext, session.getRefreshToken(), context,
-                                    identityProviderManager, false, null);
-                        } else {
-                            return refreshSecurityIdentity(configContext, session.getRefreshToken(), context,
-                                    identityProviderManager, true,
-                                    ((TokenAutoRefreshException) t).getSecurityIdentity());
-                        }
+                                                    if (!expired) {
+                                                        LOG.debugf("Authentication failure: %s", t.getCause());
+                                                        throw new AuthenticationCompletionException(t.getCause());
+                                                    }
+                                                    if (!configContext.oidcConfig.token.refreshExpired) {
+                                                        LOG.debug("Token has expired, token refresh is not allowed");
+                                                        throw new AuthenticationCompletionException(t.getCause());
+                                                    }
+                                                    LOG.debug("Token has expired, trying to refresh it");
+                                                    return refreshSecurityIdentity(configContext, session.getRefreshToken(),
+                                                            context,
+                                                            identityProviderManager, false, null);
+                                                } else {
+                                                    return refreshSecurityIdentity(configContext, session.getRefreshToken(),
+                                                            context,
+                                                            identityProviderManager, true,
+                                                            ((TokenAutoRefreshException) t).getSecurityIdentity());
+                                                }
+                                            }
+                                        });
                     }
                 });
-
     }
 
     private boolean isJavaScript(RoutingContext context) {
@@ -168,54 +188,63 @@ public Uni apply(TenantConfigContext tenantContext) {
     }
 
     public Uni getChallengeInternal(RoutingContext context, TenantConfigContext configContext) {
-        removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig));
-
-        if (!shouldAutoRedirect(configContext, context)) {
-            // If the client (usually an SPA) wants to handle the redirect manually, then
-            // return status code 499 and WWW-Authenticate header with the 'OIDC' value.
-            return Uni.createFrom().item(new ChallengeData(499, "WWW-Authenticate", "OIDC"));
-        }
-
-        StringBuilder codeFlowParams = new StringBuilder();
-
-        // response_type
-        codeFlowParams.append(OidcConstants.CODE_FLOW_RESPONSE_TYPE).append(EQ).append(OidcConstants.CODE_FLOW_CODE);
-
-        // client_id
-        codeFlowParams.append(AMP).append(OidcConstants.CLIENT_ID).append(EQ)
-                .append(OidcCommonUtils.urlEncode(configContext.oidcConfig.clientId.get()));
-
-        // scope
-        List scopes = new ArrayList<>();
-        scopes.add("openid");
-        configContext.oidcConfig.getAuthentication().scopes.ifPresent(scopes::addAll);
-        codeFlowParams.append(AMP).append(OidcConstants.TOKEN_SCOPE).append(EQ)
-                .append(OidcCommonUtils.urlEncode(String.join(" ", scopes)));
-
-        // redirect_uri
-        String redirectPath = getRedirectPath(configContext, context);
-        String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath);
-        LOG.debugf("Authentication request redirect_uri parameter: %s", redirectUriParam);
+        return removeSessionCookie(context, configContext, getSessionCookieName(configContext.oidcConfig))
+                .chain(new Function>() {
 
-        codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_REDIRECT_URI).append(EQ)
-                .append(OidcCommonUtils.urlEncode(redirectUriParam));
+                    @Override
+                    public Uni apply(Void t) {
+                        if (!shouldAutoRedirect(configContext, context)) {
+                            // If the client (usually an SPA) wants to handle the redirect manually, then
+                            // return status code 499 and WWW-Authenticate header with the 'OIDC' value.
+                            return Uni.createFrom().item(new ChallengeData(499, "WWW-Authenticate", "OIDC"));
+                        }
 
-        // state
-        codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_STATE).append(EQ)
-                .append(generateCodeFlowState(context, configContext, redirectPath));
+                        StringBuilder codeFlowParams = new StringBuilder();
+
+                        // response_type
+                        codeFlowParams.append(OidcConstants.CODE_FLOW_RESPONSE_TYPE).append(EQ)
+                                .append(OidcConstants.CODE_FLOW_CODE);
+
+                        // client_id
+                        codeFlowParams.append(AMP).append(OidcConstants.CLIENT_ID).append(EQ)
+                                .append(OidcCommonUtils.urlEncode(configContext.oidcConfig.clientId.get()));
+
+                        // scope
+                        List scopes = new ArrayList<>();
+                        scopes.add("openid");
+                        configContext.oidcConfig.getAuthentication().scopes.ifPresent(scopes::addAll);
+                        codeFlowParams.append(AMP).append(OidcConstants.TOKEN_SCOPE).append(EQ)
+                                .append(OidcCommonUtils.urlEncode(String.join(" ", scopes)));
+
+                        // redirect_uri
+                        String redirectPath = getRedirectPath(configContext, context);
+                        String redirectUriParam = buildUri(context, isForceHttps(configContext), redirectPath);
+                        LOG.debugf("Authentication request redirect_uri parameter: %s", redirectUriParam);
+
+                        codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_REDIRECT_URI).append(EQ)
+                                .append(OidcCommonUtils.urlEncode(redirectUriParam));
+
+                        // state
+                        codeFlowParams.append(AMP).append(OidcConstants.CODE_FLOW_STATE).append(EQ)
+                                .append(generateCodeFlowState(context, configContext, redirectPath));
+
+                        // extra redirect parameters, see https://openid.net/specs/openid-connect-core-1_0.html#AuthRequests
+                        if (configContext.oidcConfig.authentication.getExtraParams() != null) {
+                            for (Map.Entry entry : configContext.oidcConfig.authentication.getExtraParams()
+                                    .entrySet()) {
+                                codeFlowParams.append(AMP).append(entry.getKey()).append(EQ)
+                                        .append(OidcCommonUtils.urlEncode(entry.getValue()));
+                            }
+                        }
 
-        // extra redirect parameters, see https://openid.net/specs/openid-connect-core-1_0.html#AuthRequests
-        if (configContext.oidcConfig.authentication.getExtraParams() != null) {
-            for (Map.Entry entry : configContext.oidcConfig.authentication.getExtraParams().entrySet()) {
-                codeFlowParams.append(AMP).append(entry.getKey()).append(EQ)
-                        .append(OidcCommonUtils.urlEncode(entry.getValue()));
-            }
-        }
+                        String authorizationURL = configContext.provider.getMetadata().getAuthorizationUri() + "?"
+                                + codeFlowParams.toString();
 
-        String authorizationURL = configContext.provider.getMetadata().getAuthorizationUri() + "?" + codeFlowParams.toString();
+                        return Uni.createFrom().item(new ChallengeData(HttpResponseStatus.FOUND.code(), HttpHeaders.LOCATION,
+                                authorizationURL));
+                    }
 
-        return Uni.createFrom().item(new ChallengeData(HttpResponseStatus.FOUND.code(), HttpHeaders.LOCATION,
-                authorizationURL));
+                });
     }
 
     private Uni performCodeFlow(IdentityProviderManager identityProviderManager,
@@ -278,12 +307,16 @@ public Uni apply(final AuthorizationCodeTokens tokens, final T
 
                         return authenticate(identityProviderManager, context,
                                 new IdTokenCredential(tokens.getIdToken(), context))
+                                        .call(new Function>() {
+                                            @Override
+                                            public Uni apply(SecurityIdentity identity) {
+                                                return processSuccessfulAuthentication(context, configContext,
+                                                        tokens, identity);
+                                            }
+                                        })
                                         .map(new Function() {
                                             @Override
                                             public SecurityIdentity apply(SecurityIdentity identity) {
-                                                processSuccessfulAuthentication(context, configContext,
-                                                        tokens, identity);
-
                                                 boolean removeRedirectParams = configContext.oidcConfig.authentication
                                                         .isRemoveRedirectParameters();
                                                 if (removeRedirectParams || finalUserPath != null
@@ -325,31 +358,48 @@ public Throwable apply(Throwable tInner) {
 
     }
 
-    private void processSuccessfulAuthentication(RoutingContext context,
+    private Uni processSuccessfulAuthentication(RoutingContext context,
             TenantConfigContext configContext,
             AuthorizationCodeTokens tokens,
             SecurityIdentity securityIdentity) {
-        removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig));
+        return removeSessionCookie(context, configContext, getSessionCookieName(configContext.oidcConfig))
+                .chain(new Function>() {
 
-        JsonObject idToken = OidcUtils.decodeJwtContent(tokens.getIdToken());
+                    @Override
+                    public Uni apply(Void t) {
+                        JsonObject idToken = OidcUtils.decodeJwtContent(tokens.getIdToken());
 
-        if (!idToken.containsKey("exp") || !idToken.containsKey("iat")) {
-            LOG.debug("ID Token is required to contain 'exp' and 'iat' claims");
-            throw new AuthenticationCompletionException();
-        }
-        long maxAge = idToken.getLong("exp") - idToken.getLong("iat");
-        if (configContext.oidcConfig.token.lifespanGrace.isPresent()) {
-            maxAge += configContext.oidcConfig.token.lifespanGrace.getAsInt();
-        }
-        if (configContext.oidcConfig.token.refreshExpired) {
-            maxAge += configContext.oidcConfig.authentication.sessionAgeExtension.getSeconds();
-        }
-        context.put(SESSION_MAX_AGE_PARAM, maxAge);
-        String cookieValue = resolver.getTokenStateManager()
-                .createTokenState(context, configContext.oidcConfig, tokens);
-        createCookie(context, configContext.oidcConfig, getSessionCookieName(configContext.oidcConfig), cookieValue, maxAge);
+                        if (!idToken.containsKey("exp") || !idToken.containsKey("iat")) {
+                            LOG.debug("ID Token is required to contain 'exp' and 'iat' claims");
+                            throw new AuthenticationCompletionException();
+                        }
+                        long maxAge = idToken.getLong("exp") - idToken.getLong("iat");
+                        if (configContext.oidcConfig.token.lifespanGrace.isPresent()) {
+                            maxAge += configContext.oidcConfig.token.lifespanGrace.getAsInt();
+                        }
+                        if (configContext.oidcConfig.token.refreshExpired) {
+                            maxAge += configContext.oidcConfig.authentication.sessionAgeExtension.getSeconds();
+                        }
+                        final long sessionMaxAge = maxAge;
+                        context.put(SESSION_MAX_AGE_PARAM, maxAge);
+                        return resolver.getTokenStateManager()
+                                .createTokenState(context, configContext.oidcConfig, tokens, createTokenStateRequestContext)
+                                .map(new Function() {
+
+                                    @Override
+                                    public Void apply(String cookieValue) {
+                                        createCookie(context, configContext.oidcConfig,
+                                                getSessionCookieName(configContext.oidcConfig),
+                                                cookieValue, sessionMaxAge);
+                                        fireEvent(SecurityEvent.Type.OIDC_LOGIN, securityIdentity);
+                                        return null;
+                                    }
+
+                                });
+                    }
+
+                });
 
-        fireEvent(SecurityEvent.Type.OIDC_LOGIN, securityIdentity);
     }
 
     private void fireEvent(SecurityEvent.Type eventType, SecurityIdentity securityIdentity) {
@@ -441,14 +491,24 @@ private String buildUri(RoutingContext context, boolean forceHttps, String autho
                 .toString();
     }
 
-    private void removeCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) {
+    private Uni removeSessionCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) {
+        String cookieValue = removeCookie(context, configContext, cookieName);
+        if (cookieValue != null) {
+            return resolver.getTokenStateManager().deleteTokens(context, configContext.oidcConfig, cookieValue,
+                    deleteTokensRequestContext);
+        } else {
+            return VOID_UNI;
+        }
+    }
+
+    private String removeCookie(RoutingContext context, TenantConfigContext configContext, String cookieName) {
         ServerCookie cookie = (ServerCookie) context.cookieMap().get(cookieName);
+        String cookieValue = null;
         if (cookie != null) {
-            if (SESSION_COOKIE_NAME.equals(cookieName)) {
-                resolver.getTokenStateManager().deleteTokens(context, configContext.oidcConfig, cookie.getValue());
-            }
+            cookieValue = cookie.getValue();
             removeCookie(context, cookie, configContext.oidcConfig);
         }
+        return cookieValue;
     }
 
     static void removeCookie(RoutingContext context, ServerCookie cookie, OidcTenantConfig oidcConfig) {
@@ -500,12 +560,17 @@ public Uni apply(final AuthorizationCodeTokens tokens, final T
 
                             return authenticate(identityProviderManager, context,
                                     new IdTokenCredential(tokens.getIdToken(), context))
-                                            .map(new Function() {
+                                            .call(new Function>() {
                                                 @Override
-                                                public SecurityIdentity apply(SecurityIdentity identity) {
+                                                public Uni apply(SecurityIdentity identity) {
                                                     // after a successful refresh, rebuild the identity and update the cookie
-                                                    processSuccessfulAuthentication(context, configContext,
+                                                    return processSuccessfulAuthentication(context, configContext,
                                                             tokens, identity);
+                                                }
+                                            })
+                                            .map(new Function() {
+                                                @Override
+                                                public SecurityIdentity apply(SecurityIdentity identity) {
                                                     fireEvent(autoRefresh ? SecurityEvent.Type.OIDC_SESSION_REFRESHED
                                                             : SecurityEvent.Type.OIDC_SESSION_EXPIRED_AND_REFRESHED,
                                                             identity);
@@ -555,10 +620,15 @@ private boolean isForceHttps(TenantConfigContext configContext) {
         return configContext.oidcConfig.authentication.forceRedirectHttpsScheme;
     }
 
-    private AuthenticationRedirectException redirectToLogoutEndpoint(RoutingContext context, TenantConfigContext configContext,
+    private Uni buildLogoutRedirectUriUni(RoutingContext context, TenantConfigContext configContext,
             String idToken) {
-        removeCookie(context, configContext, getSessionCookieName(configContext.oidcConfig));
-        return new AuthenticationRedirectException(buildLogoutRedirectUri(configContext, idToken, context));
+        return removeSessionCookie(context, configContext, getSessionCookieName(configContext.oidcConfig))
+                .map(new Function() {
+                    @Override
+                    public Void apply(Void t) {
+                        throw new AuthenticationRedirectException(buildLogoutRedirectUri(configContext, idToken, context));
+                    }
+                });
     }
 
     private static String getStateCookieName(TenantConfigContext configContext) {
@@ -580,4 +650,48 @@ static String getCookieSuffix(String tenantId) {
         return !"Default".equals(tenantId) ? "_" + tenantId : "";
     }
 
+    private static class CreateTokenStateRequestContext extends BlockingTaskRunner
+            implements TokenStateManager.CreateTokenStateRequestContext {
+    }
+
+    private static class GetTokensRequestContext extends BlockingTaskRunner
+            implements TokenStateManager.GetTokensRequestContext {
+    }
+
+    private static class DeleteTokensRequestContext extends BlockingTaskRunner
+            implements TokenStateManager.DeleteTokensRequestContext {
+    }
+
+    private static class BlockingTaskRunner {
+        public Uni runBlocking(Supplier function) {
+            return Uni.createFrom().deferred(new Supplier>() {
+                @Override
+                public Uni get() {
+                    if (BlockingOperationControl.isBlockingAllowed()) {
+                        try {
+                            return Uni.createFrom().item(function.get());
+                        } catch (Throwable t) {
+                            return Uni.createFrom().failure(t);
+                        }
+                    } else {
+                        return Uni.createFrom().emitter(new Consumer>() {
+                            @Override
+                            public void accept(UniEmitter uniEmitter) {
+                                ExecutorRecorder.getCurrent().execute(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        try {
+                                            uniEmitter.complete(function.get());
+                                        } catch (Throwable t) {
+                                            uniEmitter.fail(t);
+                                        }
+                                    }
+                                });
+                            }
+                        });
+                    }
+                }
+            });
+        }
+    }
 }
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java
index 2b0a951258c24a..b5f05b044882dd 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/DefaultTokenStateManager.java
@@ -5,6 +5,7 @@
 import io.quarkus.oidc.AuthorizationCodeTokens;
 import io.quarkus.oidc.OidcTenantConfig;
 import io.quarkus.oidc.TokenStateManager;
+import io.smallrye.mutiny.Uni;
 import io.vertx.core.http.Cookie;
 import io.vertx.core.http.impl.ServerCookie;
 import io.vertx.ext.web.RoutingContext;
@@ -16,8 +17,8 @@ public class DefaultTokenStateManager implements TokenStateManager {
     private static final String SESSION_RT_COOKIE_NAME = CodeAuthenticationMechanism.SESSION_COOKIE_NAME + "_rt";
 
     @Override
-    public String createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
-            AuthorizationCodeTokens tokens) {
+    public Uni createTokenState(RoutingContext routingContext, OidcTenantConfig oidcConfig,
+            AuthorizationCodeTokens tokens, TokenStateManager.CreateTokenStateRequestContext requestContext) {
         StringBuilder sb = new StringBuilder();
         sb.append(tokens.getIdToken());
         if (oidcConfig.tokenStateManager.strategy == OidcTenantConfig.TokenStateManager.Strategy.KEEP_ALL_TOKENS) {
@@ -56,11 +57,12 @@ public String createTokenState(RoutingContext routingContext, OidcTenantConfig o
                 }
             }
         }
-        return sb.toString();
+        return Uni.createFrom().item(sb.toString());
     }
 
     @Override
-    public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+    public Uni getTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState,
+            TokenStateManager.GetTokensRequestContext requestContext) {
         String[] tokens = CodeAuthenticationMechanism.COOKIE_PATTERN.split(tokenState);
         String idToken = tokens[0];
 
@@ -91,17 +93,19 @@ public AuthorizationCodeTokens getTokens(RoutingContext routingContext, OidcTena
             }
         }
 
-        return new AuthorizationCodeTokens(idToken, accessToken, refreshToken);
+        return Uni.createFrom().item(new AuthorizationCodeTokens(idToken, accessToken, refreshToken));
     }
 
     @Override
-    public void deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState) {
+    public Uni deleteTokens(RoutingContext routingContext, OidcTenantConfig oidcConfig, String tokenState,
+            TokenStateManager.DeleteTokensRequestContext requestContext) {
         if (oidcConfig.tokenStateManager.splitTokens) {
             CodeAuthenticationMechanism.removeCookie(routingContext, getAccessTokenCookie(routingContext, oidcConfig),
                     oidcConfig);
             CodeAuthenticationMechanism.removeCookie(routingContext, getRefreshTokenCookie(routingContext, oidcConfig),
                     oidcConfig);
         }
+        return CodeAuthenticationMechanism.VOID_UNI;
     }
 
     private static ServerCookie getAccessTokenCookie(RoutingContext routingContext, OidcTenantConfig oidcConfig) {
diff --git a/extensions/opentelemetry/opentelemetry/deployment/pom.xml b/extensions/opentelemetry/opentelemetry/deployment/pom.xml
index c066a7c1f65030..f124d4a8646183 100644
--- a/extensions/opentelemetry/opentelemetry/deployment/pom.xml
+++ b/extensions/opentelemetry/opentelemetry/deployment/pom.xml
@@ -69,12 +69,6 @@
             quarkus-resteasy-deployment
             test
         
-        
-            io.quarkus
-            quarkus-vertx-http-deployment
-            test
-            test-jar
-        
         
             io.quarkus
             quarkus-smallrye-health-deployment
diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java
index 8f213de335f5c3..8345afa9615b9e 100644
--- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java
+++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryContinuousTestingTest.java
@@ -7,9 +7,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 
 public class OpenTelemetryContinuousTestingTest {
     @RegisterExtension
diff --git a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
index 801673acdb8721..b7dc348682d116 100644
--- a/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
+++ b/extensions/opentelemetry/opentelemetry/deployment/src/test/java/io/quarkus/opentelemetry/deployment/OpenTelemetryDevModeTest.java
@@ -8,8 +8,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 import io.restassured.RestAssured;
 
 public class OpenTelemetryDevModeTest {
diff --git a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java
index 9d34efb149b285..5f43898887b75e 100644
--- a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java
+++ b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/restclient/ClientTracingFilter.java
@@ -26,7 +26,7 @@
 
 @Priority(Priorities.HEADER_DECORATOR)
 public class ClientTracingFilter implements ClientRequestFilter, ClientResponseFilter {
-    private static final TextMapPropagator TEXT_MAP_PROPAGATOR = GlobalOpenTelemetry.getPropagators().getTextMapPropagator();
+    private final TextMapPropagator TEXT_MAP_PROPAGATOR = GlobalOpenTelemetry.getPropagators().getTextMapPropagator();
 
     private static final String SCOPE_KEY = ClientTracingFilter.class.getName() + ".scope";
     private static final String SPAN_KEY = ClientTracingFilter.class.getName() + ".span";
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java
index 8672238e57defe..ea251d1fcc9136 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/java/io/quarkus/hibernate/orm/panache/deployment/test/PanacheJAXBTest.java
@@ -17,6 +17,7 @@
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,7 +31,9 @@ public class PanacheJAXBTest {
     @RegisterExtension
     static QuarkusUnitTest runner = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(JAXBEntity.class, JAXBTestResource.class));
+                    .addClasses(JAXBEntity.class, JAXBTestResource.class)
+                    .addAsResource(new StringAsset("quarkus.hibernate-orm.database.generation=none"),
+                            "application.properties"));
 
     @Test
     public void testJaxbAnnotationTransfer() throws Exception {
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
index cbcb3eec5ffa3e..d6b78c1f0c86d0 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-erroneous-multiple-persistence-units.properties
@@ -1,5 +1,5 @@
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+quarkus.datasource.jdbc.url=jdbc:h2:mem:first;DB_CLOSE_DELAY=-1
 
 quarkus.datasource.second.db-kind=h2
 quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
index d257a345b938f0..7111224eafffe8 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units-for-repository.properties
@@ -1,5 +1,5 @@
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+quarkus.datasource.jdbc.url=jdbc:h2:mem:first;DB_CLOSE_DELAY=-1
 
 quarkus.datasource.repository.db-kind=h2
 quarkus.datasource.repository.jdbc.url=jdbc:h2:mem:repository;DB_CLOSE_DELAY=-1
diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
index 777cc071973323..2a5bbd813f0532 100644
--- a/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
+++ b/extensions/panache/hibernate-orm-panache/deployment/src/test/resources/application-multiple-persistence-units.properties
@@ -1,5 +1,5 @@
 quarkus.datasource.db-kind=h2
-quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1
+quarkus.datasource.jdbc.url=jdbc:h2:mem:first;DB_CLOSE_DELAY=-1
 
 quarkus.datasource.second.db-kind=h2
 quarkus.datasource.second.jdbc.url=jdbc:h2:mem:second;DB_CLOSE_DELAY=-1
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
index 0a23562bece626..da7f91a34c697e 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/pom.xml
@@ -37,7 +37,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jsonb-deployment
+            quarkus-resteasy-reactive-jsonb-deployment
             test
         
         
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java
index 5af71d2b4b5112..72c049a936f071 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java
+++ b/extensions/panache/hibernate-orm-rest-data-panache/deployment/src/main/java/io/quarkus/hibernate/orm/rest/data/panache/deployment/HibernateOrmPanacheRestProcessor.java
@@ -5,6 +5,8 @@
 import java.lang.reflect.Modifier;
 import java.util.List;
 
+import javax.ws.rs.Priorities;
+
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
@@ -23,9 +25,10 @@
 import io.quarkus.hibernate.orm.rest.data.panache.PanacheRepositoryResource;
 import io.quarkus.hibernate.orm.rest.data.panache.runtime.RestDataPanacheExceptionMapper;
 import io.quarkus.hibernate.orm.rest.data.panache.runtime.jta.TransactionalUpdateExecutor;
+import io.quarkus.rest.data.panache.RestDataPanacheException;
 import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
 import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem;
-import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 
 class HibernateOrmPanacheRestProcessor {
 
@@ -41,8 +44,9 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() {
-        return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName());
+    ExceptionMapperBuildItem registerRestDataPanacheExceptionMapper() {
+        return new ExceptionMapperBuildItem(RestDataPanacheExceptionMapper.class.getName(),
+                RestDataPanacheException.class.getName(), Priorities.USER + 100, false);
     }
 
     @BuildStep
diff --git a/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml b/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml
index 64b292a742ffe1..b0aa7a2a9e871d 100644
--- a/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml
+++ b/extensions/panache/hibernate-orm-rest-data-panache/runtime/pom.xml
@@ -22,6 +22,10 @@
             io.quarkus
             quarkus-hibernate-orm-panache
         
+        
+            jakarta.validation
+            jakarta.validation-api
+        
     
 
     
diff --git a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java
index 684a70d9ca9a2f..f2764201458b79 100644
--- a/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java
+++ b/extensions/panache/mongodb-rest-data-panache/deployment/src/main/java/io/quarkus/mongodb/rest/data/panache/deployment/MongoPanacheRestProcessor.java
@@ -5,6 +5,8 @@
 import java.lang.reflect.Modifier;
 import java.util.List;
 
+import javax.ws.rs.Priorities;
+
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
@@ -27,9 +29,10 @@
 import io.quarkus.mongodb.rest.data.panache.PanacheMongoRepositoryResource;
 import io.quarkus.mongodb.rest.data.panache.runtime.NoopUpdateExecutor;
 import io.quarkus.mongodb.rest.data.panache.runtime.RestDataPanacheExceptionMapper;
+import io.quarkus.rest.data.panache.RestDataPanacheException;
 import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
 import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem;
-import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 
 class MongoPanacheRestProcessor {
 
@@ -45,8 +48,9 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() {
-        return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName());
+    ExceptionMapperBuildItem registerRestDataPanacheExceptionMapper() {
+        return new ExceptionMapperBuildItem(RestDataPanacheExceptionMapper.class.getName(),
+                RestDataPanacheException.class.getName(), Priorities.USER + 100, false);
     }
 
     @BuildStep
diff --git a/extensions/panache/rest-data-panache/deployment/pom.xml b/extensions/panache/rest-data-panache/deployment/pom.xml
index d3b0d7ec113a8a..56e8cd354bce5e 100644
--- a/extensions/panache/rest-data-panache/deployment/pom.xml
+++ b/extensions/panache/rest-data-panache/deployment/pom.xml
@@ -23,7 +23,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-deployment
+            quarkus-resteasy-reactive-links-deployment
         
         
             io.quarkus
@@ -66,4 +66,4 @@
             
         
     
-
\ No newline at end of file
+
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java
index 5b9ae46ff75d09..4a26a76f87d24f 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java
@@ -3,16 +3,12 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.jboss.resteasy.links.impl.EL;
-
-import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
-import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.gizmo.ClassOutput;
 import io.quarkus.jackson.spi.JacksonModuleBuildItem;
 import io.quarkus.jsonb.spi.JsonbSerializerBuildItem;
@@ -28,14 +24,21 @@
 import io.quarkus.rest.data.panache.runtime.hal.HalLink;
 import io.quarkus.rest.data.panache.runtime.hal.HalLinkJacksonSerializer;
 import io.quarkus.rest.data.panache.runtime.hal.HalLinkJsonbSerializer;
+import io.quarkus.resteasy.reactive.server.deployment.GeneratedJaxRsResourceGizmoAdaptor;
+import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
 
 public class RestDataProcessor {
 
+    @BuildStep
+    ReflectiveClassBuildItem registerReflection() {
+        return new ReflectiveClassBuildItem(true, true, HalLink.class);
+    }
+
     @BuildStep
     void implementResources(CombinedIndexBuildItem index, List resourceBuildItems,
             List resourcePropertiesBuildItems, Capabilities capabilities,
-            BuildProducer implementationsProducer) {
-        ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer);
+            BuildProducer implementationsProducer) {
+        ClassOutput classOutput = new GeneratedJaxRsResourceGizmoAdaptor(implementationsProducer);
         JaxRsResourceImplementor jaxRsResourceImplementor = new JaxRsResourceImplementor(hasValidatorCapability(capabilities));
         ResourcePropertiesProvider resourcePropertiesProvider = new ResourcePropertiesProvider(index.getIndex());
 
@@ -71,11 +74,6 @@ JsonbSerializerBuildItem registerJsonbSerializers() {
                 HalLinkJsonbSerializer.class.getName()));
     }
 
-    @BuildStep
-    RuntimeInitializedClassBuildItem el() {
-        return new RuntimeInitializedClassBuildItem(EL.class.getCanonicalName());
-    }
-
     private ResourceProperties getResourceProperties(ResourcePropertiesProvider resourcePropertiesProvider,
             ResourceMetadata resourceMetadata, List resourcePropertiesBuildItems) {
         for (ResourcePropertiesBuildItem resourcePropertiesBuildItem : resourcePropertiesBuildItems) {
@@ -92,7 +90,7 @@ private boolean hasValidatorCapability(Capabilities capabilities) {
     }
 
     private boolean hasHalCapability(Capabilities capabilities) {
-        return capabilities.isPresent(Capability.RESTEASY_JSON_JSONB)
-                || capabilities.isPresent(Capability.RESTEASY_JSON_JACKSON);
+        return capabilities.isPresent(Capability.RESTEASY_REACTIVE_JSON_JSONB)
+                || capabilities.isPresent(Capability.RESTEASY_REACTIVE_JSON_JACKSON);
     }
 }
diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
index bc2c937f65c195..eef6fd4c1602dc 100644
--- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
+++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/StandardMethodImplementor.java
@@ -12,7 +12,7 @@
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Context;
 
-import org.jboss.resteasy.links.LinkResource;
+import org.jboss.logging.Logger;
 
 import io.quarkus.gizmo.AnnotatedElement;
 import io.quarkus.gizmo.AnnotationCreator;
@@ -25,12 +25,15 @@
 import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
 import io.quarkus.rest.data.panache.deployment.properties.ResourceProperties;
 import io.quarkus.rest.data.panache.runtime.sort.SortQueryParamValidator;
+import io.quarkus.resteasy.reactive.links.RestLink;
 
 /**
  * A standard JAX-RS method implementor.
  */
 public abstract class StandardMethodImplementor implements MethodImplementor {
 
+    private static final Logger LOGGER = Logger.getLogger(StandardMethodImplementor.class);
+
     /**
      * Implement exposed JAX-RS method.
      */
@@ -78,9 +81,15 @@ protected void addDeleteAnnotation(AnnotatedElement element) {
     }
 
     protected void addLinksAnnotation(AnnotatedElement element, String entityClassName, String rel) {
-        AnnotationCreator linkResource = element.addAnnotation(LinkResource.class);
-        linkResource.addValue("entityClassName", entityClassName);
-        linkResource.addValue("rel", rel);
+        AnnotationCreator linkResource = element.addAnnotation(RestLink.class);
+        Class entityClass;
+        try {
+            entityClass = Thread.currentThread().getContextClassLoader().loadClass(entityClassName);
+            linkResource.addValue("entityType", entityClass);
+            linkResource.addValue("rel", rel);
+        } catch (ClassNotFoundException e) {
+            LOGGER.error("Unable to create links for entity: '" + entityClassName + "'", e);
+        }
     }
 
     protected void addPathAnnotation(AnnotatedElement element, String value) {
diff --git a/extensions/panache/rest-data-panache/runtime/pom.xml b/extensions/panache/rest-data-panache/runtime/pom.xml
index 9183fc75e140ce..b6666464f792c8 100644
--- a/extensions/panache/rest-data-panache/runtime/pom.xml
+++ b/extensions/panache/rest-data-panache/runtime/pom.xml
@@ -19,17 +19,7 @@
         
         
             io.quarkus
-            quarkus-resteasy
-        
-        
-            org.jboss.resteasy
-            resteasy-links
-            
-                
-                    jakarta.activation
-                    jakarta.activation-api
-                
-            
+            quarkus-resteasy-reactive-links
         
         
             io.quarkus
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java
index b0c31d39d09c01..8efc74b8b5d833 100644
--- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/hal/HalEntityWrapperJacksonSerializer.java
@@ -32,22 +32,19 @@ public void serialize(HalEntityWrapper wrapper, JsonGenerator generator, Seriali
         for (BeanPropertyDefinition property : getPropertyDefinitions(serializers, wrapper.getEntity().getClass())) {
             AnnotatedMember accessor = property.getAccessor();
             if (accessor != null) {
-                writeValue(property.getName(), accessor.getValue(wrapper.getEntity()), generator);
+                Object value = accessor.getValue(wrapper.getEntity());
+                generator.writeFieldName(property.getName());
+                if (value == null) {
+                    generator.writeNull();
+                } else {
+                    serializers.findValueSerializer(value.getClass()).serialize(value, generator, serializers);
+                }
             }
         }
         writeLinks(wrapper.getEntity(), generator);
         generator.writeEndObject();
     }
 
-    private void writeValue(String name, Object value, JsonGenerator generator) throws IOException {
-        generator.writeFieldName(name);
-        if (value == null) {
-            generator.writeNull();
-        } else {
-            generator.writeObject(value);
-        }
-    }
-
     private void writeLinks(Object entity, JsonGenerator generator) throws IOException {
         Map links = linksExtractor.getLinks(entity);
         generator.writeFieldName("_links");
diff --git a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java
index 7712a422385feb..fcc202f939842f 100644
--- a/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java
+++ b/extensions/panache/rest-data-panache/runtime/src/main/java/io/quarkus/rest/data/panache/runtime/resource/ResourceLinksProvider.java
@@ -1,41 +1,51 @@
 package io.quarkus.rest.data.panache.runtime.resource;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.resteasy.links.LinksProvider;
-import org.jboss.resteasy.links.RESTServiceDiscovery;
+import javax.ws.rs.core.Link;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.resteasy.reactive.links.RestLinksProvider;
 
 public final class ResourceLinksProvider {
 
     private static final String SELF_REF = "self";
 
     public Map getClassLinks(Class className) {
-        RESTServiceDiscovery links = LinksProvider
-                .getClassLinksProvider()
-                .getLinks(className, Thread.currentThread().getContextClassLoader());
-        return linksToMap(links);
+        return linksToMap(restLinksProvider().getTypeLinks(className));
     }
 
     public Map getInstanceLinks(Object instance) {
-        RESTServiceDiscovery links = LinksProvider
-                .getObjectLinksProvider()
-                .getLinks(instance, Thread.currentThread().getContextClassLoader());
-        return linksToMap(links);
+        return linksToMap(restLinksProvider().getInstanceLinks(instance));
     }
 
     public String getSelfLink(Object instance) {
-        RESTServiceDiscovery.AtomLink link = LinksProvider.getObjectLinksProvider()
-                .getLinks(instance, Thread.currentThread().getContextClassLoader())
-                .getLinkForRel(SELF_REF);
-        return link == null ? null : link.getHref();
+        Collection links = restLinksProvider().getInstanceLinks(instance);
+        for (Link link : links) {
+            if (SELF_REF.equals(link.getRel())) {
+                return link.getUri().toString();
+            }
+        }
+        return null;
+    }
+
+    private RestLinksProvider restLinksProvider() {
+        InstanceHandle instance = Arc.container().instance(RestLinksProvider.class);
+        if (instance.isAvailable()) {
+            return instance.get();
+        }
+        throw new IllegalStateException("Invalid use of '" + this.getClass().getName()
+                + "'. No request scope bean found for type '" + ResourceLinksProvider.class.getName() + "'");
     }
 
-    private Map linksToMap(RESTServiceDiscovery serviceDiscovery) {
-        Map links = new HashMap<>(serviceDiscovery.size());
-        for (RESTServiceDiscovery.AtomLink atomLink : serviceDiscovery) {
-            links.put(atomLink.getRel(), atomLink.getHref());
+    private Map linksToMap(Collection links) {
+        Map result = new HashMap<>();
+        for (Link link : links) {
+            result.put(link.getRel(), link.getUri().toString());
         }
-        return links;
+        return result;
     }
 }
diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java
index 59ab3f35e74cde..88ae8efea84d26 100644
--- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java
+++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/AbstractSerializersTest.java
@@ -17,7 +17,9 @@ abstract class AbstractSerializersTest {
 
     @Test
     void shouldSerializeOneBook() {
-        Book book = new Book(1, "Black Swan");
+        int id = 1;
+        String title = "Black Swan";
+        Book book = usePublishedBook() ? new PublishedBook(id, title) : new Book(id, title);
         JsonReader jsonReader = Json.createReader(new StringReader(toJson(new HalEntityWrapper(book))));
 
         assertBook(book, jsonReader.readObject());
@@ -25,7 +27,9 @@ void shouldSerializeOneBook() {
 
     @Test
     void shouldSerializeOneBookWithNullName() {
-        Book book = new Book(1, null);
+        int id = 1;
+        String title = null;
+        Book book = usePublishedBook() ? new PublishedBook(id, title) : new Book(id, title);
         JsonReader jsonReader = Json.createReader(new StringReader(toJson(new HalEntityWrapper(book))));
 
         assertBook(book, jsonReader.readObject());
@@ -33,7 +37,9 @@ void shouldSerializeOneBookWithNullName() {
 
     @Test
     void shouldSerializeCollectionOfBooks() {
-        Book book = new Book(1, "Black Swan");
+        int id = 1;
+        String title = "Black Swan";
+        Book book = usePublishedBook() ? new PublishedBook(id, title) : new Book(id, title);
         HalCollectionWrapper wrapper = new HalCollectionWrapper(Collections.singleton(book), Book.class, "books");
         JsonReader jsonReader = Json.createReader(new StringReader(toJson(wrapper)));
         JsonObject collectionJson = jsonReader.readObject();
@@ -60,4 +66,6 @@ private void assertBook(Book book, JsonObject bookJson) {
         assertThat(bookLinksJson.getJsonObject("list").getString("href")).isEqualTo("/books");
         assertThat(bookLinksJson.getJsonObject("add").getString("href")).isEqualTo("/books");
     }
+
+    protected abstract boolean usePublishedBook();
 }
diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java
index cdab327d344746..2b444463d25a5f 100644
--- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java
+++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JacksonSerializersTest.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 class JacksonSerializersTest extends AbstractSerializersTest {
 
@@ -18,6 +19,7 @@ void setup() {
         module.addSerializer(HalCollectionWrapper.class,
                 new HalCollectionWrapperJacksonSerializer(new BookHalLinksProvider()));
         objectMapper.registerModule(module);
+        objectMapper.registerModule(new JavaTimeModule());
     }
 
     @Override
@@ -28,4 +30,9 @@ String toJson(Object object) {
             throw new RuntimeException(e);
         }
     }
+
+    @Override
+    protected boolean usePublishedBook() {
+        return true;
+    }
 }
diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java
index ae87e78a65e0cc..5884f3b5894c73 100644
--- a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java
+++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/JsonbSerializersTest.java
@@ -22,4 +22,9 @@ void setup() {
     String toJson(Object object) {
         return jsonb.toJson(object);
     }
-}
\ No newline at end of file
+
+    @Override
+    protected boolean usePublishedBook() {
+        return false;
+    }
+}
diff --git a/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java
new file mode 100644
index 00000000000000..38ff69b5463d1c
--- /dev/null
+++ b/extensions/panache/rest-data-panache/runtime/src/test/java/io/quarkus/rest/data/panache/runtime/hal/PublishedBook.java
@@ -0,0 +1,13 @@
+package io.quarkus.rest.data.panache.runtime.hal;
+
+import java.time.LocalDate;
+import java.time.Month;
+
+public class PublishedBook extends Book {
+
+    public LocalDate publicationDate = LocalDate.of(2021, Month.AUGUST, 31);
+
+    public PublishedBook(long id, String name) {
+        super(id, name);
+    }
+}
diff --git a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java
index 79b95041a3a7b3..33393a9dd5bceb 100644
--- a/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java
+++ b/extensions/picocli/runtime/src/main/java/io/quarkus/picocli/runtime/PicocliRunner.java
@@ -36,6 +36,11 @@ public PicocliRunner(CommandLine commandLine, Event par
 
     @Override
     public int run(String... args) throws Exception {
-        return commandLine.execute(args);
+        try {
+            return commandLine.execute(args);
+        } finally {
+            commandLine.getOut().flush();
+            commandLine.getErr().flush();
+        }
     }
 }
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 03e4923b78cb8f..d20956728e9eac 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -175,6 +175,7 @@
         
         flyway
         liquibase
+        liquibase-mongodb
 
         
         vault
diff --git a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
index f0edb1dc239344..e1d0cda173e61c 100644
--- a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
+++ b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/DevServicesRedisProcessor.java
@@ -28,7 +28,10 @@
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.DevServicesSharedNetworkBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.redis.client.deployment.RedisBuildTimeConfig.DevServiceConfiguration;
 import io.quarkus.redis.client.runtime.RedisClientUtil;
@@ -60,7 +63,9 @@ public class DevServicesRedisProcessor {
     @BuildStep(onlyIfNot = IsNormal.class, onlyIf = { GlobalDevServicesConfig.Enabled.class })
     public void startRedisContainers(LaunchModeBuildItem launchMode,
             Optional devServicesSharedNetworkBuildItem,
-            BuildProducer devConfigProducer, RedisBuildTimeConfig config) {
+            BuildProducer devConfigProducer, RedisBuildTimeConfig config,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         Map currentDevServicesConfiguration = new HashMap<>(config.additionalDevServices);
         currentDevServicesConfiguration.put(RedisClientUtil.DEFAULT_CLIENT, config.defaultDevService);
@@ -85,17 +90,28 @@ public void startRedisContainers(LaunchModeBuildItem launchMode,
 
         capturedDevServicesConfiguration = currentDevServicesConfiguration;
         List currentCloseables = new ArrayList<>();
-        for (Entry entry : currentDevServicesConfiguration.entrySet()) {
-            String connectionName = entry.getKey();
-            StartResult startResult = startContainer(connectionName, entry.getValue().devservices, launchMode.getLaunchMode(),
-                    devServicesSharedNetworkBuildItem.isPresent());
-            if (startResult == null) {
-                continue;
+
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Redis Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            for (Entry entry : currentDevServicesConfiguration.entrySet()) {
+                String connectionName = entry.getKey();
+                StartResult startResult = startContainer(connectionName, entry.getValue().devservices,
+                        launchMode.getLaunchMode(),
+                        devServicesSharedNetworkBuildItem.isPresent());
+                if (startResult == null) {
+                    continue;
+                }
+                currentCloseables.add(startResult.closeable);
+                String configKey = getConfigPrefix(connectionName) + RedisConfig.HOSTS_CONFIG_NAME;
+                devConfigProducer.produce(new DevServicesConfigResultBuildItem(configKey, startResult.url));
+                log.infof("The %s redis server is ready to accept connections on %s", connectionName, startResult.url);
             }
-            currentCloseables.add(startResult.closeable);
-            String configKey = getConfigPrefix(connectionName) + RedisConfig.HOSTS_CONFIG_NAME;
-            devConfigProducer.produce(new DevServicesConfigResultBuildItem(configKey, startResult.url));
-            log.infof("The %s redis server is ready to accept connections on %s", connectionName, startResult.url);
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
 
         closeables = currentCloseables;
diff --git a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java
index cc4bf24082679e..695c001f11b966 100644
--- a/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java
+++ b/extensions/resteasy-classic/resteasy-common/runtime/src/main/java/io/quarkus/resteasy/common/runtime/QuarkusInjectorFactory.java
@@ -28,6 +28,10 @@ public class QuarkusInjectorFactory extends InjectorFactoryImpl {
     @SuppressWarnings("rawtypes")
     @Override
     public ConstructorInjector createConstructor(Constructor constructor, ResteasyProviderFactory providerFactory) {
+        if (constructor == null) {
+            throw new IllegalStateException(
+                    "Unable to locate proper constructor for dynamically registered provider. Make sure the class has a no-args constructor and that it uses '@Context' for field injection if necessary.");
+        }
         log.debugf("Create constructor: %s", constructor);
         return new QuarkusConstructorInjector(constructor, super.createConstructor(constructor, providerFactory));
     }
diff --git a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java
index 16b31619285581..16cf244beafc9f 100644
--- a/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java
+++ b/extensions/resteasy-classic/resteasy/deployment/src/main/java/io/quarkus/resteasy/deployment/RestPathAnnotationProcessor.java
@@ -1,5 +1,6 @@
 package io.quarkus.resteasy.deployment;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
@@ -18,6 +19,7 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.metrics.MetricsCapabilityBuildItem;
+import io.quarkus.resteasy.common.spi.ResteasyDotNames;
 import io.quarkus.resteasy.runtime.QuarkusRestPathTemplate;
 import io.quarkus.resteasy.runtime.QuarkusRestPathTemplateInterceptor;
 import io.quarkus.resteasy.server.common.spi.ResteasyJaxrsConfigBuildItem;
@@ -81,14 +83,22 @@ public void transform(TransformationContext ctx) {
 
                 AnnotationInstance annotation = methodInfo.annotation(REST_PATH);
                 if (annotation == null) {
-                    return;
+                    // Check for @Path on class and not method
+                    if (!isRestEndpointMethod(methodInfo.annotations())) {
+                        return;
+                    }
                 }
                 // Don't create annotations for rest clients
                 if (classInfo.classAnnotation(REGISTER_REST_CLIENT) != null) {
                     return;
                 }
 
-                StringBuilder stringBuilder = new StringBuilder(slashify(annotation.value().asString()));
+                StringBuilder stringBuilder;
+                if (annotation != null) {
+                    stringBuilder = new StringBuilder(slashify(annotation.value().asString()));
+                } else {
+                    stringBuilder = new StringBuilder();
+                }
 
                 // Look for @Path annotation on the class
                 annotation = classInfo.classAnnotation(REST_PATH);
@@ -128,6 +138,19 @@ String slashify(String path) {
         return '/' + path;
     }
 
+    boolean isRestEndpointMethod(List annotations) {
+        boolean isRestEndpointMethod = false;
+
+        for (AnnotationInstance annotation : annotations) {
+            if (ResteasyDotNames.JAXRS_METHOD_ANNOTATIONS.contains(annotation.name())) {
+                isRestEndpointMethod = true;
+                break;
+            }
+        }
+
+        return isRestEndpointMethod;
+    }
+
     private boolean notRequired(Capabilities capabilities,
             Optional metricsCapability) {
         return capabilities.isMissing(Capability.RESTEASY) ||
diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
index 815441cbad7502..e843d538face91 100644
--- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
+++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
@@ -146,6 +146,9 @@ public class JaxrsClientReactiveProcessor {
             String.class, Object.class);
     private static final MethodDescriptor MULTIVALUED_MAP_ADD = MethodDescriptor.ofMethod(MultivaluedMap.class, "add",
             void.class, Object.class, Object.class);
+    private static final MethodDescriptor PATH_GET_FILENAME = MethodDescriptor.ofMethod(Path.class, "getFileName",
+            Path.class);
+    private static final MethodDescriptor OBJECT_TO_STRING = MethodDescriptor.ofMethod(Object.class, "toString", String.class);
 
     static final DotName CONTINUATION = DotName.createSimple("kotlin.coroutines.Continuation");
     private static final DotName UNI_KT = DotName.createSimple("io.smallrye.mutiny.coroutines.UniKt");
@@ -502,7 +505,11 @@ A more full example of generated client (with sub-resource) can is at the bottom
                     ClassInfo subResourceInterface = index.getClassByName(returnType.name());
                     if (!Modifier.isInterface(subResourceInterface.flags())) {
                         throw new IllegalArgumentException(
-                                "Sub resource type is not an interface: " + returnType.name().toString());
+                                "Client interface method: " + jandexMethod.declaringClass().name() + "#" + jandexMethod
+                                        + " has no HTTP method annotation  (@GET, @POST, etc) and it's return type: "
+                                        + returnType.name().toString() + " is not an interface. "
+                                        + "If it's a sub resource method, it has to return an interface. "
+                                        + "If it's not, it has to have one of the HTTP method annotations.");
                     }
                     // generate implementation for a method from the jaxrs interface:
                     MethodCreator methodCreator = c.getMethodCreator(method.getName(), method.getSimpleReturnType(),
@@ -989,7 +996,7 @@ private ResultHandle createMultipartForm(MethodCreator methodCreator, ResultHand
                                             formClass.name() + "." + field.name());
                         }
                         ResultHandle filePath = methodCreator.invokeVirtualMethod(
-                                MethodDescriptor.ofMethod(File.class, "getPath", String.class), fieldValue);
+                                MethodDescriptor.ofMethod(File.class, "toPath", Path.class), fieldValue);
                         addFile(methodCreator, multipartForm, formParamName, partType, filePath);
                     } else if (is(PATH, fieldClass, index)) {
                         // and so is path
@@ -998,9 +1005,7 @@ private ResultHandle createMultipartForm(MethodCreator methodCreator, ResultHand
                                     "No @PartType annotation found on multipart form field of type Path: " +
                                             formClass.name() + "." + field.name());
                         }
-                        ResultHandle filePath = methodCreator.invokeInterfaceMethod(
-                                MethodDescriptor.ofMethod(Path.class, "toString", String.class), fieldValue);
-                        addFile(methodCreator, multipartForm, formParamName, partType, filePath);
+                        addFile(methodCreator, multipartForm, formParamName, partType, fieldValue);
                     } else if (is(BUFFER, fieldClass, index)) {
                         // and buffer
                         addBuffer(methodCreator, multipartForm, formParamName, partType, fieldValue, field);
@@ -1047,6 +1052,9 @@ private ResultHandle createMultipartForm(MethodCreator methodCreator, ResultHand
      */
     private void addFile(MethodCreator methodCreator, AssignableResultHandle multipartForm, String formParamName,
             String partType, ResultHandle filePath) {
+        ResultHandle fileNamePath = methodCreator.invokeInterfaceMethod(PATH_GET_FILENAME, filePath);
+        ResultHandle fileName = methodCreator.invokeVirtualMethod(OBJECT_TO_STRING, fileNamePath);
+        ResultHandle pathString = methodCreator.invokeVirtualMethod(OBJECT_TO_STRING, filePath);
         if (partType.equalsIgnoreCase(MediaType.APPLICATION_OCTET_STREAM)) {
             methodCreator.assign(multipartForm,
                     // MultipartForm#binaryFileUpload(String name, String filename, String pathname, String mediaType);
@@ -1055,8 +1063,8 @@ private void addFile(MethodCreator methodCreator, AssignableResultHandle multipa
                             MethodDescriptor.ofMethod(MultipartForm.class, "binaryFileUpload",
                                     MultipartForm.class, String.class, String.class, String.class,
                                     String.class),
-                            multipartForm, methodCreator.load(formParamName), methodCreator.load(formParamName),
-                            filePath, methodCreator.load(partType)));
+                            multipartForm, methodCreator.load(formParamName), fileName,
+                            pathString, methodCreator.load(partType)));
         } else {
             methodCreator.assign(multipartForm,
                     // MultipartForm#textFileUpload(String name, String filename, String pathname, String mediaType);;
@@ -1065,8 +1073,8 @@ private void addFile(MethodCreator methodCreator, AssignableResultHandle multipa
                             MethodDescriptor.ofMethod(MultipartForm.class, "textFileUpload",
                                     MultipartForm.class, String.class, String.class, String.class,
                                     String.class),
-                            multipartForm, methodCreator.load(formParamName), methodCreator.load(formParamName),
-                            filePath, methodCreator.load(partType)));
+                            multipartForm, methodCreator.load(formParamName), fileName,
+                            pathString, methodCreator.load(partType)));
         }
     }
 
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java
new file mode 100644
index 00000000000000..7d69199960335c
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/JaxRsResourceIndexBuildItem.java
@@ -0,0 +1,23 @@
+package io.quarkus.resteasy.reactive.common.deployment;
+
+import org.jboss.jandex.IndexView;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Represents the index that is going to be used to look up JAX-RS Resources.
+ * This index contains both code that is present on disk at build time,
+ * and code that is generated by other extensions.
+ */
+public final class JaxRsResourceIndexBuildItem extends SimpleBuildItem {
+
+    private final IndexView indexView;
+
+    public JaxRsResourceIndexBuildItem(IndexView indexView) {
+        this.indexView = indexView;
+    }
+
+    public IndexView getIndexView() {
+        return indexView;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
index 4a8ca5145da6c7..41f0c5d41c517d 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/src/main/java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
@@ -1,5 +1,7 @@
 package io.quarkus.resteasy.reactive.common.deployment;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -17,8 +19,10 @@
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.CompositeIndex;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
 import org.jboss.jandex.Type;
 import org.jboss.resteasy.reactive.common.jaxrs.RuntimeDelegateImpl;
 import org.jboss.resteasy.reactive.common.model.InterceptorContainer;
@@ -36,6 +40,7 @@
 import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.PreAdditionalBeanBuildTimeConditionBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -48,6 +53,7 @@
 import io.quarkus.resteasy.reactive.spi.AbstractInterceptorBuildItem;
 import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
 import io.quarkus.resteasy.reactive.spi.ContainerResponseFilterBuildItem;
+import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderOverrideBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
@@ -212,14 +218,30 @@ private boolean namePresent(Set nameBindingNames, Set globalName
         return false;
     }
 
+    @BuildStep
+    JaxRsResourceIndexBuildItem resourceIndex(CombinedIndexBuildItem combinedIndex,
+            List generatedJaxRsResources,
+            BuildProducer generatedBeansProducer) throws IOException {
+        if (generatedJaxRsResources.isEmpty()) {
+            return new JaxRsResourceIndexBuildItem(combinedIndex.getComputingIndex());
+        }
+
+        Indexer indexer = new Indexer();
+        for (GeneratedJaxRsResourceBuildItem generatedJaxRsResource : generatedJaxRsResources) {
+            indexer.index(new ByteArrayInputStream(generatedJaxRsResource.getData()));
+            generatedBeansProducer
+                    .produce(new GeneratedBeanBuildItem(generatedJaxRsResource.getName(), generatedJaxRsResource.getData()));
+        }
+        return new JaxRsResourceIndexBuildItem(CompositeIndex.create(combinedIndex.getComputingIndex(), indexer.complete()));
+    }
+
     @BuildStep
     void scanResources(
-            // TODO: We need to use this index instead of BeanArchiveIndexBuildItem to avoid build cycles. It it OK?
-            CombinedIndexBuildItem combinedIndexBuildItem,
+            JaxRsResourceIndexBuildItem jaxRsResourceIndexBuildItem,
             BuildProducer annotationsTransformerBuildItemBuildProducer,
             BuildProducer resourceScanningResultBuildItemBuildProducer) {
 
-        ResourceScanningResult res = ResteasyReactiveScanner.scanResources(combinedIndexBuildItem.getComputingIndex());
+        ResourceScanningResult res = ResteasyReactiveScanner.scanResources(jaxRsResourceIndexBuildItem.getIndexView());
         if (res == null) {
             return;
         }
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java
index 0808558c0ca57b..c44b8bb45458c4 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ArcBeanFactory.java
@@ -22,17 +22,28 @@ public String toString() {
 
     @Override
     public BeanInstance createInstance() {
-        BeanContainer.Instance instance = factory.create();
-        return new BeanInstance() {
-            @Override
-            public T getInstance() {
-                return instance.get();
+        BeanContainer.Instance instance;
+        try {
+            instance = factory.create();
+            return new BeanInstance() {
+                @Override
+                public T getInstance() {
+                    return instance.get();
+                }
+
+                @Override
+                public void close() {
+                    instance.close();
+                }
+            };
+        } catch (Exception e) {
+            if (factory.getClass().getName().contains("DefaultInstanceFactory")) {
+                throw new IllegalArgumentException(
+                        "Unable to create class '" + targetClassName
+                                + "'. To fix the problem, make sure this class is a CDI bean.",
+                        e);
             }
-
-            @Override
-            public void close() {
-                instance.close();
-            }
-        };
+            throw e;
+        }
     }
 }
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java
new file mode 100644
index 00000000000000..3c8bb89853e846
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-common/spi-deployment/src/main/java/io/quarkus/resteasy/reactive/spi/GeneratedJaxRsResourceBuildItem.java
@@ -0,0 +1,26 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Represents a JAX-RS resource that is generated.
+ * Meant to be used by extension that generate JAX-RS resources as part of their build time processing
+ */
+public final class GeneratedJaxRsResourceBuildItem extends MultiBuildItem {
+
+    private final String name;
+    private final byte[] data;
+
+    public GeneratedJaxRsResourceBuildItem(String name, byte[] data) {
+        this.name = name;
+        this.data = data;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public byte[] getData() {
+        return data;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml
index 4810c69ea7cd47..bf22e85e0524c2 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jackson/runtime/pom.xml
@@ -29,6 +29,12 @@
             
                 io.quarkus
                 quarkus-bootstrap-maven-plugin
+                
+                    
+                        io.quarkus.rest.jackson
+                        io.quarkus.resteasy.reactive.json.jackson
+                    
+                
             
             
                 maven-compiler-plugin
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml
index fe85ce1a97913e..0032cb13da00d9 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-jsonb/runtime/pom.xml
@@ -29,6 +29,12 @@
             
                 io.quarkus
                 quarkus-bootstrap-maven-plugin
+                
+                    
+                        io.quarkus.rest.jsonb
+                        io.quarkus.resteasy.reactive.json.jsonb
+                    
+                
             
             
                 maven-compiler-plugin
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java
new file mode 100644
index 00000000000000..4a493e9584a468
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/DotNames.java
@@ -0,0 +1,15 @@
+package io.quarkus.resteasy.reactive.links.deployment;
+
+import org.jboss.jandex.DotName;
+
+import io.quarkus.resteasy.reactive.links.InjectRestLinks;
+import io.quarkus.resteasy.reactive.links.RestLink;
+
+final class DotNames {
+
+    static final DotName INJECT_REST_LINKS_ANNOTATION = DotName.createSimple(InjectRestLinks.class.getName());
+    static final DotName REST_LINK_ANNOTATION = DotName.createSimple(RestLink.class.getName());
+
+    private DotNames() {
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java
index 12c0c3eb196e2e..6e9142867e5689 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksContainerFactory.java
@@ -24,8 +24,6 @@
 
 final class LinksContainerFactory {
 
-    private static final DotName REST_LINK_ANNOTATION = DotName.createSimple(RestLink.class.getName());
-
     private final IndexView index;
 
     LinksContainerFactory(IndexView index) {
@@ -41,7 +39,7 @@ LinksContainer getLinksContainer(List resourceClasses) {
         for (ResourceClass resourceClass : resourceClasses) {
             for (ResourceMethod resourceMethod : resourceClass.getMethods()) {
                 MethodInfo resourceMethodInfo = getResourceMethodInfo(resourceClass, resourceMethod);
-                AnnotationInstance restLinkAnnotation = resourceMethodInfo.annotation(REST_LINK_ANNOTATION);
+                AnnotationInstance restLinkAnnotation = resourceMethodInfo.annotation(DotNames.REST_LINK_ANNOTATION);
                 if (restLinkAnnotation != null) {
                     LinkInfo linkInfo = getLinkInfo(resourceClass, resourceMethod, resourceMethodInfo,
                             restLinkAnnotation);
@@ -120,7 +118,7 @@ private boolean isSameMethod(MethodInfo resourceMethodInfo, ResourceMethod resou
         List parameterTypes = resourceMethodInfo.parameters();
         MethodParameter[] parameters = resourceMethod.getParameters();
         for (int i = 0; i < parameters.length; i++) {
-            if (!parameterTypes.get(i).name().equals(DotName.createSimple(parameters[i].type))) {
+            if (!parameterTypes.get(i).name().equals(DotName.createSimple(parameters[i].declaredType))) {
                 return false;
             }
         }
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java
new file mode 100644
index 00000000000000..59d54071640ad2
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksMethodScanner.java
@@ -0,0 +1,59 @@
+package io.quarkus.resteasy.reactive.links.deployment;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationValue;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.resteasy.reactive.server.model.FixedHandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer;
+import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner;
+
+import io.quarkus.resteasy.reactive.links.RestLinkType;
+import io.quarkus.resteasy.reactive.links.RestLinksHandler;
+
+public class LinksMethodScanner implements MethodScanner {
+
+    @Override
+    public List scan(MethodInfo method, ClassInfo actualEndpointClass,
+            Map methodContext) {
+        AnnotationInstance injectRestLinksInstance = getInjectRestLinksAnnotation(method, actualEndpointClass);
+        if (injectRestLinksInstance == null) {
+            return Collections.emptyList();
+        }
+
+        RestLinkType restLinkType = RestLinkType.TYPE;
+        AnnotationValue injectRestLinksValue = injectRestLinksInstance.value();
+        if (injectRestLinksValue != null) {
+            restLinkType = RestLinkType.valueOf(injectRestLinksValue.asEnum());
+        }
+
+        AnnotationInstance restLinkInstance = method.annotation(DotNames.REST_LINK_ANNOTATION);
+        String entityType = null;
+        if (restLinkInstance != null) {
+            AnnotationValue restInstanceValue = restLinkInstance.value("entityType");
+            if (restInstanceValue != null) {
+                entityType = restInstanceValue.asClass().name().toString();
+            }
+        }
+
+        RestLinksHandler handler = new RestLinksHandler();
+        handler.setRestLinkData(new RestLinksHandler.RestLinkData(restLinkType, entityType));
+        return Collections.singletonList(new FixedHandlerChainCustomizer(handler,
+                HandlerChainCustomizer.Phase.AFTER_RESPONSE_CREATED));
+    }
+
+    private AnnotationInstance getInjectRestLinksAnnotation(MethodInfo method, ClassInfo actualEndpointClass) {
+        AnnotationInstance annotationInstance = method.annotation(DotNames.INJECT_REST_LINKS_ANNOTATION);
+        if (annotationInstance == null) {
+            annotationInstance = method.declaringClass().classAnnotation(DotNames.INJECT_REST_LINKS_ANNOTATION);
+            if ((annotationInstance == null) && !actualEndpointClass.equals(method.declaringClass())) {
+                annotationInstance = actualEndpointClass.classAnnotation(DotNames.INJECT_REST_LINKS_ANNOTATION);
+            }
+        }
+        return annotationInstance;
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java
index 3f8983032c57e2..380e9086b5598e 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/deployment/src/main/java/io/quarkus/resteasy/reactive/links/deployment/LinksProcessor.java
@@ -18,11 +18,10 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
-import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
 import io.quarkus.gizmo.ClassOutput;
-import io.quarkus.resteasy.reactive.links.RestLinksResponseFilter;
+import io.quarkus.resteasy.reactive.common.deployment.JaxRsResourceIndexBuildItem;
 import io.quarkus.resteasy.reactive.links.runtime.GetterAccessorsContainer;
 import io.quarkus.resteasy.reactive.links.runtime.GetterAccessorsContainerRecorder;
 import io.quarkus.resteasy.reactive.links.runtime.LinkInfo;
@@ -30,7 +29,7 @@
 import io.quarkus.resteasy.reactive.links.runtime.LinksProviderRecorder;
 import io.quarkus.resteasy.reactive.links.runtime.RestLinksProviderProducer;
 import io.quarkus.resteasy.reactive.server.deployment.ResteasyReactiveDeploymentInfoBuildItem;
-import io.quarkus.resteasy.reactive.spi.CustomContainerResponseFilterBuildItem;
+import io.quarkus.resteasy.reactive.server.spi.MethodScannerBuildItem;
 import io.quarkus.runtime.RuntimeValue;
 
 final class LinksProcessor {
@@ -42,15 +41,20 @@ void feature(BuildProducer feature) {
         feature.produce(new FeatureBuildItem(Feature.RESTEASY_REACTIVE_LINKS));
     }
 
+    @BuildStep
+    MethodScannerBuildItem linksSupport() {
+        return new MethodScannerBuildItem(new LinksMethodScanner());
+    }
+
     @BuildStep
     @Record(STATIC_INIT)
-    void initializeLinksProvider(CombinedIndexBuildItem indexBuildItem,
+    void initializeLinksProvider(JaxRsResourceIndexBuildItem indexBuildItem,
             ResteasyReactiveDeploymentInfoBuildItem deploymentInfoBuildItem,
             BuildProducer bytecodeTransformersProducer,
             BuildProducer generatedClassesProducer,
             GetterAccessorsContainerRecorder getterAccessorsContainerRecorder,
             LinksProviderRecorder linksProviderRecorder) {
-        IndexView index = indexBuildItem.getIndex();
+        IndexView index = indexBuildItem.getIndexView();
         ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClassesProducer, true);
 
         // Initialize links container
@@ -68,11 +72,6 @@ AdditionalBeanBuildItem registerRestLinksProviderProducer() {
         return AdditionalBeanBuildItem.unremovableOf(RestLinksProviderProducer.class);
     }
 
-    @BuildStep
-    CustomContainerResponseFilterBuildItem registerRestLinksResponseFilter() {
-        return new CustomContainerResponseFilterBuildItem(RestLinksResponseFilter.class.getName());
-    }
-
     private LinksContainer getLinksContainer(IndexView index,
             ResteasyReactiveDeploymentInfoBuildItem deploymentInfoBuildItem) {
         LinksContainerFactory linksContainerFactory = new LinksContainerFactory(index);
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java
new file mode 100644
index 00000000000000..10c2e24571c8e3
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksHandler.java
@@ -0,0 +1,82 @@
+package io.quarkus.resteasy.reactive.links;
+
+import java.util.Collection;
+
+import javax.ws.rs.core.Link;
+import javax.ws.rs.core.Response;
+
+import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
+import org.jboss.resteasy.reactive.server.spi.ServerRestHandler;
+
+import io.quarkus.arc.Arc;
+
+public class RestLinksHandler implements ServerRestHandler {
+
+    private RestLinkData restLinkData;
+
+    public RestLinkData getRestLinkData() {
+        return restLinkData;
+    }
+
+    public void setRestLinkData(RestLinkData restLinkData) {
+        this.restLinkData = restLinkData;
+    }
+
+    @Override
+    public void handle(ResteasyReactiveRequestContext context) {
+        Response response = context.getResponse().get();
+        for (Link link : getLinks(response)) {
+            response.getHeaders().add("Link", link);
+        }
+    }
+
+    private Collection getLinks(Response response) {
+        if ((restLinkData.getRestLinkType() == RestLinkType.INSTANCE) && response.hasEntity()) {
+            return getTestLinksProvider().getInstanceLinks(response.getEntity());
+        }
+        return getTestLinksProvider()
+                .getTypeLinks(restLinkData.getEntityType() != null ? entityTypeClass() : response.getEntity().getClass());
+    }
+
+    private Class entityTypeClass() {
+        try {
+            return Thread.currentThread().getContextClassLoader().loadClass(restLinkData.getEntityType());
+        } catch (ClassNotFoundException e) {
+            throw new IllegalStateException("Unable load class '" + restLinkData.getEntityType() + "'", e);
+        }
+    }
+
+    private RestLinksProvider getTestLinksProvider() {
+        return Arc.container().instance(RestLinksProvider.class).get();
+    }
+
+    public static class RestLinkData {
+
+        public RestLinkData(RestLinkType restLinkType, String entityType) {
+            this.restLinkType = restLinkType;
+            this.entityType = entityType;
+        }
+
+        public RestLinkData() {
+        }
+
+        private RestLinkType restLinkType;
+        private String entityType;
+
+        public RestLinkType getRestLinkType() {
+            return restLinkType;
+        }
+
+        public void setRestLinkType(RestLinkType restLinkType) {
+            this.restLinkType = restLinkType;
+        }
+
+        public String getEntityType() {
+            return entityType;
+        }
+
+        public void setEntityType(String entityType) {
+            this.entityType = entityType;
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java
deleted file mode 100644
index 09b275d0d7a15a..00000000000000
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/RestLinksResponseFilter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package io.quarkus.resteasy.reactive.links;
-
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.Collections;
-
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Link;
-
-import org.jboss.resteasy.reactive.server.ServerResponseFilter;
-import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo;
-
-public class RestLinksResponseFilter {
-
-    private final RestLinksProvider linksProvider;
-
-    public RestLinksResponseFilter(RestLinksProvider linksProvider) {
-        this.linksProvider = linksProvider;
-    }
-
-    @ServerResponseFilter
-    public void filter(ResourceInfo resourceInfo, ContainerResponseContext responseContext) {
-        if (!(resourceInfo instanceof ResteasyReactiveResourceInfo)) {
-            return;
-        }
-        for (Link link : getLinks((ResteasyReactiveResourceInfo) resourceInfo, responseContext)) {
-            responseContext.getHeaders().add("Link", link);
-        }
-    }
-
-    private Collection getLinks(ResteasyReactiveResourceInfo resourceInfo,
-            ContainerResponseContext responseContext) {
-        InjectRestLinks injectRestLinksAnnotation = getInjectRestLinksAnnotation(resourceInfo);
-        if (injectRestLinksAnnotation == null) {
-            return Collections.emptyList();
-        }
-
-        if (injectRestLinksAnnotation.value() == RestLinkType.INSTANCE && responseContext.hasEntity()) {
-            return linksProvider.getInstanceLinks(responseContext.getEntity());
-        }
-
-        return linksProvider.getTypeLinks(getEntityType(resourceInfo, responseContext));
-    }
-
-    private InjectRestLinks getInjectRestLinksAnnotation(ResteasyReactiveResourceInfo resourceInfo) {
-        if (resourceInfo.getMethodAnnotationNames().contains(InjectRestLinks.class.getName())) {
-            for (Annotation annotation : resourceInfo.getAnnotations()) {
-                if (annotation instanceof InjectRestLinks) {
-                    return (InjectRestLinks) annotation;
-                }
-            }
-        }
-        if (resourceInfo.getClassAnnotationNames().contains(InjectRestLinks.class.getName())) {
-            for (Annotation annotation : resourceInfo.getClassAnnotations()) {
-                if (annotation instanceof InjectRestLinks) {
-                    return (InjectRestLinks) annotation;
-                }
-            }
-        }
-        return null;
-    }
-
-    private Class getEntityType(ResteasyReactiveResourceInfo resourceInfo,
-            ContainerResponseContext responseContext) {
-        for (Annotation annotation : resourceInfo.getAnnotations()) {
-            if (annotation instanceof RestLink) {
-                Class entityType = ((RestLink) annotation).entityType();
-                if (entityType != Object.class) {
-                    return entityType;
-                }
-            }
-        }
-        return responseContext.getEntityClass();
-    }
-}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java
index 7a0354d4a6d74e..8960e382906d8d 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-links/runtime/src/main/java/io/quarkus/resteasy/reactive/links/runtime/RestLinksProviderImpl.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 
 import javax.ws.rs.core.Link;
@@ -34,8 +33,9 @@ static void setGetterAccessorsContainer(GetterAccessorsContainer getterAccessors
     public Collection getTypeLinks(Class elementType) {
         verifyInit();
 
-        List links = new LinkedList<>();
-        for (LinkInfo linkInfo : linksContainer.getForClass(elementType)) {
+        List linkInfoList = linksContainer.getForClass(elementType);
+        List links = new ArrayList<>(linkInfoList.size());
+        for (LinkInfo linkInfo : linkInfoList) {
             if (linkInfo.getPathParameters().size() == 0) {
                 links.add(Link.fromUriBuilder(uriInfo.getBaseUriBuilder().path(linkInfo.getPath()))
                         .rel(linkInfo.getRel())
@@ -49,8 +49,9 @@ public Collection getTypeLinks(Class elementType) {
     public  Collection getInstanceLinks(T instance) {
         verifyInit();
 
-        List links = new LinkedList<>();
-        for (LinkInfo linkInfo : linksContainer.getForClass(instance.getClass())) {
+        List linkInfoList = linksContainer.getForClass(instance.getClass());
+        List links = new ArrayList<>(linkInfoList.size());
+        for (LinkInfo linkInfo : linkInfoList) {
             links.add(Link.fromUriBuilder(uriInfo.getBaseUriBuilder().path(linkInfo.getPath()))
                     .rel(linkInfo.getRel())
                     .build(getPathParameterValues(linkInfo, instance)));
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java
index b45231b36da205..73f6888dfd6938 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/CustomFilterGenerator.java
@@ -31,6 +31,7 @@
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.ResourceInfo;
 import javax.ws.rs.core.Response;
 
 import org.jboss.jandex.DotName;
@@ -410,7 +411,7 @@ private static ResultHandle getRRReqCtxHandle(MethodCreator filter, ResultHandle
 
     private static AssignableResultHandle getResourceInfoHandle(MethodCreator filterMethod, ResultHandle rrReqCtxHandle) {
         ResultHandle runtimeResourceHandle = GeneratorUtils.runtimeResourceHandle(filterMethod, rrReqCtxHandle);
-        AssignableResultHandle resourceInfo = filterMethod.createVariable(ResteasyReactiveResourceInfo.class);
+        AssignableResultHandle resourceInfo = filterMethod.createVariable(ResourceInfo.class);
         BranchResult ifNullBranch = filterMethod.ifNull(runtimeResourceHandle);
         ifNullBranch.trueBranch().assign(resourceInfo, ifNullBranch.trueBranch().readStaticField(
                 FieldDescriptor.of(SimpleResourceInfo.NullValues.class, "INSTANCE", SimpleResourceInfo.NullValues.class)));
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java
new file mode 100644
index 00000000000000..331150eeb0b841
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/GeneratedJaxRsResourceGizmoAdaptor.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.deployment;
+
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
+
+public class GeneratedJaxRsResourceGizmoAdaptor implements ClassOutput {
+
+    private final BuildProducer classOutput;
+
+    public GeneratedJaxRsResourceGizmoAdaptor(BuildProducer classOutput) {
+        this.classOutput = classOutput;
+    }
+
+    @Override
+    public void write(String className, byte[] bytes) {
+        classOutput.produce(new GeneratedJaxRsResourceBuildItem(className, bytes));
+    }
+
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java
index f05f9dd80b16bf..b9353e698a05e9 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/MultipartPopulatorGenerator.java
@@ -189,7 +189,8 @@ private MultipartPopulatorGenerator() {
      */
     static String generate(ClassInfo multipartClassInfo, ClassOutput classOutput, IndexView index) {
         if (!multipartClassInfo.hasNoArgsConstructor()) {
-            throw new IllegalArgumentException("Classes annotated with '@MultipartForm' must contain a no-args constructor");
+            throw new IllegalArgumentException("Classes annotated with '@MultipartForm' must contain a no-args constructor. " +
+                    "The constructor is missing on " + multipartClassInfo.name());
         }
 
         String multipartClassName = multipartClassInfo.name().toString();
@@ -394,11 +395,11 @@ static String generate(ClassInfo multipartClassInfo, ClassOutput classOutput, In
                                             String.class,
                                             Class.class,
                                             java.lang.reflect.Type.class, MediaType.class,
-                                            ResteasyReactiveRequestContext.class),
+                                            ResteasyReactiveRequestContext.class, String.class),
                                     formStrValueHandle, populate.readStaticField(typeField),
                                     populate.readStaticField(genericTypeField),
                                     populate.readStaticField(mediaTypeField),
-                                    rrCtxHandle));
+                                    rrCtxHandle, formAttrNameHandle));
                         }
                     }
 
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
index d9b37a93faab06..62fac03831ff8b 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -10,11 +10,11 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.ws.rs.Priorities;
@@ -41,13 +41,13 @@
 import org.jboss.resteasy.reactive.common.model.ResourceDynamicFeature;
 import org.jboss.resteasy.reactive.common.model.ResourceFeature;
 import org.jboss.resteasy.reactive.common.model.ResourceInterceptors;
-import org.jboss.resteasy.reactive.common.model.ResourceMethod;
 import org.jboss.resteasy.reactive.common.model.ResourceReader;
 import org.jboss.resteasy.reactive.common.model.ResourceWriter;
 import org.jboss.resteasy.reactive.common.processor.AdditionalReaderWriter;
 import org.jboss.resteasy.reactive.common.processor.AdditionalReaders;
 import org.jboss.resteasy.reactive.common.processor.AdditionalWriters;
 import org.jboss.resteasy.reactive.common.processor.DefaultProducesHandler;
+import org.jboss.resteasy.reactive.common.processor.EndpointIndexer;
 import org.jboss.resteasy.reactive.common.processor.ResteasyReactiveDotNames;
 import org.jboss.resteasy.reactive.common.processor.scanning.ApplicationScanningResult;
 import org.jboss.resteasy.reactive.common.processor.scanning.ResourceScanningResult;
@@ -335,7 +335,7 @@ public void setupEndpoints(Capabilities capabilities, BeanArchiveIndexBuildItem
 
             QuarkusServerEndpointIndexer.Builder serverEndpointIndexerBuilder = new QuarkusServerEndpointIndexer.Builder()
                     .addMethodScanners(
-                            methodScanners.stream().map(MethodScannerBuildItem::getMethodScanner).collect(Collectors.toList()))
+                            methodScanners.stream().map(MethodScannerBuildItem::getMethodScanner).collect(toList()))
                     .setIndex(index)
                     .setFactoryCreator(new QuarkusFactoryCreator(recorder, beanContainerBuildItem.getValue()))
                     .setEndpointInvokerFactory(new QuarkusInvokerFactory(generatedClassBuildItemBuildProducer, recorder))
@@ -353,13 +353,20 @@ public void setupEndpoints(Capabilities capabilities, BeanArchiveIndexBuildItem
                     .setClassLevelExceptionMappers(
                             classLevelExceptionMappers.isPresent() ? classLevelExceptionMappers.get().getMappers()
                                     : Collections.emptyMap())
-                    .setResourceMethodCallback(new Consumer>() {
+                    .setResourceMethodCallback(new Consumer<>() {
                         @Override
-                        public void accept(Map.Entry entry) {
-                            MethodInfo method = entry.getKey();
+                        public void accept(EndpointIndexer.ResourceMethodCallbackData entry) {
+                            MethodInfo method = entry.getMethodInfo();
                             String source = ResteasyReactiveProcessor.class.getSimpleName() + " > " + method.declaringClass()
                                     + "[" + method + "]";
 
+                            ClassInfo classInfoWithSecurity = consumeStandardSecurityAnnotations(method,
+                                    entry.getActualEndpointInfo(), index, c -> c);
+                            if (classInfoWithSecurity != null) {
+                                reflectiveClass.produce(new ReflectiveClassBuildItem(false, true, false,
+                                        entry.getActualEndpointInfo().name().toString()));
+                            }
+
                             reflectiveHierarchy.produce(new ReflectiveHierarchyBuildItem.Builder()
                                     .type(method.returnType())
                                     .index(index)
@@ -648,21 +655,29 @@ MethodScannerBuildItem integrateEagerSecurity(Capabilities capabilities, Combine
             @Override
             public List scan(MethodInfo method, ClassInfo actualEndpointClass,
                     Map methodContext) {
-                if (SecurityTransformerUtils.hasStandardSecurityAnnotation(method)) {
-                    return Collections.singletonList(new EagerSecurityHandler.Customizer());
-                }
-                ClassInfo c = actualEndpointClass;
-                while (c.superName() != null) {
-                    if (SecurityTransformerUtils.hasStandardSecurityAnnotation(c)) {
-                        return Collections.singletonList(new EagerSecurityHandler.Customizer());
-                    }
-                    c = index.getClassByName(c.superName());
-                }
-                return Collections.emptyList();
+                return Objects.requireNonNullElse(
+                        consumeStandardSecurityAnnotations(method, actualEndpointClass, index,
+                                (c) -> Collections.singletonList(new EagerSecurityHandler.Customizer())),
+                        Collections.emptyList());
             }
         });
     }
 
+    private  T consumeStandardSecurityAnnotations(MethodInfo methodInfo, ClassInfo classInfo, IndexView index,
+            Function function) {
+        if (SecurityTransformerUtils.hasStandardSecurityAnnotation(methodInfo)) {
+            return function.apply(methodInfo.declaringClass());
+        }
+        ClassInfo c = classInfo;
+        while (c.superName() != null) {
+            if (SecurityTransformerUtils.hasStandardSecurityAnnotation(c)) {
+                return function.apply(c);
+            }
+            c = index.getClassByName(c.superName());
+        }
+        return null;
+    }
+
     private Optional getAppPath(Optional newPropertyValue) {
         Optional legacyProperty = ConfigProvider.getConfig().getOptionalValue("quarkus.rest.path", String.class);
         if (legacyProperty.isPresent()) {
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java
new file mode 100644
index 00000000000000..1513476f85ecff
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/InnerClassTest.java
@@ -0,0 +1,44 @@
+package io.quarkus.resteasy.reactive.server.test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.function.Supplier;
+
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.ws.rs.Path;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.common.annotation.Blocking;
+
+public class InnerClassTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(Resource.class);
+                }
+            }).setExpectedException(DeploymentException.class);
+
+    @Test
+    public void test() {
+        fail("Should never have been called");
+    }
+
+    @Path("test")
+    public class Resource {
+
+        @Path("hello")
+        @Blocking
+        public String hello() {
+            return "hello";
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java
index 00662d7c38287d..1925a3855d8522 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/cache/NoCacheOnMethodsTest.java
@@ -30,37 +30,53 @@ public JavaArchive get() {
             });
 
     @Test
-    public void testWith() {
-        RestAssured.get("/test/with")
+    public void testWithFields() {
+        RestAssured.get("/test/withFields")
                 .then()
                 .statusCode(200)
-                .body(equalTo("with"))
+                .body(equalTo("withFields"))
                 .header("Cache-Control", "no-cache=\"f1\", no-cache=\"f2\"");
     }
 
     @Test
-    public void testWithout() {
-        RestAssured.get("/test/without")
+    public void testWithoutFields() {
+        RestAssured.get("/test/withoutFields")
                 .then()
                 .statusCode(200)
-                .body(equalTo("without"))
+                .body(equalTo("withoutFields"))
+                .header("Cache-Control", "no-cache");
+    }
+
+    @Test
+    public void testWithoutAnnotation() {
+        RestAssured.get("/test/withoutAnnotation")
+                .then()
+                .statusCode(200)
+                .body(equalTo("withoutAnnotation"))
                 .header("Cache-Control", nullValue());
     }
 
     @Path("test")
     public static class ResourceWithNoCache {
 
-        @Path("with")
+        @Path("withFields")
         @GET
         @NoCache(fields = { "f1", "f2" })
-        public String with() {
-            return "with";
+        public String withFields() {
+            return "withFields";
+        }
+
+        @Path("withoutFields")
+        @GET
+        @NoCache
+        public String withoutFields() {
+            return "withoutFields";
         }
 
-        @Path("without")
+        @Path("withoutAnnotation")
         @GET
-        public String without() {
-            return "without";
+        public String withoutAnnotation() {
+            return "withoutAnnotation";
         }
     }
 }
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java
new file mode 100644
index 00000000000000..4d2bb9a21e58dd
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/customproviders/NoTargetTest.java
@@ -0,0 +1,90 @@
+package io.quarkus.resteasy.reactive.server.test.customproviders;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.function.Supplier;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+import io.restassured.http.Headers;
+
+public class NoTargetTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(new Supplier<>() {
+                @Override
+                public JavaArchive get() {
+                    return ShrinkWrap.create(JavaArchive.class)
+                            .addClasses(HelloResource.class, ThrowingPreMatchFilter.class, DummyExceptionMapper.class);
+                }
+            });
+
+    @Path("hello")
+    public static class HelloResource {
+
+        @GET
+        public String hello() {
+            return "hello";
+        }
+    }
+
+    @Test
+    public void test() {
+        Headers headers = RestAssured.get("/hello")
+                .then().statusCode(200).extract().headers();
+        assertEquals("mapper", headers.get("source").getValue());
+        assertEquals("NullValues", headers.get("resourceInfoClass").getValue());
+    }
+
+    public static class CustomResponseFilter {
+
+        @ServerResponseFilter
+        public void filter(ContainerResponseContext responseContext, ResourceInfo resourceInfo) {
+            responseContext.getHeaders().add("resourceInfoClass", resourceInfo.getClass().getSimpleName());
+        }
+    }
+
+    @PreMatching
+    @Provider
+    public static class ThrowingPreMatchFilter implements ContainerRequestFilter {
+
+        @Override
+        public void filter(ContainerRequestContext requestContext) throws IOException {
+            throw new DummyException();
+        }
+    }
+
+    @Provider
+    public static class DummyExceptionMapper implements ExceptionMapper {
+        @Override
+        public Response toResponse(DummyException exception) {
+            return Response.ok().header("source", "mapper").build();
+        }
+    }
+
+    public static class DummyException extends RuntimeException {
+        public DummyException() {
+            super("dummy");
+            setStackTrace(new StackTraceElement[0]);
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java
new file mode 100644
index 00000000000000..a5c97b442f7120
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/generatedresource/GeneratedJaxRsResourceTest.java
@@ -0,0 +1,82 @@
+package io.quarkus.resteasy.reactive.server.test.generatedresource;
+
+import static io.restassured.RestAssured.when;
+
+import java.util.function.Consumer;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.builder.BuildChainBuilder;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.gizmo.ClassCreator;
+import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.gizmo.MethodCreator;
+import io.quarkus.resteasy.reactive.server.deployment.GeneratedJaxRsResourceGizmoAdaptor;
+import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class GeneratedJaxRsResourceTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(HelloResource.class))
+            .addBuildChainCustomizer(buildCustomizer());
+
+    @Test
+    public void testRestPath() {
+        when().get("/hello").then().statusCode(200).body(Matchers.is("hello"));
+        when().get("/test").then().statusCode(200).body(Matchers.is("test"));
+    }
+
+    protected static Consumer buildCustomizer() {
+        return new Consumer<>() {
+            /**
+             * This represents the extension that generates a JAX-RS resource like:
+             *
+             * 
+             * {@code
+             *      @Path("/test')
+             *      public class TestResource {
+             *
+             *          @GET
+             *          public String test() {
+             *              return "test";
+             *          }
+             *      }
+             * }
+             * 

+             */
+            @Override
+            public void accept(BuildChainBuilder builder) {
+                builder.addBuildStep(context -> {
+                    BuildProducer producer = context::produce;
+                    ClassOutput classOutput = new GeneratedJaxRsResourceGizmoAdaptor(producer);
+                    try (ClassCreator classCreator = ClassCreator.builder()
+                            .classOutput(classOutput).className("com.example.TestResource")
+                            .build()) {
+                        classCreator.addAnnotation(Path.class).addValue("value", "test");
+                        MethodCreator methodCreator = classCreator.getMethodCreator("test", String.class);
+                        methodCreator.addAnnotation(GET.class);
+                        methodCreator.returnValue(methodCreator.load("test"));
+                    }
+                }).produces(GeneratedJaxRsResourceBuildItem.class).build();
+            }
+        };
+    }
+
+    @Path("hello")
+    public static class HelloResource {
+
+        @GET
+        public String hello() {
+            return "hello";
+        }
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java
index 5489e49172b3f6..225943678fa69e 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/LargerThanDefaultFormAttributeMultipartFormInputTest.java
@@ -39,7 +39,7 @@ public JavaArchive get() {
                     return ShrinkWrap.create(JavaArchive.class)
                             .addClasses(Resource.class, Data.class)
                             .addAsResource(new StringAsset(
-                                    "quarkus.http.limits.max-form-attribute-size=4K"),
+                                    "quarkus.http.limits.max-form-attribute-size=120K"),
                                     "application.properties");
                 }
             });
@@ -49,6 +49,12 @@ public JavaArchive get() {
     @Test
     public void test() throws IOException {
         String fileContents = new String(Files.readAllBytes(FILE.toPath()), StandardCharsets.UTF_8);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10; ++i) {
+            sb.append(fileContents);
+        }
+        fileContents = sb.toString();
+
         Assertions.assertTrue(fileContents.length() > HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE);
         given()
                 .multiPart("text", fileContents)
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java
index 6699beab8c705d..ef3d7553191684 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/multipart/TooLargeFormAttributeMultipartFormInputTest.java
@@ -66,9 +66,13 @@ public void clearDirectory() {
 
     @Test
     public void test() throws IOException {
-        String formAttrSourceFileContents = new String(Files.readAllBytes(FORM_ATTR_SOURCE_FILE.toPath()),
-                StandardCharsets.UTF_8);
-        Assertions.assertTrue(formAttrSourceFileContents.length() > HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE);
+        String fileContents = new String(Files.readAllBytes(FORM_ATTR_SOURCE_FILE.toPath()), StandardCharsets.UTF_8);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < 10; ++i) {
+            sb.append(fileContents);
+        }
+        fileContents = sb.toString();
+        Assertions.assertTrue(fileContents.length() > HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE);
         given()
                 .multiPart("active", "true")
                 .multiPart("num", "25")
@@ -76,7 +80,7 @@ public void test() throws IOException {
                 .multiPart("htmlFile", HTML_FILE, "text/html")
                 .multiPart("xmlFile", XML_FILE, "text/xml")
                 .multiPart("txtFile", TXT_FILE, "text/plain")
-                .multiPart("name", formAttrSourceFileContents)
+                .multiPart("name", fileContents)
                 .accept("text/plain")
                 .when()
                 .post("/test")
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java
index fa6194b91bb728..6357946c627c04 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/UriInfoTest.java
@@ -20,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.GetAbsolutePathResource;
 import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEncodedQueryResource;
 import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEncodedTemplateResource;
 import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.UriInfoEscapedMatrParamResource;
@@ -54,7 +55,7 @@ public JavaArchive get() {
                     war.addClasses(UriInfoSimpleResource.class, UriInfoEncodedQueryResource.class,
                             UriInfoQueryParamsResource.class, UriInfoSimpleSingletonResource.class,
                             UriInfoEncodedTemplateResource.class, UriInfoEscapedMatrParamResource.class,
-                            UriInfoEncodedTemplateResource.class);
+                            UriInfoEncodedTemplateResource.class, GetAbsolutePathResource.class);
                     return war;
                 }
             });
@@ -167,4 +168,20 @@ private static void basicTest(String path, String testName) throws Exception {
     public void testQueryParamsMutability() throws Exception {
         basicTest("/queryParams?a=a,b", "UriInfoQueryParamsResource");
     }
+
+    @Test
+    @DisplayName("Test Get Absolute Path")
+    public void testGetAbsolutePath() throws Exception {
+        doTestGetAbsolutePath("/absolutePath", "unset");
+        doTestGetAbsolutePath("/absolutePath?dummy=1234", "1234");
+        doTestGetAbsolutePath("/absolutePath?foo=bar&dummy=1234", "1234");
+    }
+
+    private void doTestGetAbsolutePath(String path, String expectedDummyHeader) {
+        String absolutePathHeader = RestAssured.get(path)
+                .then()
+                .statusCode(200)
+                .header("dummy", expectedDummyHeader).extract().header("absolutePath");
+        org.assertj.core.api.Assertions.assertThat(absolutePathHeader).endsWith("/absolutePath");
+    }
 }
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java
new file mode 100644
index 00000000000000..b35f1bd895ada0
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/resource/GetAbsolutePathResource.java
@@ -0,0 +1,20 @@
+package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+@Path("absolutePath")
+public class GetAbsolutePathResource {
+
+    @GET
+    public Response response(@QueryParam("dummy") String dummy, @Context UriInfo uriInfo) {
+        return Response.ok()
+                .header("absolutePath", uriInfo.getAbsolutePath().toString())
+                .header("dummy", dummy == null ? "unset" : dummy)
+                .build();
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java
new file mode 100644
index 00000000000000..3fb6ae3effba1b
--- /dev/null
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/simple/RawListQueryParamTest.java
@@ -0,0 +1,56 @@
+package io.quarkus.resteasy.reactive.server.test.simple;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.hamcrest.Matchers;
+import org.jboss.resteasy.reactive.RestQuery;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.restassured.RestAssured;
+
+public class RawListQueryParamTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClass(HelloResource.class));
+
+    @Test
+    public void noQueryParams() {
+        RestAssured.get("/hello")
+                .then().statusCode(200).body(Matchers.equalTo("hello world"));
+    }
+
+    @Test
+    public void singleQueryParam() {
+        RestAssured.get("/hello?name=foo")
+                .then().statusCode(200).body(Matchers.equalTo("hello foo"));
+    }
+
+    @Test
+    public void multipleQueryParams() {
+        RestAssured.get("/hello?name=foo&name=bar")
+                .then().statusCode(200).body(Matchers.equalTo("hello foo,bar"));
+    }
+
+    @Path("hello")
+    public static class HelloResource {
+
+        @GET
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        public String hello(@RestQuery("name") List names) {
+            if (names.isEmpty()) {
+                return "hello world";
+            }
+            return "hello " + String.join(",", names);
+        }
+
+    }
+}
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java
index 979fb51e18c845..1ee6f0fe2278be 100644
--- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java
+++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/runtime/src/main/java/io/quarkus/resteasy/reactive/server/runtime/multipart/MultipartSupport.java
@@ -20,6 +20,7 @@
 import javax.ws.rs.ext.MessageBodyReader;
 
 import org.jboss.logging.Logger;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
 import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext;
 import org.jboss.resteasy.reactive.server.core.ServerSerialisers;
 import org.jboss.resteasy.reactive.server.core.multipart.DefaultFileUpload;
@@ -31,6 +32,7 @@
 /**
  * This class isn't used directly, it is however used by generated code meant to deal with multipart forms.
  */
+@SuppressWarnings("unused")
 public final class MultipartSupport {
 
     private static final Logger log = Logger.getLogger(RequestDeserializeHandler.class);
@@ -42,8 +44,22 @@ private MultipartSupport() {
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static Object convertFormAttribute(String value, Class type, Type genericType, MediaType mediaType,
-            ResteasyReactiveRequestContext context) {
+            ResteasyReactiveRequestContext context, String attributeName) {
         if (value == null) {
+            FormData formData = context.getFormData();
+            if (formData != null) {
+                Collection fileUploadsForName = formData.get(attributeName);
+                if (fileUploadsForName != null) {
+                    for (FormData.FormValue fileUpload : fileUploadsForName) {
+                        if (fileUpload.isFileItem()) {
+                            log.debug("Attribute '" + attributeName
+                                    + "' of the multipart request is a file and therefore its value is not set. To obtain the contents of the file, use type '"
+                                    + FileUpload.class + "' as the field type.");
+                            break;
+                        }
+                    }
+                }
+            }
             return null;
         }
 
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java
index f5e90dc889c70a..88ef8823de5b07 100644
--- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/main/java/io/quarkus/rest/client/reactive/deployment/MicroProfileRestClientEnricher.java
@@ -53,6 +53,7 @@
 import io.quarkus.gizmo.TryBlock;
 import io.quarkus.jaxrs.client.reactive.deployment.JaxrsClientReactiveEnricher;
 import io.quarkus.rest.client.reactive.HeaderFiller;
+import io.quarkus.rest.client.reactive.runtime.ConfigUtils;
 import io.quarkus.rest.client.reactive.runtime.MicroProfileRestClientRequestFilter;
 import io.quarkus.rest.client.reactive.runtime.NoOpHeaderFiller;
 import io.quarkus.runtime.util.HashUtil;
@@ -321,9 +322,19 @@ private void addHeaderParam(MethodInfo declaringMethod, MethodCreator fillHeader
                 .trueBranch();
 
         if (values.length > 1 || !(values[0].startsWith("{") && values[0].endsWith("}"))) {
+            boolean required = annotation.valueWithDefault(index, "required").asBoolean();
             ResultHandle headerList = fillHeaders.newInstance(MethodDescriptor.ofConstructor(ArrayList.class));
             for (String value : values) {
-                fillHeaders.invokeInterfaceMethod(LIST_ADD_METHOD, headerList, fillHeaders.load(value));
+                if (value.startsWith("${") && value.endsWith("}")) {
+                    ResultHandle headerValueFromConfig = fillHeaders.invokeStaticMethod(
+                            MethodDescriptor.ofMethod(ConfigUtils.class, "getConfigValue", String.class, String.class,
+                                    boolean.class),
+                            fillHeaders.load(value), fillHeaders.load(required));
+                    fillHeaders.ifNotNull(headerValueFromConfig)
+                            .trueBranch().invokeInterfaceMethod(LIST_ADD_METHOD, headerList, headerValueFromConfig);
+                } else {
+                    fillHeaders.invokeInterfaceMethod(LIST_ADD_METHOD, headerList, fillHeaders.load(value));
+                }
             }
 
             fillHeaders.invokeInterfaceMethod(MAP_PUT_METHOD, headerMap, fillHeaders.load(headerName), headerList);
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java
new file mode 100644
index 00000000000000..89ca96c51be375
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/MultipartFilenameTest.java
@@ -0,0 +1,80 @@
+package io.quarkus.rest.client.reactive;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.jboss.resteasy.reactive.MultipartForm;
+import org.jboss.resteasy.reactive.PartType;
+import org.jboss.resteasy.reactive.multipart.FileUpload;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class MultipartFilenameTest {
+
+    @TestHTTPResource
+    URI baseUri;
+
+    @RegisterExtension
+    static final QuarkusUnitTest TEST = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(Resource.class, FormData.class, Client.class, ClientForm.class))
+            .withConfigurationResource("dependent-test-application.properties");
+
+    @Test
+    void shouldPassOriginalFileName() throws IOException {
+        Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class);
+
+        File file = File.createTempFile("MultipartTest", ".txt");
+        file.deleteOnExit();
+
+        ClientForm form = new ClientForm();
+        form.file = file;
+        assertThat(client.postMultipart(form)).isEqualTo(file.getName());
+    }
+
+    @Path("/multipart")
+    @ApplicationScoped
+    public static class Resource {
+        @POST
+        @Consumes(MediaType.MULTIPART_FORM_DATA)
+        public String upload(@MultipartForm FormData form) {
+            return form.myFile.fileName();
+        }
+    }
+
+    public static class FormData {
+        @FormParam("myFile")
+        public FileUpload myFile;
+
+    }
+
+    @Path("/multipart")
+    public interface Client {
+        @POST
+        @Consumes(MediaType.MULTIPART_FORM_DATA)
+        String postMultipart(@MultipartForm ClientForm clientForm);
+
+    }
+
+    public static class ClientForm {
+        @FormParam("myFile")
+        @PartType(MediaType.APPLICATION_OCTET_STREAM)
+        public File file;
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java
new file mode 100644
index 00000000000000..6a3035988b1078
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/ClientHeaderParamFromPropertyTest.java
@@ -0,0 +1,84 @@
+package io.quarkus.rest.client.reactive.headers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.net.URI;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.quarkus.test.common.http.TestHTTPResource;
+
+public class ClientHeaderParamFromPropertyTest {
+    private static final String HEADER_VALUE = "oifajrofijaeoir5gjaoasfaxcvcz";
+
+    @TestHTTPResource
+    URI baseUri;
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Client.class)
+                    .addAsResource(
+                            new StringAsset("my.property-value=" + HEADER_VALUE),
+                            "application.properties"));
+
+    @Test
+    void shouldSetHeaderFromProperties() {
+        Client client = RestClientBuilder.newBuilder().baseUri(baseUri)
+                .build(Client.class);
+
+        assertThat(client.getWithHeader()).isEqualTo(HEADER_VALUE);
+    }
+
+    @Test
+    void shouldFailOnMissingRequiredHeaderProperty() {
+        Client client = RestClientBuilder.newBuilder().baseUri(baseUri)
+                .build(Client.class);
+
+        assertThatThrownBy(client::missingRequiredProperty)
+                .isInstanceOf(IllegalArgumentException.class);
+    }
+
+    @Test
+    void shouldSucceedOnMissingNonRequiredHeaderProperty() {
+        Client client = RestClientBuilder.newBuilder().baseUri(baseUri)
+                .build(Client.class);
+
+        assertThat(client.missingNonRequiredProperty()).isEqualTo(HEADER_VALUE);
+    }
+
+    @Path("/")
+    @ApplicationScoped
+    public static class Resource {
+        @GET
+        public String returnHeaderValue(@HeaderParam("my-header") String header) {
+            return header;
+        }
+    }
+
+    @ClientHeaderParam(name = "my-header", value = "${my.property-value}")
+    public interface Client {
+        @GET
+        String getWithHeader();
+
+        @GET
+        @ClientHeaderParam(name = "some-other-header", value = "${non-existent-property}")
+        String missingRequiredProperty();
+
+        @GET
+        @ClientHeaderParam(name = "some-other-header", value = "${non-existent-property}", required = false)
+        String missingNonRequiredProperty();
+    }
+}
diff --git a/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java
new file mode 100644
index 00000000000000..f1596ddfb713ff
--- /dev/null
+++ b/extensions/resteasy-reactive/rest-client-reactive/runtime/src/main/java/io/quarkus/rest/client/reactive/runtime/ConfigUtils.java
@@ -0,0 +1,41 @@
+package io.quarkus.rest.client.reactive.runtime;
+
+import java.util.NoSuchElementException;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.logging.Logger;
+
+public class ConfigUtils {
+
+    private static final Logger log = Logger.getLogger(ConfigUtils.class);
+
+    public static String getConfigValue(String configProperty, boolean required) {
+        String propertyName = stripPrefixAndSuffix(configProperty);
+        try {
+            return ConfigProvider.getConfig().getValue(propertyName, String.class);
+        } catch (NoSuchElementException e) {
+            String message = "Failed to find value for config property " + configProperty +
+                    " in application configuration. Please provide the value for the property, e.g. by adding " +
+                    propertyName + "= to your application.properties";
+            if (required) {
+                throw new IllegalArgumentException(message, e);
+            } else {
+                log.warn(message);
+                return null;
+            }
+        } catch (IllegalArgumentException e) {
+            String message = "Failed to convert value for property " + configProperty + " to String";
+            if (required) {
+                throw new IllegalArgumentException(message, e);
+            } else {
+                log.warn(message);
+                return null;
+            }
+        }
+    }
+
+    private static String stripPrefixAndSuffix(String configProperty) {
+        // by now we know that configProperty is of form ${...}
+        return configProperty.substring(2, configProperty.length() - 1);
+    }
+}
diff --git a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
index 490927bc4c6534..f2e1825b9007d6 100644
--- a/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
+++ b/extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
@@ -96,6 +96,7 @@ public class SchedulerProcessor {
     static final DotName SCHEDULED_NAME = DotName.createSimple(Scheduled.class.getName());
     static final DotName SCHEDULES_NAME = DotName.createSimple(Scheduled.Schedules.class.getName());
     static final DotName SKIP_NEVER_NAME = DotName.createSimple(Scheduled.Never.class.getName());
+    static final DotName SKIP_PREDICATE = DotName.createSimple(Scheduled.SkipPredicate.class.getName());
 
     static final Type SCHEDULED_EXECUTION_TYPE = Type.create(DotName.createSimple(ScheduledExecution.class.getName()),
             Kind.CLASS);
@@ -466,4 +467,9 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
         return null;
     }
 
+    @BuildStep
+    UnremovableBeanBuildItem unremoveableSkipPredicates() {
+        return new UnremovableBeanBuildItem(new UnremovableBeanBuildItem.BeanTypeExclusion(SKIP_PREDICATE));
+    }
+
 }
diff --git a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java
index 6f7e0b9eab1311..f04cd3eff6a4b8 100644
--- a/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java
+++ b/extensions/scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConditionalExecutionTest.java
@@ -1,11 +1,13 @@
 package io.quarkus.scheduler.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.enterprise.event.Observes;
 import javax.inject.Singleton;
@@ -44,17 +46,25 @@ public void testExecution() {
             Thread.currentThread().interrupt();
             throw new IllegalStateException(e);
         }
+
+        assertTrue(OtherIsDisabled.TESTED.get());
+        assertEquals(0, Jobs.OTHER_COUNT.get());
     }
 
     static class Jobs {
 
         static final CountDownLatch COUNTER = new CountDownLatch(1);
+        static final AtomicInteger OTHER_COUNT = new AtomicInteger(0);
 
         @Scheduled(identity = "foo", every = "1s", skipExecutionIf = IsDisabled.class)
         void doSomething() throws InterruptedException {
             COUNTER.countDown();
         }
 
+        @Scheduled(identity = "other-foo", every = "1s", skipExecutionIf = OtherIsDisabled.class)
+        void doSomethingElse() throws InterruptedException {
+            OTHER_COUNT.incrementAndGet();
+        }
     }
 
     @Singleton
@@ -77,4 +87,17 @@ void onSkip(@Observes SkippedExecution event) {
         }
 
     }
+
+    @Singleton
+    public static class OtherIsDisabled implements Scheduled.SkipPredicate {
+
+        static final AtomicBoolean TESTED = new AtomicBoolean(false);
+
+        @Override
+        public boolean test(ScheduledExecution execution) {
+            TESTED.set(true);
+            return true;
+        }
+
+    }
 }
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java
index 9b408b7d6c87d0..66f92e3ec14492 100644
--- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/DenyAllInterceptor.java
@@ -7,6 +7,8 @@
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
 
+import io.quarkus.security.spi.runtime.AuthorizationController;
+
 /**
  *
  * @author Michal Szynkiewicz, michal.l.szynkiewicz@gmail.com
@@ -19,8 +21,15 @@ public class DenyAllInterceptor {
     @Inject
     SecurityHandler handler;
 
+    @Inject
+    AuthorizationController controller;
+
     @AroundInvoke
     public Object intercept(InvocationContext ic) throws Exception {
-        return handler.handle(ic);
+        if (controller.isAuthorizationEnabled()) {
+            return handler.handle(ic);
+        } else {
+            return ic.proceed();
+        }
     }
 }
diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java
index 4b236929889147..ac80cbf0249d9e 100644
--- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java
+++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/interceptor/check/AuthenticatedCheck.java
@@ -2,21 +2,47 @@
 
 import java.lang.reflect.Method;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.InstanceHandle;
 import io.quarkus.security.UnauthorizedException;
 import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.spi.runtime.AuthorizationController;
 import io.quarkus.security.spi.runtime.SecurityCheck;
 
 public class AuthenticatedCheck implements SecurityCheck {
 
     public static final AuthenticatedCheck INSTANCE = new AuthenticatedCheck();
 
+    private volatile AuthorizationController authorizationController;
+
     private AuthenticatedCheck() {
     }
 
     @Override
     public void apply(SecurityIdentity identity, Method method, Object[] parameters) {
+        if (isAuthorizationDisabled()) {
+            return;
+        }
         if (identity.isAnonymous()) {
             throw new UnauthorizedException();
         }
     }
+
+    private boolean isAuthorizationDisabled() {
+        if (authorizationController != null) {
+            return !authorizationController.isAuthorizationEnabled();
+        }
+
+        ArcContainer container = Arc.container();
+        if ((container == null) || !container.isRunning()) {
+            return false;
+        }
+        InstanceHandle instance = container.instance(AuthorizationController.class);
+        if (instance.isAvailable()) {
+            authorizationController = instance.get();
+            return !instance.get().isAuthorizationEnabled();
+        }
+        return false;
+    }
 }
diff --git a/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java b/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java
index 5a1e138548253f..342012156657da 100644
--- a/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java
+++ b/extensions/security/spi/src/main/java/io/quarkus/security/spi/AdditionalSecuredClassesBuildItem.java
@@ -13,10 +13,8 @@
  * Contains classes that need to have @DenyAll on all methods that don't have security annotations
  */
 public final class AdditionalSecuredClassesBuildItem extends MultiBuildItem {
+
     public final Collection additionalSecuredClasses;
-    /**
-     * The roles alloe
-     */
     public final Optional> rolesAllowed;
 
     public AdditionalSecuredClassesBuildItem(Collection additionalSecuredClasses) {
diff --git a/extensions/smallrye-context-propagation/deployment/pom.xml b/extensions/smallrye-context-propagation/deployment/pom.xml
index 1cc9af0cfcb62f..2532ae391f4b1d 100644
--- a/extensions/smallrye-context-propagation/deployment/pom.xml
+++ b/extensions/smallrye-context-propagation/deployment/pom.xml
@@ -24,6 +24,11 @@
             io.quarkus
             quarkus-smallrye-context-propagation
         
+        
+            io.quarkus
+            quarkus-junit5-internal
+            test
+        
     
 
     
diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java
new file mode 100644
index 00000000000000..b93d0b1b160e8b
--- /dev/null
+++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllClearedConfigTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.smallrye.context.deployment.test;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.context.SmallRyeThreadContext;
+import io.smallrye.context.impl.ThreadContextProviderPlan;
+
+public class AllClearedConfigTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
+            .overrideConfigKey("mp.context.ThreadContext.propagated", "");
+
+    @Inject
+    SmallRyeThreadContext ctx;
+
+    @Test
+    public void test() {
+        ThreadContextProviderPlan plan = ctx.getPlan();
+        Assertions.assertTrue(plan.propagatedProviders.isEmpty());
+        Assertions.assertFalse(plan.clearedProviders.isEmpty());
+        Assertions.assertTrue(plan.unchangedProviders.isEmpty());
+    }
+}
diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java
new file mode 100644
index 00000000000000..25f9615d385abb
--- /dev/null
+++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/AllUnchangedConfigTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.smallrye.context.deployment.test;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.context.SmallRyeThreadContext;
+import io.smallrye.context.impl.ThreadContextProviderPlan;
+
+public class AllUnchangedConfigTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
+            .overrideConfigKey("mp.context.ThreadContext.unchanged", "Remaining")
+            .overrideConfigKey("mp.context.ThreadContext.propagated", "");
+
+    @Inject
+    SmallRyeThreadContext ctx;
+
+    @Test
+    public void test() {
+        ThreadContextProviderPlan plan = ctx.getPlan();
+        Assertions.assertTrue(plan.propagatedProviders.isEmpty());
+        Assertions.assertTrue(plan.clearedProviders.isEmpty());
+        Assertions.assertFalse(plan.unchangedProviders.isEmpty());
+    }
+}
diff --git a/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java
new file mode 100644
index 00000000000000..f24efdd7ec7478
--- /dev/null
+++ b/extensions/smallrye-context-propagation/deployment/src/test/java/io/quarkus/smallrye/context/deployment/test/NoConfigTest.java
@@ -0,0 +1,30 @@
+package io.quarkus.smallrye.context.deployment.test;
+
+import javax.inject.Inject;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+import io.smallrye.context.SmallRyeThreadContext;
+import io.smallrye.context.impl.ThreadContextProviderPlan;
+
+public class NoConfigTest {
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
+
+    @Inject
+    SmallRyeThreadContext ctx;
+
+    @Test
+    public void test() {
+        ThreadContextProviderPlan plan = ctx.getPlan();
+        Assertions.assertFalse(plan.propagatedProviders.isEmpty());
+        Assertions.assertTrue(plan.clearedProviders.isEmpty());
+        Assertions.assertTrue(plan.unchangedProviders.isEmpty());
+    }
+}
diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java
index 8324186dbca2ea..d47a7f087cd2ac 100644
--- a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java
+++ b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationProvider.java
@@ -16,7 +16,8 @@ public class SmallRyeContextPropagationProvider {
     @Singleton
     @DefaultBean
     public SmallRyeThreadContext getAllThreadContext() {
-        return (SmallRyeThreadContext) ThreadContext.builder().propagated(ThreadContext.ALL_REMAINING).cleared().unchanged()
+        // Make sure we use the default values, which use the MP Config keys to allow users to override them
+        return (SmallRyeThreadContext) ThreadContext.builder()
                 .build();
     }
 
diff --git a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
index 2c541aceada9c8..86179875d4ec47 100644
--- a/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
+++ b/extensions/smallrye-context-propagation/runtime/src/main/java/io/quarkus/smallrye/context/runtime/SmallRyeContextPropagationRecorder.java
@@ -50,7 +50,8 @@ public void configureRuntime(ExecutorService executorService, ShutdownContext sh
         SmallRyeContextManager contextManager = builder.build();
 
         contextManagerProvider.registerContextManager(contextManager, Thread.currentThread().getContextClassLoader());
-        shutdownContext.addShutdownTask(new Runnable() {
+        //needs to be late, as running threads can re-create an implicit one
+        shutdownContext.addLastShutdownTask(new Runnable() {
             @Override
             public void run() {
                 contextManagerProvider.releaseContextManager(contextManager);
diff --git a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java
index b14d2983bc62ad..20eb364655d009 100644
--- a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java
+++ b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/GraphQLClientConfigurationMergerBean.java
@@ -13,14 +13,13 @@
  * On startup, this beans takes Quarkus-specific configuration of GraphQL clients (quarkus.* properties)
  * and merges this configuration with the configuration parsed by SmallRye GraphQL itself (CLIENT/mp-graphql/* properties)
  *
- * The resulting merged configuration resides in the application-scoped `io.smallrye.graphql.client.GraphQLClientConfiguration`
+ * The resulting merged configuration resides in `io.smallrye.graphql.client.GraphQLClientsConfiguration`
  *
  * Quarkus configuration overrides SmallRye configuration where applicable.
  */
 @Singleton
 public class GraphQLClientConfigurationMergerBean {
 
-    @Inject
     GraphQLClientsConfiguration upstreamConfiguration;
 
     @Inject
@@ -31,6 +30,7 @@ public class GraphQLClientConfigurationMergerBean {
 
     @PostConstruct
     void enhanceGraphQLConfiguration() {
+        upstreamConfiguration = GraphQLClientsConfiguration.getInstance();
         for (Map.Entry client : quarkusConfiguration.clients.entrySet()) {
             // the raw config key provided in the config, this might be a short class name,
             // so translate that into the fully qualified name if applicable
@@ -43,14 +43,14 @@ void enhanceGraphQLConfiguration() {
 
             GraphQLClientConfig quarkusConfig = client.getValue();
             // if SmallRye configuration does not contain this client, simply use it
-            if (!upstreamConfiguration.getClients().containsKey(configKey)) {
+            if (upstreamConfiguration.getClient(configKey) == null) {
                 GraphQLClientConfiguration transformed = new GraphQLClientConfiguration();
                 transformed.setHeaders(quarkusConfig.headers);
                 quarkusConfig.url.ifPresent(transformed::setUrl);
-                upstreamConfiguration.getClients().put(configKey, transformed);
+                upstreamConfiguration.addClient(configKey, transformed);
             } else {
                 // if SmallRye configuration already contains this client, override it with the Quarkus configuration
-                GraphQLClientConfiguration upstreamConfig = upstreamConfiguration.getClients().get(configKey);
+                GraphQLClientConfiguration upstreamConfig = upstreamConfiguration.getClient(configKey);
                 quarkusConfig.url.ifPresent(upstreamConfig::setUrl);
                 // merge the headers
                 if (quarkusConfig.headers != null) {
diff --git a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java
index 041c43129fd9c9..a7bffb28e752aa 100644
--- a/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java
+++ b/extensions/smallrye-graphql-client/runtime/src/main/java/io/quarkus/smallrye/graphql/client/runtime/SmallRyeGraphQLClientRecorder.java
@@ -22,7 +22,8 @@ public  Supplier typesafeClientSupplier(Class targetClassName) {
     }
 
     public void setTypesafeApiClasses(List apiClassNames) {
-        GraphQLClientsConfiguration configBean = Arc.container().instance(GraphQLClientsConfiguration.class).get();
+        GraphQLClientsConfiguration.setSingleApplication(true);
+        GraphQLClientsConfiguration configBean = GraphQLClientsConfiguration.getInstance();
         List> classes = apiClassNames.stream().map(className -> {
             try {
                 return Class.forName(className, true, Thread.currentThread().getContextClassLoader());
@@ -30,7 +31,7 @@ public void setTypesafeApiClasses(List apiClassNames) {
                 throw new RuntimeException(e);
             }
         }).collect(Collectors.toList());
-        configBean.apiClasses(classes, true);
+        configBean.addTypesafeClientApis(classes);
     }
 
     public RuntimeValue clientSupport(Map shortNamesToQualifiedNames) {
diff --git a/extensions/smallrye-graphql/deployment/pom.xml b/extensions/smallrye-graphql/deployment/pom.xml
index cf6474ef198151..cd7dd722d20ea4 100644
--- a/extensions/smallrye-graphql/deployment/pom.xml
+++ b/extensions/smallrye-graphql/deployment/pom.xml
@@ -18,7 +18,6 @@
         
             io.quarkus
             quarkus-smallrye-graphql
-            ${project.version}
         
         
         
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java
new file mode 100644
index 00000000000000..6b87a8d21ee6ef
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/OverridableIndex.java
@@ -0,0 +1,250 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.jboss.jandex.AnnotationInstance;
+import org.jboss.jandex.AnnotationTarget;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
+import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.MethodParameterInfo;
+import org.jboss.jandex.ModuleInfo;
+import org.jboss.jandex.RecordComponentInfo;
+import org.jboss.jandex.Type;
+
+public class OverridableIndex implements IndexView {
+
+    private final IndexView original;
+    private final IndexView override;
+
+    private OverridableIndex(IndexView original, IndexView override) {
+        this.original = original;
+        this.override = override;
+    }
+
+    public static OverridableIndex create(IndexView original, IndexView override) {
+        return new OverridableIndex(original, override);
+    }
+
+    @Override
+    public Collection getKnownClasses() {
+        return overrideCollection(original.getKnownClasses(), override.getKnownClasses(), classInfoComparator);
+    }
+
+    @Override
+    public ClassInfo getClassByName(DotName dn) {
+        return overrideObject(original.getClassByName(dn), override.getClassByName(dn));
+    }
+
+    @Override
+    public Collection getKnownDirectSubclasses(DotName dn) {
+        return overrideCollection(original.getKnownDirectSubclasses(dn), override.getKnownDirectSubclasses(dn),
+                classInfoComparator);
+    }
+
+    @Override
+    public Collection getAllKnownSubclasses(DotName dn) {
+        return overrideCollection(original.getAllKnownSubclasses(dn), override.getAllKnownSubclasses(dn), classInfoComparator);
+    }
+
+    @Override
+    public Collection getKnownDirectImplementors(DotName dn) {
+        return overrideCollection(original.getKnownDirectImplementors(dn), override.getKnownDirectImplementors(dn),
+                classInfoComparator);
+    }
+
+    @Override
+    public Collection getAllKnownImplementors(DotName dn) {
+        return overrideCollection(original.getAllKnownImplementors(dn), override.getAllKnownImplementors(dn),
+                classInfoComparator);
+    }
+
+    @Override
+    public Collection getAnnotations(DotName dn) {
+        return overrideCollection(original.getAnnotations(dn), override.getAnnotations(dn), annotationInstanceComparator);
+    }
+
+    @Override
+    public Collection getAnnotationsWithRepeatable(DotName dn, IndexView iv) {
+        return overrideCollection(original.getAnnotationsWithRepeatable(dn, iv), override.getAnnotationsWithRepeatable(dn, iv),
+                annotationInstanceComparator);
+    }
+
+    @Override
+    public Collection getKnownModules() {
+        return overrideCollection(original.getKnownModules(), override.getKnownModules(), moduleInfoComparator);
+    }
+
+    @Override
+    public ModuleInfo getModuleByName(DotName dn) {
+        return overrideObject(original.getModuleByName(dn), override.getModuleByName(dn));
+    }
+
+    @Override
+    public Collection getKnownUsers(DotName dn) {
+        return overrideCollection(original.getKnownUsers(dn), override.getKnownUsers(dn), classInfoComparator);
+    }
+
+    private Comparator classInfoComparator = new Comparator() {
+        @Override
+        public int compare(ClassInfo t, ClassInfo t1) {
+            return t.name().toString().compareTo(t1.name().toString());
+        }
+    };
+
+    private Comparator typeComparator = new Comparator() {
+        @Override
+        public int compare(Type t, Type t1) {
+            return t.name().toString().compareTo(t1.name().toString());
+        }
+    };
+
+    private Comparator moduleInfoComparator = new Comparator() {
+        @Override
+        public int compare(ModuleInfo t, ModuleInfo t1) {
+            return t.name().toString().compareTo(t1.name().toString());
+        }
+    };
+
+    private Comparator fieldInfoComparator = new Comparator() {
+        @Override
+        public int compare(FieldInfo t, FieldInfo t1) {
+            if (classInfoComparator.compare(t.declaringClass(), t1.declaringClass()) == 0) { // Same class
+                return t.name().toString().compareTo(t1.name().toString());
+            }
+            return -1;
+        }
+    };
+
+    private Comparator recordComponentInfoComparator = new Comparator() {
+        @Override
+        public int compare(RecordComponentInfo t, RecordComponentInfo t1) {
+            if (classInfoComparator.compare(t.declaringClass(), t1.declaringClass()) == 0) { // Same class
+                return t.name().toString().compareTo(t1.name().toString());
+            }
+            return -1;
+        }
+    };
+
+    private Comparator methodInfoComparator = new Comparator() {
+        @Override
+        public int compare(MethodInfo t, MethodInfo t1) {
+            if (classInfoComparator.compare(t.declaringClass(), t1.declaringClass()) == 0) { // Same class
+                if (t.name().toString().compareTo(t1.name().toString()) == 0) { // Same method name
+                    if (t.parameters().size() == t1.parameters().size()) { // Same number of parameters
+                        for (int i = 0; i < t.parameters().size(); i++) {
+                            int typeTheSame = typeComparator.compare(t.parameters().get(i), t1.parameters().get(i));
+                            if (typeTheSame != 0) {
+                                return typeTheSame;
+                            }
+                        }
+                        // All parameter type are the same
+                        return 0;
+                    }
+                }
+            }
+            return -1;
+        }
+    };
+
+    private Comparator methodParameterInfoComparator = new Comparator() {
+        @Override
+        public int compare(MethodParameterInfo t, MethodParameterInfo t1) {
+            if (methodInfoComparator.compare(t.method(), t1.method()) == 0 && // Same method
+                    t.kind().equals(t1.kind()) && // Same kind
+                    t.name().equals(t1.name()) && // Same name
+                    t.position() == t1.position()) { // Same position
+                return 0;
+            }
+            return -1;
+        }
+    };
+
+    private Comparator annotationInstanceComparator = new Comparator() {
+        @Override
+        public int compare(AnnotationInstance t, AnnotationInstance t1) {
+            if (t.name().equals(t1.name())) {
+                // Class Info
+                if (t.target().kind().equals(AnnotationTarget.Kind.CLASS)
+                        && t1.target().kind().equals(AnnotationTarget.Kind.CLASS)) {
+                    return classInfoComparator.compare(t.target().asClass(), t1.target().asClass());
+                }
+
+                // Field Info
+                if (t.target().kind().equals(AnnotationTarget.Kind.FIELD)
+                        && t1.target().kind().equals(AnnotationTarget.Kind.FIELD)) {
+                    return fieldInfoComparator.compare(t.target().asField(), t1.target().asField());
+                }
+
+                // Type
+                if (t.target().kind().equals(AnnotationTarget.Kind.TYPE)
+                        && t1.target().kind().equals(AnnotationTarget.Kind.TYPE)) {
+                    return typeComparator.compare(t.target().asType().target(), t1.target().asType().target());
+                }
+
+                // Method Info
+                if (t.target().kind().equals(AnnotationTarget.Kind.METHOD)
+                        && t1.target().kind().equals(AnnotationTarget.Kind.METHOD)) {
+                    return methodInfoComparator.compare(t.target().asMethod(), t1.target().asMethod());
+                }
+
+                // Method Parameter
+                if (t.target().kind().equals(AnnotationTarget.Kind.METHOD_PARAMETER)
+                        && t1.target().kind().equals(AnnotationTarget.Kind.METHOD_PARAMETER)) {
+                    return methodParameterInfoComparator.compare(t.target().asMethodParameter(),
+                            t1.target().asMethodParameter());
+                }
+
+                // Record
+                if (t.target().kind().equals(AnnotationTarget.Kind.RECORD_COMPONENT)
+                        && t1.target().kind().equals(AnnotationTarget.Kind.RECORD_COMPONENT)) {
+                    return recordComponentInfoComparator.compare(t.target().asRecordComponent(),
+                            t1.target().asRecordComponent());
+                }
+            }
+            return -1;
+        }
+    };
+
+    private  Collection overrideCollection(Collection originalCollection, Collection overrideCollection,
+            Comparator comparator) {
+        if (originalCollection == null && overrideCollection == null) {
+            return null;
+        }
+
+        if (originalCollection == null) {
+            return overrideCollection;
+        }
+        if (overrideCollection == null) {
+            return originalCollection;
+        }
+
+        if (originalCollection.isEmpty() && overrideCollection.isEmpty()) {
+            return originalCollection;
+        }
+
+        if (originalCollection.isEmpty()) {
+            return overrideCollection;
+        }
+        if (overrideCollection.isEmpty()) {
+            return originalCollection;
+        }
+
+        Set newCollection = new TreeSet<>(comparator);
+        newCollection.addAll(overrideCollection);
+        newCollection.addAll(originalCollection); // Won't add if it's already there.
+        return newCollection;
+    }
+
+    private  T overrideObject(T originalObject, T overrideObject) {
+        if (overrideObject != null) {
+            return overrideObject;
+        }
+        return originalObject;
+    }
+}
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java
new file mode 100644
index 00000000000000..c6c3c0e3bea1d2
--- /dev/null
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLIndexBuildItem.java
@@ -0,0 +1,18 @@
+package io.quarkus.smallrye.graphql.deployment;
+
+import java.util.Map;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class SmallRyeGraphQLIndexBuildItem extends SimpleBuildItem {
+
+    private final Map modifiedClases;
+
+    public SmallRyeGraphQLIndexBuildItem(Map modifiedClases) {
+        this.modifiedClases = modifiedClases;
+    }
+
+    public Map getModifiedClases() {
+        return modifiedClases;
+    }
+}
diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
index 52ac9f9278bfc4..22de82bc20aad3 100644
--- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
+++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
@@ -1,9 +1,11 @@
 package io.quarkus.smallrye.graphql.deployment;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -13,7 +15,7 @@
 import java.util.stream.Stream;
 
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.jboss.jandex.IndexView;
+import org.jboss.jandex.Indexer;
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
@@ -38,6 +40,7 @@
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
+import io.quarkus.deployment.builditem.TransformedClassesBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
@@ -158,6 +161,22 @@ void registerNativeImageResources(BuildProducer servic
                 .produce(ServiceProviderBuildItem.allProvidersFromClassPath(SmallRyeGraphQLConfigMapping.class.getName()));
     }
 
+    @BuildStep
+    SmallRyeGraphQLIndexBuildItem createIndex(TransformedClassesBuildItem transformedClassesBuildItem) {
+        Map modifiedClasses = new HashMap<>();
+        Map> transformedClassesByJar = transformedClassesBuildItem
+                .getTransformedClassesByJar();
+        for (Map.Entry> transformedClassesByJarEntrySet : transformedClassesByJar
+                .entrySet()) {
+
+            Set transformedClasses = transformedClassesByJarEntrySet.getValue();
+            for (TransformedClassesBuildItem.TransformedClass transformedClass : transformedClasses) {
+                modifiedClasses.put(transformedClass.getClassName(), transformedClass.getData());
+            }
+        }
+        return new SmallRyeGraphQLIndexBuildItem(modifiedClasses);
+    }
+
     @Record(ExecutionTime.STATIC_INIT)
     @BuildStep
     void buildExecutionService(
@@ -165,13 +184,25 @@ void buildExecutionService(
             BuildProducer reflectiveHierarchyProducer,
             BuildProducer graphQLInitializedProducer,
             SmallRyeGraphQLRecorder recorder,
+            SmallRyeGraphQLIndexBuildItem graphQLIndexBuildItem,
             BeanContainerBuildItem beanContainer,
             CombinedIndexBuildItem combinedIndex,
             SmallRyeGraphQLConfig graphQLConfig) {
 
-        IndexView index = combinedIndex.getIndex();
+        Indexer indexer = new Indexer();
+        Map modifiedClases = graphQLIndexBuildItem.getModifiedClases();
+
+        for (Map.Entry kv : modifiedClases.entrySet()) {
+            try (ByteArrayInputStream bais = new ByteArrayInputStream(kv.getValue())) {
+                indexer.index(bais);
+            } catch (IOException ex) {
+                LOG.warn("Could not index [" + kv.getKey() + "] - " + ex.getMessage());
+            }
+        }
+
+        OverridableIndex overridableIndex = OverridableIndex.create(combinedIndex.getIndex(), indexer.complete());
 
-        Schema schema = SchemaBuilder.build(index, graphQLConfig.autoNameStrategy);
+        Schema schema = SchemaBuilder.build(overridableIndex, graphQLConfig.autoNameStrategy);
 
         RuntimeValue initialized = recorder.createExecutionService(beanContainer.getValue(), schema);
         graphQLInitializedProducer.produce(new SmallRyeGraphQLInitializedBuildItem(initialized));
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java
index 5976f6ffed18df..8b25292acd725d 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/HotReloadTest.java
@@ -1,5 +1,8 @@
 package io.quarkus.smallrye.graphql.deployment;
 
+import static io.quarkus.smallrye.graphql.deployment.AbstractGraphQLTest.MEDIATYPE_JSON;
+
+import org.hamcrest.CoreMatchers;
 import org.jboss.logging.Logger;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -9,6 +12,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
 
 /**
  * Test Hot reload after a code change
@@ -25,6 +29,79 @@ public class HotReloadTest extends AbstractGraphQLTest {
                     .addAsResource(new StringAsset(getPropertyAsString()), "application.properties")
                     .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
 
+    @Test
+    public void testAddAndRemoveFieldChange() {
+
+        String fooRequest = getPayload("{\n" +
+                "  foo {\n" +
+                "    message\n" +
+                "    randomNumber{\n" +
+                "       value\n" +
+                "    }\n" +
+                "    foo\n" +
+                "    list\n" +
+                "  }\n" +
+                "}");
+
+        // Do a request 
+        RestAssured.given().when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(fooRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString(
+                        "{\"errors\":[{\"message\":\"Validation error of type FieldUndefined: Field 'foo' in type 'TestPojo' is undefined @ 'foo/foo'\",\"locations\":[{\"line\":7,\"column\":5}],\"extensions\":{\"classification\":\"ValidationError\"}}],\"data\":null}"));
+        LOG.info("Initial request done");
+
+        // Make a code change (add a field)
+        TEST.modifySourceFile("TestPojo.java", s -> s.replace("// ",
+                "private String foo = \"bar\";\n" +
+                        "    public String getFoo(){\n" +
+                        "        return foo;\n" +
+                        "    }"));
+        LOG.info("Code change done - field added");
+
+        // Do the request again
+        RestAssured.given().when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(fooRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString(
+                        "{\"data\":{\"foo\":{\"message\":\"bar\",\"randomNumber\":{\"value\":123.0},\"foo\":\"bar\",\"list\":[\"a\",\"b\",\"c\"]}}}"));
+        LOG.info("Hot reload done");
+
+        // Make a code change again (remove)
+        TEST.modifySourceFile("TestPojo.java", s -> s.replace("private String foo = \"bar\";\n" +
+                "    public String getFoo(){\n" +
+                "        return foo;\n" +
+                "    }", "// "));
+
+        // Do the request yet again
+        RestAssured.given().when()
+                .accept(MEDIATYPE_JSON)
+                .contentType(MEDIATYPE_JSON)
+                .body(fooRequest)
+                .post("/graphql")
+                .then()
+                .assertThat()
+                .statusCode(200)
+                .and()
+                .body(CoreMatchers.containsString(
+                        "{\"errors\":[{\"message\":\"Validation error of type FieldUndefined: Field 'foo' in type 'TestPojo' is undefined @ 'foo/foo'\",\"locations\":[{\"line\":7,\"column\":5}],\"extensions\":{\"classification\":\"ValidationError\"}}],\"data\":null}"));
+
+        LOG.info("Code change done - field removed");
+
+    }
+
     @Test
     public void testCodeChange() {
         // Do a request 
diff --git a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java
index 65ff1aea165485..ad707a3149bfd6 100644
--- a/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java
+++ b/extensions/smallrye-graphql/deployment/src/test/java/io/quarkus/smallrye/graphql/deployment/TestPojo.java
@@ -45,6 +45,8 @@ public void setNumber(Number number) {
         this.number = number;
     }
 
+    // 
+
     @Override
     public String toString() {
         return "TestPojo{" + "message=" + message + ", list=" + list + ", number=" + number + '}';
diff --git a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java
index a4aeafe88a9819..3fe6668cc1282c 100644
--- a/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java
+++ b/extensions/smallrye-jwt/deployment/src/main/java/io/quarkus/smallrye/jwt/deployment/SmallRyeJwtProcessor.java
@@ -37,6 +37,7 @@
 import io.quarkus.smallrye.jwt.runtime.auth.JwtPrincipalProducer;
 import io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator;
 import io.quarkus.smallrye.jwt.runtime.auth.RawOptionalClaimCreator;
+import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem;
 import io.smallrye.jwt.algorithm.KeyEncryptionAlgorithm;
 import io.smallrye.jwt.algorithm.SignatureAlgorithm;
 import io.smallrye.jwt.auth.cdi.ClaimValueProducer;
@@ -69,6 +70,11 @@ EnableAllSecurityServicesBuildItem security() {
         return new EnableAllSecurityServicesBuildItem();
     }
 
+    @BuildStep(onlyIf = IsEnabled.class)
+    public void provideSecurityInformation(BuildProducer securityInformationProducer) {
+        securityInformationProducer.produce(SecurityInformationBuildItem.JWT());
+    }
+
     /**
      * Register the CDI beans that are needed by the MP-JWT extension
      *
diff --git a/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java b/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java
index ee2c9295eb5833..22a8546f728d44 100644
--- a/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java
+++ b/extensions/smallrye-openapi-common/deployment/src/main/java/io/quarkus/smallrye/openapi/common/deployment/SmallRyeOpenApiConfig.java
@@ -70,6 +70,12 @@ public final class SmallRyeOpenApiConfig {
     @ConfigItem(defaultValue = "true")
     public boolean autoAddTags;
 
+    /**
+     * This will automatically add security based on the security extension included (if any).
+     */
+    @ConfigItem(defaultValue = "true")
+    public boolean autoAddSecurity;
+
     /**
      * Add a scheme value to the Basic HTTP Security Scheme
      */
diff --git a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
index 3689aef33ab9e4..12e0526b51802b 100644
--- a/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
+++ b/extensions/smallrye-openapi/deployment/src/main/java/io/quarkus/smallrye/openapi/deployment/SmallRyeOpenApiProcessor.java
@@ -76,9 +76,14 @@
 import io.quarkus.smallrye.openapi.runtime.OpenApiDocumentService;
 import io.quarkus.smallrye.openapi.runtime.OpenApiRecorder;
 import io.quarkus.smallrye.openapi.runtime.OpenApiRuntimeConfig;
+import io.quarkus.smallrye.openapi.runtime.filter.AutoBasicSecurityFilter;
+import io.quarkus.smallrye.openapi.runtime.filter.AutoJWTSecurityFilter;
+import io.quarkus.smallrye.openapi.runtime.filter.AutoUrl;
+import io.quarkus.smallrye.openapi.runtime.filter.OpenIDConnectSecurityFilter;
 import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.deployment.SecurityInformationBuildItem;
 import io.quarkus.vertx.http.deployment.devmode.NotFoundPageDisplayableEndpointBuildItem;
 import io.quarkus.vertx.http.runtime.HttpConfiguration;
 import io.smallrye.openapi.api.OpenApiConfig;
@@ -168,9 +173,11 @@ RouteBuildItem handler(LaunchModeBuildItem launch,
             BuildProducer displayableEndpoints,
             OpenApiRecorder recorder,
             NonApplicationRootPathBuildItem nonApplicationRootPathBuildItem,
+            List securityInformationBuildItems,
             OpenApiRuntimeConfig openApiRuntimeConfig,
             ShutdownContextBuildItem shutdownContext,
             SmallRyeOpenApiConfig openApiConfig,
+            OpenApiFilteredIndexViewBuildItem apiFilteredIndexViewBuildItem,
             HttpConfiguration httpConfiguration) {
         /*
          * Ugly Hack
@@ -187,7 +194,17 @@ RouteBuildItem handler(LaunchModeBuildItem launch,
             recorder.setupClDevMode(shutdownContext);
         }
 
-        Handler handler = recorder.handler(openApiRuntimeConfig, httpConfiguration);
+        OASFilter autoSecurityFilter = null;
+        if (openApiConfig.autoAddSecurity) {
+            // Only add the security if there are secured endpoints
+            OASFilter autoRolesAllowedFilter = getAutoRolesAllowedFilter(openApiConfig.securitySchemeName,
+                    apiFilteredIndexViewBuildItem, openApiConfig);
+            if (autoRolesAllowedFilter != null) {
+                autoSecurityFilter = getAutoSecurityFilter(securityInformationBuildItems, openApiConfig);
+            }
+        }
+
+        Handler handler = recorder.handler(openApiRuntimeConfig, httpConfiguration, autoSecurityFilter);
         return nonApplicationRootPathBuildItem.routeBuilder()
                 .route(openApiConfig.path)
                 .routeConfigKey("quarkus.smallrye-openapi.path")
@@ -277,6 +294,64 @@ void addSecurityFilter(BuildProducer addToOpenA
 
     }
 
+    private OASFilter getAutoSecurityFilter(List securityInformationBuildItems,
+            SmallRyeOpenApiConfig config) {
+
+        // Auto add a security from security extension(s)
+        if (!config.securityScheme.isPresent() && securityInformationBuildItems != null
+                && !securityInformationBuildItems.isEmpty()) {
+            // This needs to be a filter in runtime as the config we use to auto configure is in runtime
+            for (SecurityInformationBuildItem securityInformationBuildItem : securityInformationBuildItems) {
+                SecurityInformationBuildItem.SecurityModel securityModel = securityInformationBuildItem.getSecurityModel();
+                switch (securityModel) {
+                    case jwt:
+                        return new AutoJWTSecurityFilter(
+                                config.securitySchemeName,
+                                config.securitySchemeDescription,
+                                config.jwtSecuritySchemeValue,
+                                config.jwtBearerFormat);
+                    case basic:
+                        return new AutoBasicSecurityFilter(
+                                config.securitySchemeName,
+                                config.securitySchemeDescription,
+                                config.basicSecuritySchemeValue);
+                    case oidc:
+                        Optional maybeInfo = securityInformationBuildItem
+                                .getOpenIDConnectInformation();
+
+                        if (maybeInfo.isPresent()) {
+                            SecurityInformationBuildItem.OpenIDConnectInformation info = maybeInfo.get();
+
+                            AutoUrl authorizationUrl = new AutoUrl(
+                                    config.oidcOpenIdConnectUrl.orElse(null),
+                                    info.getUrlConfigKey(),
+                                    "/protocol/openid-connect/auth");
+
+                            AutoUrl refreshUrl = new AutoUrl(
+                                    config.oidcOpenIdConnectUrl.orElse(null),
+                                    info.getUrlConfigKey(),
+                                    "/protocol/openid-connect/token");
+
+                            AutoUrl tokenUrl = new AutoUrl(
+                                    config.oidcOpenIdConnectUrl.orElse(null),
+                                    info.getUrlConfigKey(),
+                                    "/protocol/openid-connect/token/introspect");
+
+                            return new OpenIDConnectSecurityFilter(
+                                    config.securitySchemeName,
+                                    config.securitySchemeDescription,
+                                    authorizationUrl, refreshUrl, tokenUrl);
+
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        return null;
+    }
+
     private OASFilter getAutoRolesAllowedFilter(String securitySchemeName,
             OpenApiFilteredIndexViewBuildItem apiFilteredIndexViewBuildItem,
             SmallRyeOpenApiConfig config) {
@@ -597,7 +672,7 @@ private OpenAPI generateAnnotationModel(IndexView indexView, Capabilities capabi
             HttpRootPathBuildItem httpRootPathBuildItem,
             Optional resteasyJaxrsConfig) {
         Config config = ConfigProvider.getConfig();
-        OpenApiConfig openApiConfig = new OpenApiConfigImpl(config);
+        OpenApiConfig openApiConfig = OpenApiConfigImpl.fromConfig(config);
 
         List extensions = new ArrayList<>();
 
@@ -610,6 +685,7 @@ private OpenAPI generateAnnotationModel(IndexView indexView, Capabilities capabi
             }
         } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
             extensions.add(new RESTEasyExtension(indexView));
+            openApiConfig.doAllowNakedPathParameter();
             Optional maybePath = config.getOptionalValue("quarkus.resteasy-reactive.path", String.class);
             if (maybePath.isPresent()) {
                 defaultPath = maybePath.get();
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java
index c9625b408becfe..95f19a6f1f1bf3 100644
--- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiDocumentService.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.config.Config;
@@ -30,16 +29,15 @@ public class OpenApiDocumentService implements OpenApiDocumentHolder {
 
     private OpenApiDocumentHolder documentHolder;
 
-    @PostConstruct
-    void create() throws IOException {
+    void init(OASFilter autoSecurityFilter) {
 
         Config config = ConfigProvider.getConfig();
         this.alwaysRunFilter = config.getOptionalValue("quarkus.smallrye-openapi.always-run-filter", Boolean.class)
                 .orElse(Boolean.FALSE);
         if (alwaysRunFilter) {
-            this.documentHolder = new DynamicDocument(config);
+            this.documentHolder = new DynamicDocument(config, autoSecurityFilter);
         } else {
-            this.documentHolder = new StaticDocument(config);
+            this.documentHolder = new StaticDocument(config, autoSecurityFilter);
         }
     }
 
@@ -59,7 +57,7 @@ class StaticDocument implements OpenApiDocumentHolder {
         private byte[] jsonDocument;
         private byte[] yamlDocument;
 
-        StaticDocument(Config config) {
+        StaticDocument(Config config, OASFilter autoFilter) {
             ClassLoader cl = OpenApiConstants.classLoader == null ? Thread.currentThread().getContextClassLoader()
                     : OpenApiConstants.classLoader;
             try (InputStream is = cl.getResourceAsStream(OpenApiConstants.BASE_NAME + Format.JSON)) {
@@ -72,6 +70,9 @@ class StaticDocument implements OpenApiDocumentHolder {
                         document.reset();
                         document.config(openApiConfig);
                         document.modelFromStaticFile(OpenApiProcessor.modelFromStaticFile(staticFile));
+                        if (autoFilter != null) {
+                            document.filter(autoFilter);
+                        }
                         document.filter(OpenApiProcessor.getFilter(openApiConfig, cl));
                         document.initialize();
 
@@ -104,9 +105,10 @@ class DynamicDocument implements OpenApiDocumentHolder {
 
         private OpenAPI generatedOnBuild;
         private OpenApiConfig openApiConfig;
-        private OASFilter filter;
+        private OASFilter userFilter;
+        private OASFilter autoFilter;
 
-        DynamicDocument(Config config) {
+        DynamicDocument(Config config, OASFilter autoFilter) {
             ClassLoader cl = OpenApiConstants.classLoader == null ? Thread.currentThread().getContextClassLoader()
                     : OpenApiConstants.classLoader;
             try (InputStream is = cl.getResourceAsStream(OpenApiConstants.BASE_NAME + Format.JSON)) {
@@ -114,7 +116,8 @@ class DynamicDocument implements OpenApiDocumentHolder {
                     try (OpenApiStaticFile staticFile = new OpenApiStaticFile(is, Format.JSON)) {
                         this.generatedOnBuild = OpenApiProcessor.modelFromStaticFile(staticFile);
                         this.openApiConfig = new OpenApiConfigImpl(config);
-                        this.filter = OpenApiProcessor.getFilter(openApiConfig, cl);
+                        this.userFilter = OpenApiProcessor.getFilter(openApiConfig, cl);
+                        this.autoFilter = autoFilter;
                     }
                 }
             } catch (IOException ex) {
@@ -153,7 +156,10 @@ private OpenApiDocument getOpenApiDocument() {
             document.reset();
             document.config(this.openApiConfig);
             document.modelFromStaticFile(this.generatedOnBuild);
-            document.filter(this.filter);
+            if (this.autoFilter != null) {
+                document.filter(this.autoFilter);
+            }
+            document.filter(this.userFilter);
             document.initialize();
             return document;
         }
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java
index 9be329c3afea77..c226b42b47fc3b 100644
--- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiHandler.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import org.eclipse.microprofile.openapi.OASFilter;
+
 import io.quarkus.arc.Arc;
 import io.smallrye.openapi.runtime.io.Format;
 import io.vertx.core.Handler;
@@ -32,9 +34,11 @@ public class OpenApiHandler implements Handler {
     }
 
     final boolean corsEnabled;
+    final OASFilter autoSecurityFilter;
 
-    public OpenApiHandler(boolean corsEnabled) {
+    public OpenApiHandler(boolean corsEnabled, OASFilter autoSecurityFilter) {
         this.corsEnabled = corsEnabled;
+        this.autoSecurityFilter = autoSecurityFilter;
     }
 
     @Override
@@ -77,6 +81,7 @@ public void handle(RoutingContext event) {
     private OpenApiDocumentService getOpenApiDocumentService() {
         if (this.openApiDocumentService == null) {
             this.openApiDocumentService = Arc.container().instance(OpenApiDocumentService.class).get();
+            this.openApiDocumentService.init(this.autoSecurityFilter);
         }
         return this.openApiDocumentService;
     }
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java
index be5250c3b0075e..3d3e3c196ee282 100644
--- a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/OpenApiRecorder.java
@@ -5,6 +5,7 @@
 import java.net.URL;
 import java.util.Enumeration;
 
+import org.eclipse.microprofile.openapi.OASFilter;
 import org.eclipse.microprofile.openapi.spi.OASFactoryResolver;
 
 import io.quarkus.runtime.ShutdownContext;
@@ -16,9 +17,10 @@
 @Recorder
 public class OpenApiRecorder {
 
-    public Handler handler(OpenApiRuntimeConfig runtimeConfig, HttpConfiguration configuration) {
+    public Handler handler(OpenApiRuntimeConfig runtimeConfig, HttpConfiguration configuration,
+            OASFilter autoSecurityFilter) {
         if (runtimeConfig.enable) {
-            return new OpenApiHandler(configuration.corsEnabled);
+            return new OpenApiHandler(configuration.corsEnabled, autoSecurityFilter);
         } else {
             return new OpenApiNotFoundHandler();
         }
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java
new file mode 100644
index 00000000000000..fc1850052c0504
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoBasicSecurityFilter.java
@@ -0,0 +1,37 @@
+package io.quarkus.smallrye.openapi.runtime.filter;
+
+import org.eclipse.microprofile.openapi.OASFactory;
+import org.eclipse.microprofile.openapi.models.security.SecurityScheme;
+
+/**
+ * Add Basic Authentication security automatically based on the added security extensions
+ */
+public class AutoBasicSecurityFilter extends AutoSecurityFilter {
+    private String basicSecuritySchemeValue;
+
+    public AutoBasicSecurityFilter() {
+        super();
+    }
+
+    public AutoBasicSecurityFilter(String securitySchemeName, String securitySchemeDescription,
+            String basicSecuritySchemeValue) {
+        super(securitySchemeName, securitySchemeDescription);
+        this.basicSecuritySchemeValue = basicSecuritySchemeValue;
+    }
+
+    public String getBasicSecuritySchemeValue() {
+        return basicSecuritySchemeValue;
+    }
+
+    public void setBasicSecuritySchemeValue(String basicSecuritySchemeValue) {
+        this.basicSecuritySchemeValue = basicSecuritySchemeValue;
+    }
+
+    @Override
+    protected SecurityScheme getSecurityScheme() {
+        SecurityScheme securityScheme = OASFactory.createSecurityScheme();
+        securityScheme.setType(SecurityScheme.Type.HTTP);
+        securityScheme.setScheme(basicSecuritySchemeValue);
+        return securityScheme;
+    }
+}
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java
new file mode 100644
index 00000000000000..c246fce55b844a
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoJWTSecurityFilter.java
@@ -0,0 +1,48 @@
+package io.quarkus.smallrye.openapi.runtime.filter;
+
+import org.eclipse.microprofile.openapi.OASFactory;
+import org.eclipse.microprofile.openapi.models.security.SecurityScheme;
+
+/**
+ * Add JWT Authentication security automatically based on the added security extensions
+ */
+public class AutoJWTSecurityFilter extends AutoSecurityFilter {
+    private String jwtSecuritySchemeValue;
+    private String jwtBearerFormat;
+
+    public AutoJWTSecurityFilter() {
+        super();
+    }
+
+    public AutoJWTSecurityFilter(String securitySchemeName, String securitySchemeDescription, String jwtSecuritySchemeValue,
+            String jwtBearerFormat) {
+        super(securitySchemeName, securitySchemeDescription);
+        this.jwtSecuritySchemeValue = jwtSecuritySchemeValue;
+        this.jwtBearerFormat = jwtBearerFormat;
+    }
+
+    public String getJwtSecuritySchemeValue() {
+        return jwtSecuritySchemeValue;
+    }
+
+    public void setJwtSecuritySchemeValue(String jwtSecuritySchemeValue) {
+        this.jwtSecuritySchemeValue = jwtSecuritySchemeValue;
+    }
+
+    public String getJwtBearerFormat() {
+        return jwtBearerFormat;
+    }
+
+    public void setJwtBearerFormat(String jwtBearerFormat) {
+        this.jwtBearerFormat = jwtBearerFormat;
+    }
+
+    @Override
+    protected SecurityScheme getSecurityScheme() {
+        SecurityScheme securityScheme = OASFactory.createSecurityScheme();
+        securityScheme.setType(SecurityScheme.Type.HTTP);
+        securityScheme.setScheme(jwtSecuritySchemeValue);
+        securityScheme.setBearerFormat(jwtBearerFormat);
+        return securityScheme;
+    }
+}
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java
new file mode 100644
index 00000000000000..00f4cd8c597cfb
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoSecurityFilter.java
@@ -0,0 +1,82 @@
+package io.quarkus.smallrye.openapi.runtime.filter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.eclipse.microprofile.openapi.OASFactory;
+import org.eclipse.microprofile.openapi.OASFilter;
+import org.eclipse.microprofile.openapi.models.OpenAPI;
+import org.eclipse.microprofile.openapi.models.security.SecurityScheme;
+import org.jboss.logging.Logger;
+
+/**
+ * Auto add security
+ */
+public abstract class AutoSecurityFilter implements OASFilter {
+    private static final Logger log = Logger.getLogger(AutoSecurityFilter.class);
+
+    private String securitySchemeName;
+    private String securitySchemeDescription;
+
+    public AutoSecurityFilter() {
+
+    }
+
+    public AutoSecurityFilter(String securitySchemeName, String securitySchemeDescription) {
+        this.securitySchemeName = securitySchemeName;
+        this.securitySchemeDescription = securitySchemeDescription;
+    }
+
+    public String getSecuritySchemeName() {
+        return securitySchemeName;
+    }
+
+    public void setSecuritySchemeName(String securitySchemeName) {
+        this.securitySchemeName = securitySchemeName;
+    }
+
+    public String getSecuritySchemeDescription() {
+        return securitySchemeDescription;
+    }
+
+    public void setSecuritySchemeDescription(String securitySchemeDescription) {
+        this.securitySchemeDescription = securitySchemeDescription;
+    }
+
+    @Override
+    public void filterOpenAPI(OpenAPI openAPI) {
+        // Make sure components are created
+        if (openAPI.getComponents() == null) {
+            openAPI.setComponents(OASFactory.createComponents());
+        }
+
+        Map securitySchemes = new HashMap<>();
+
+        // Add any existing security
+        if (openAPI.getComponents().getSecuritySchemes() != null
+                && !openAPI.getComponents().getSecuritySchemes().isEmpty()) {
+            securitySchemes.putAll(openAPI.getComponents().getSecuritySchemes());
+        }
+
+        SecurityScheme securityScheme = getSecurityScheme();
+        securityScheme.setDescription(securitySchemeDescription);
+        securitySchemes.put(securitySchemeName, securityScheme);
+        openAPI.getComponents().setSecuritySchemes(securitySchemes);
+    }
+
+    protected abstract SecurityScheme getSecurityScheme();
+
+    protected String getUrl(String configKey, String defaultValue, String shouldEndWith) {
+        Config c = ConfigProvider.getConfig();
+
+        String u = c.getOptionalValue(configKey, String.class).orElse(defaultValue);
+
+        if (u != null && !u.endsWith(shouldEndWith)) {
+            u = u + shouldEndWith;
+        }
+        return u;
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java
new file mode 100644
index 00000000000000..8ee97b65c624d6
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/AutoUrl.java
@@ -0,0 +1,60 @@
+package io.quarkus.smallrye.openapi.runtime.filter;
+
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
+
+/**
+ * Create a URL from a config, or a default value
+ */
+public class AutoUrl {
+
+    private String defaultValue;
+    private String configKey;
+    private String path;
+
+    public AutoUrl() {
+    }
+
+    public AutoUrl(String defaultValue, String configKey, String path) {
+        this.defaultValue = defaultValue;
+        this.configKey = configKey;
+        this.path = path;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getConfigKey() {
+        return configKey;
+    }
+
+    public void setConfigKey(String configKey) {
+        this.configKey = configKey;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getFinalUrlValue() {
+        Config c = ConfigProvider.getConfig();
+
+        String u = c.getOptionalValue(this.configKey, String.class).orElse(defaultValue);
+
+        if (u != null && path != null && !u.endsWith(path)) {
+            u = u + path;
+        }
+
+        return u;
+    }
+
+}
diff --git a/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java
new file mode 100644
index 00000000000000..cbc18a5c320b73
--- /dev/null
+++ b/extensions/smallrye-openapi/runtime/src/main/java/io/quarkus/smallrye/openapi/runtime/filter/OpenIDConnectSecurityFilter.java
@@ -0,0 +1,71 @@
+package io.quarkus.smallrye.openapi.runtime.filter;
+
+import org.eclipse.microprofile.openapi.OASFactory;
+import org.eclipse.microprofile.openapi.models.security.OAuthFlow;
+import org.eclipse.microprofile.openapi.models.security.OAuthFlows;
+import org.eclipse.microprofile.openapi.models.security.SecurityScheme;
+
+/**
+ * Add OAuth 2 (Implicit) Authentication security automatically based on the added security extensions
+ */
+public class OpenIDConnectSecurityFilter extends AutoSecurityFilter {
+
+    private AutoUrl authorizationUrl;
+    private AutoUrl refreshUrl;
+    private AutoUrl tokenUrl;
+
+    public OpenIDConnectSecurityFilter() {
+        super();
+    }
+
+    public OpenIDConnectSecurityFilter(String securitySchemeName, String securitySchemeDescription,
+            AutoUrl authorizationUrl,
+            AutoUrl refreshUrl,
+            AutoUrl tokenUrl) {
+        super(securitySchemeName, securitySchemeDescription);
+        this.authorizationUrl = authorizationUrl;
+        this.refreshUrl = refreshUrl;
+        this.tokenUrl = tokenUrl;
+    }
+
+    public AutoUrl getAuthorizationUrl() {
+        return authorizationUrl;
+    }
+
+    public void setAuthorizationUrl(AutoUrl authorizationUrl) {
+        this.authorizationUrl = authorizationUrl;
+    }
+
+    public AutoUrl getRefreshUrl() {
+        return refreshUrl;
+    }
+
+    public void setRefreshUrl(AutoUrl refreshUrl) {
+        this.refreshUrl = refreshUrl;
+    }
+
+    public AutoUrl getTokenUrl() {
+        return tokenUrl;
+    }
+
+    public void setTokenUrl(AutoUrl tokenUrl) {
+        this.tokenUrl = tokenUrl;
+    }
+
+    @Override
+    protected SecurityScheme getSecurityScheme() {
+        SecurityScheme securityScheme = OASFactory.createSecurityScheme();
+
+        securityScheme.setType(SecurityScheme.Type.OAUTH2);
+        OAuthFlows oAuthFlows = OASFactory.createOAuthFlows();
+        OAuthFlow oAuthFlow = OASFactory.createOAuthFlow();
+        oAuthFlow.authorizationUrl(this.authorizationUrl.getFinalUrlValue());
+        oAuthFlow.refreshUrl(this.refreshUrl.getFinalUrlValue());
+        oAuthFlow.tokenUrl(this.tokenUrl.getFinalUrlValue());
+        oAuthFlows.setImplicit(oAuthFlow);
+        securityScheme.setFlows(oAuthFlows);
+
+        return securityScheme;
+    }
+
+}
\ No newline at end of file
diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
index ca48170751f0f8..35483f64c40947 100644
--- a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
+++ b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
@@ -2,6 +2,7 @@
 
 import java.io.Closeable;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import org.eclipse.microprofile.config.Config;
@@ -19,7 +20,10 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.devservices.common.ContainerLocator;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
@@ -60,7 +64,9 @@ public class AmqpDevServicesProcessor {
     public DevServicesAmqpBrokerBuildItem startAmqpDevService(
             LaunchModeBuildItem launchMode,
             AmqpBuildTimeConfig amqpClientBuildTimeConfig,
-            BuildProducer devServicePropertiesProducer) {
+            BuildProducer devServicePropertiesProducer,
+            Optional consoleInstalledBuildItem,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         AmqpDevServiceCfg configuration = getConfiguration(amqpClientBuildTimeConfig);
 
@@ -73,25 +79,35 @@ public DevServicesAmqpBrokerBuildItem startAmqpDevService(
             cfg = null;
         }
 
-        AmqpBroker broker = startAmqpBroker(configuration, launchMode);
+        AmqpBroker broker;
         DevServicesAmqpBrokerBuildItem artemis = null;
-        if (broker != null) {
-            closeable = broker.getCloseable();
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_HOST_PROP, broker.host));
-            devServicePropertiesProducer
-                    .produce(new DevServicesConfigResultBuildItem(AMQP_PORT_PROP, Integer.toString(broker.port)));
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_USER_PROP, broker.user));
-            devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_PASSWORD_PROP, broker.password));
-
-            artemis = new DevServicesAmqpBrokerBuildItem(broker.host, broker.port, broker.user, broker.password);
-
-            if (broker.isOwner()) {
-                log.info("Dev Services for AMQP started.");
-                log.infof("Other Quarkus applications in dev mode will find the "
-                        + "broker automatically. For Quarkus applications in production mode, you can connect to"
-                        + " this by starting your application with -Damqp.host=%s -Damqp.port=%d -Damqp.user=%s -Damqp.password=%s",
-                        broker.host, broker.port, broker.user, broker.password);
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "AMQP Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            broker = startAmqpBroker(configuration, launchMode);
+            if (broker != null) {
+                closeable = broker.getCloseable();
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_HOST_PROP, broker.host));
+                devServicePropertiesProducer
+                        .produce(new DevServicesConfigResultBuildItem(AMQP_PORT_PROP, Integer.toString(broker.port)));
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_USER_PROP, broker.user));
+                devServicePropertiesProducer.produce(new DevServicesConfigResultBuildItem(AMQP_PASSWORD_PROP, broker.password));
+
+                artemis = new DevServicesAmqpBrokerBuildItem(broker.host, broker.port, broker.user, broker.password);
+
+                if (broker.isOwner()) {
+                    log.info("Dev Services for AMQP started.");
+                    log.infof("Other Quarkus applications in dev mode will find the "
+                            + "broker automatically. For Quarkus applications in production mode, you can connect to"
+                            + " this by starting your application with -Damqp.host=%s -Damqp.port=%d -Damqp.user=%s -Damqp.password=%s",
+                            broker.host, broker.port, broker.user, broker.password);
+                }
             }
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
         }
 
         // Configure the watch dog
diff --git a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 8558a6b2a48770..977c0d3ae2981b 100644
--- a/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/extensions/smallrye-reactive-messaging-amqp/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -9,7 +9,7 @@ metadata:
   guide: "https://quarkus.io/guides/amqp"
   categories:
   - "messaging"
-  status: "preview"
+  status: "stable"
   config:
   - "mp.messaging."
   - "quarkus.reactive-messaging."
diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
index bcde6e700bec72..8d8bff7aceca62 100644
--- a/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
+++ b/extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
@@ -83,12 +83,6 @@
             awaitility
             test
         
-        
-            io.quarkus
-            quarkus-vertx-http-deployment
-            test-jar
-            test
-        
     
 
     
diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java
index e4a232da8146b0..8387a6674986f5 100644
--- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java
+++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingTestCase.java
@@ -9,8 +9,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 
 public class KafkaDevServicesContinuousTestingTestCase {
 
diff --git a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java
index e4fdcca5abe1a2..57c98b27fdf751 100644
--- a/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java
+++ b/extensions/smallrye-reactive-messaging-kafka/deployment/src/test/java/io/quarkus/smallrye/reactivemessaging/kafka/deployment/testing/KafkaDevServicesContinuousTestingWorkingAppPropsTestCase.java
@@ -9,8 +9,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 
 public class KafkaDevServicesContinuousTestingWorkingAppPropsTestCase {
 
diff --git a/extensions/spring-data-rest/deployment/pom.xml b/extensions/spring-data-rest/deployment/pom.xml
index e3abeaec086897..cab1280cca1534 100644
--- a/extensions/spring-data-rest/deployment/pom.xml
+++ b/extensions/spring-data-rest/deployment/pom.xml
@@ -38,7 +38,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jsonb-deployment
+            quarkus-resteasy-reactive-jsonb-deployment
             test
         
         
diff --git a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java
index 52c7b52114d217..16037fb3ef9428 100644
--- a/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java
+++ b/extensions/spring-data-rest/deployment/src/main/java/io/quarkus/spring/data/rest/deployment/SpringDataRestProcessor.java
@@ -7,6 +7,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.ws.rs.Priorities;
+
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.IndexView;
@@ -24,10 +26,11 @@
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.gizmo.ClassOutput;
+import io.quarkus.rest.data.panache.RestDataPanacheException;
 import io.quarkus.rest.data.panache.deployment.ResourceMetadata;
 import io.quarkus.rest.data.panache.deployment.RestDataResourceBuildItem;
 import io.quarkus.rest.data.panache.deployment.properties.ResourcePropertiesBuildItem;
-import io.quarkus.resteasy.common.spi.ResteasyJaxrsProviderBuildItem;
+import io.quarkus.resteasy.reactive.spi.ExceptionMapperBuildItem;
 import io.quarkus.spring.data.rest.deployment.crud.CrudMethodsImplementor;
 import io.quarkus.spring.data.rest.deployment.crud.CrudPropertiesProvider;
 import io.quarkus.spring.data.rest.deployment.paging.PagingAndSortingMethodsImplementor;
@@ -55,8 +58,9 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    ResteasyJaxrsProviderBuildItem registerRestDataPanacheExceptionMapper() {
-        return new ResteasyJaxrsProviderBuildItem(RestDataPanacheExceptionMapper.class.getName());
+    ExceptionMapperBuildItem registerRestDataPanacheExceptionMapper() {
+        return new ExceptionMapperBuildItem(RestDataPanacheExceptionMapper.class.getName(),
+                RestDataPanacheException.class.getName(), Priorities.USER + 100, false);
     }
 
     @BuildStep
diff --git a/extensions/spring-data-rest/runtime/pom.xml b/extensions/spring-data-rest/runtime/pom.xml
index f1c159c2fb303e..e812673dd80d45 100644
--- a/extensions/spring-data-rest/runtime/pom.xml
+++ b/extensions/spring-data-rest/runtime/pom.xml
@@ -27,6 +27,10 @@
             io.quarkus
             quarkus-spring-data-rest-api
         
+        
+            jakarta.validation
+            jakarta.validation-api
+        
     
 
     
diff --git a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
index 730b858eea0931..32f006d18ccc35 100644
--- a/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
+++ b/extensions/undertow/runtime/src/main/java/io/quarkus/undertow/runtime/UndertowDeploymentRecorder.java
@@ -523,7 +523,11 @@ public void run() {
     }
 
     public void addServletContextAttribute(RuntimeValue deployment, String key, Object value1) {
-        deployment.getValue().addServletContextAttribute(key, value1);
+        if (value1 instanceof RuntimeValue) {
+            deployment.getValue().addServletContextAttribute(key, ((RuntimeValue) value1).getValue());
+        } else {
+            deployment.getValue().addServletContextAttribute(key, value1);
+        }
     }
 
     public void addServletExtension(RuntimeValue deployment, ServletExtension extension) {
diff --git a/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java b/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
index 0d897b7f310753..d65562542a50ef 100644
--- a/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
+++ b/extensions/vault/deployment/src/main/java/io/quarkus/vault/deployment/DevServicesVaultProcessor.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.OptionalInt;
 
 import org.apache.commons.lang3.RandomStringUtils;
@@ -18,7 +19,11 @@
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.DevServicesConfigResultBuildItem;
+import io.quarkus.deployment.builditem.LaunchModeBuildItem;
+import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
+import io.quarkus.deployment.console.StartupLogCompressor;
 import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
+import io.quarkus.deployment.logging.LoggingSetupBuildItem;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.quarkus.vault.runtime.VaultVersions;
 import io.quarkus.vault.runtime.config.DevServicesConfig;
@@ -38,7 +43,10 @@ public class DevServicesVaultProcessor {
     private final IsDockerWorking isDockerWorking = new IsDockerWorking(true);
 
     @BuildStep(onlyIfNot = IsNormal.class, onlyIf = GlobalDevServicesConfig.Enabled.class)
-    public void startVaultContainers(BuildProducer devConfig, VaultBuildTimeConfig config) {
+    public void startVaultContainers(BuildProducer devConfig, VaultBuildTimeConfig config,
+            Optional consoleInstalledBuildItem,
+            LaunchModeBuildItem launchMode,
+            LoggingSetupBuildItem loggingSetupBuildItem) {
 
         DevServicesConfig currentDevServicesConfiguration = config.devservices;
 
@@ -62,7 +70,18 @@ public void startVaultContainers(BuildProducer
 
         capturedDevServicesConfiguration = currentDevServicesConfiguration;
 
-        StartResult startResult = startContainer(currentDevServicesConfiguration);
+        StartResult startResult;
+
+        StartupLogCompressor compressor = new StartupLogCompressor(
+                (launchMode.isTest() ? "(test) " : "") + "Vault Dev Services Starting:", consoleInstalledBuildItem,
+                loggingSetupBuildItem);
+        try {
+            startResult = startContainer(currentDevServicesConfiguration);
+            compressor.close();
+        } catch (Throwable t) {
+            compressor.closeAndDumpCaptured();
+            throw new RuntimeException(t);
+        }
         if (startResult == null) {
             return;
         }
diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml
index daa32430e8a055..ed795df314e552 100644
--- a/extensions/vertx-http/deployment/pom.xml
+++ b/extensions/vertx-http/deployment/pom.xml
@@ -119,17 +119,6 @@
                     
                 
             
-            
-                org.apache.maven.plugins
-                maven-jar-plugin
-                
-                    
-                        
-                            test-jar
-                        
-                    
-                
-            
             
                 maven-compiler-plugin
                 
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java
index e6a7e0d54c6c51..a7b7956bf0068a 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/HttpSecurityProcessor.java
@@ -89,7 +89,8 @@ SyntheticBeanBuildItem initMtlsClientAuth(
     @Record(ExecutionTime.RUNTIME_INIT)
     SyntheticBeanBuildItem initBasicAuth(
             HttpSecurityRecorder recorder,
-            HttpBuildTimeConfig buildTimeConfig) {
+            HttpBuildTimeConfig buildTimeConfig,
+            BuildProducer securityInformationProducer) {
         if ((buildTimeConfig.auth.form.enabled || isMtlsClientAuthenticationEnabled(buildTimeConfig))
                 && !buildTimeConfig.auth.basic) {
             //if form auth is enabled and we are not then we don't install
@@ -105,6 +106,7 @@ SyntheticBeanBuildItem initBasicAuth(
                 && !buildTimeConfig.auth.basic) {
             //if not explicitly enabled we make this a default bean, so it is the fallback if nothing else is defined
             configurator.defaultBean();
+            securityInformationProducer.produce(SecurityInformationBuildItem.BASIC());
         }
 
         return configurator.done();
@@ -119,7 +121,8 @@ void setupAuthenticationMechanisms(
             Capabilities capabilities,
             BuildProducer beanContainerListenerBuildItemBuildProducer,
             HttpBuildTimeConfig buildTimeConfig,
-            List httpSecurityPolicyBuildItemList) {
+            List httpSecurityPolicyBuildItemList,
+            BuildProducer securityInformationProducer) {
         Map> policyMap = new HashMap<>();
         for (HttpSecurityPolicyBuildItem e : httpSecurityPolicyBuildItemList) {
             if (policyMap.containsKey(e.getName())) {
@@ -131,6 +134,7 @@ void setupAuthenticationMechanisms(
         if (buildTimeConfig.auth.form.enabled) {
         } else if (buildTimeConfig.auth.basic) {
             beanProducer.produce(AdditionalBeanBuildItem.unremovableOf(BasicAuthenticationMechanism.class));
+            securityInformationProducer.produce(SecurityInformationBuildItem.BASIC());
         }
 
         if (capabilities.isPresent(Capability.SECURITY)) {
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java
index 7e0046c2d1f541..a6f43103b6b912 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/RequireVirtualHttpBuildItem.java
@@ -6,5 +6,16 @@
  * Marker class to turn on virtual http channel
  */
 public final class RequireVirtualHttpBuildItem extends SimpleBuildItem {
-    public static final RequireVirtualHttpBuildItem MARKER = new RequireVirtualHttpBuildItem();
+    public static final RequireVirtualHttpBuildItem MARKER = new RequireVirtualHttpBuildItem(false);
+    public static final RequireVirtualHttpBuildItem ALWAYS_VIRTUAL = new RequireVirtualHttpBuildItem(true);
+
+    private boolean alwaysVirtual;
+
+    private RequireVirtualHttpBuildItem(boolean alwaysVirtual) {
+        this.alwaysVirtual = alwaysVirtual;
+    }
+
+    public boolean isAlwaysVirtual() {
+        return alwaysVirtual;
+    }
 }
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java
new file mode 100644
index 00000000000000..f1b6c64aec8a43
--- /dev/null
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/SecurityInformationBuildItem.java
@@ -0,0 +1,59 @@
+package io.quarkus.vertx.http.deployment;
+
+import java.util.Optional;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Contains information on the security model used in the application
+ */
+public final class SecurityInformationBuildItem extends MultiBuildItem {
+
+    private final SecurityModel securityModel;
+    private final Optional openIDConnectInformation;
+
+    public static SecurityInformationBuildItem BASIC() {
+        return new SecurityInformationBuildItem(SecurityModel.basic, Optional.empty());
+    }
+
+    public static SecurityInformationBuildItem JWT() {
+        return new SecurityInformationBuildItem(SecurityModel.jwt, Optional.empty());
+    }
+
+    public static SecurityInformationBuildItem OPENIDCONNECT(String urlConfigKey) {
+        return new SecurityInformationBuildItem(SecurityModel.oidc,
+                Optional.of(new OpenIDConnectInformation(urlConfigKey)));
+    }
+
+    public SecurityInformationBuildItem(SecurityModel securityModel,
+            Optional openIDConnectInformation) {
+        this.securityModel = securityModel;
+        this.openIDConnectInformation = openIDConnectInformation;
+    }
+
+    public SecurityModel getSecurityModel() {
+        return securityModel;
+    }
+
+    public Optional getOpenIDConnectInformation() {
+        return openIDConnectInformation;
+    }
+
+    public enum SecurityModel {
+        basic,
+        jwt,
+        oidc
+    }
+
+    public static class OpenIDConnectInformation {
+        private final String urlConfigKey;
+
+        public OpenIDConnectInformation(String urlConfigKey) {
+            this.urlConfigKey = urlConfigKey;
+        }
+
+        public String getUrlConfigKey() {
+            return urlConfigKey;
+        }
+    }
+}
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
index a1ef76ed0c7c73..08f032956fb343 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java
@@ -290,8 +290,8 @@ void openSocket(ApplicationStartBuildItem start,
             reflectiveClass
                     .produce(new ReflectiveClassBuildItem(true, false, false, VirtualServerChannel.class));
         }
-        // start http socket in dev/test mode even if virtual http is required
-        boolean startSocket = !startVirtual || launchMode.getLaunchMode() != LaunchMode.NORMAL;
+        boolean startSocket = (!startVirtual || launchMode.getLaunchMode() != LaunchMode.NORMAL)
+                && (requireVirtual.isEmpty() || !requireVirtual.get().isAlwaysVirtual());
         recorder.startServer(vertx.getVertx(), shutdown,
                 httpBuildTimeConfig, httpConfiguration, launchMode.getLaunchMode(), startVirtual, startSocket,
                 eventLoopCount.getEventLoopCount(),
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java
index 1d963b996fd4d1..a793dc8ab3cd64 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ConfigEditorProcessor.java
@@ -7,6 +7,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -45,14 +46,19 @@ public void config(BuildProducer devCons
             Optional devServicesLauncherConfig) {
         List configDescriptions = new ArrayList<>();
         for (ConfigDescriptionBuildItem item : configDescriptionBuildItems) {
-
             configDescriptions.add(
-                    new ConfigDescription(item.getPropertyName(), item.getDocs(), item.getDefaultValue(),
-                            isSetByDevServices(devServicesLauncherConfig, item.getPropertyName())));
+                    new ConfigDescription(item.getPropertyName(),
+                            item.getDocs(),
+                            item.getDefaultValue(),
+                            isSetByDevServices(devServicesLauncherConfig, item.getPropertyName()),
+                            item.getValueTypeName(),
+                            item.getAllowedValues(),
+                            item.getConfigPhase().name()));
         }
 
-        devConsoleRuntimeTemplateProducer.produce(
-                new DevConsoleRuntimeTemplateInfoBuildItem("config", new ConfigDescriptionsSupplier(configDescriptions)));
+        devConsoleRuntimeTemplateProducer.produce(new DevConsoleRuntimeTemplateInfoBuildItem("config",
+                new ConfigDescriptionsSupplier(configDescriptions)));
+
         devConsoleRuntimeTemplateProducer.produce(new DevConsoleRuntimeTemplateInfoBuildItem("hasDevServices",
                 new HasDevServicesSupplier(devServicesLauncherConfig.isPresent()
                         && devServicesLauncherConfig.get().getConfig() != null
@@ -75,22 +81,13 @@ protected void handlePost(RoutingContext event, MultiMap form) throws Exception
                     Map values = Collections.singletonMap(name, value);
 
                     updateConfig(values);
-                } else if (action.equals("copyTestDevServices") && devServicesLauncherConfig.isPresent()) {
+                } else if (action.equals("copyDevServices") && devServicesLauncherConfig.isPresent()) {
+                    String environment = event.request().getFormAttribute("environment");
+                    String filter = event.request().getParam("filterConfigKeys");
+                    List configFilter = getConfigFilter(filter);
                     Map autoconfig = devServicesLauncherConfig.get().getConfig();
 
-                    autoconfig = autoconfig.entrySet().stream()
-                            .collect(Collectors.toMap(
-                                    e -> appendProfile("test", e.getKey()),
-                                    Map.Entry::getValue));
-
-                    updateConfig(autoconfig);
-                } else if (action.equals("copyProdDevServices") && devServicesLauncherConfig.isPresent()) {
-                    Map autoconfig = devServicesLauncherConfig.get().getConfig();
-
-                    autoconfig = autoconfig.entrySet().stream()
-                            .collect(Collectors.toMap(
-                                    e -> appendProfile("prod", e.getKey()),
-                                    Map.Entry::getValue));
+                    autoconfig = filterAndApplyProfile(autoconfig, configFilter, environment.toLowerCase());
 
                     updateConfig(autoconfig);
                 } else if (action.equals("updateProperties")) {
@@ -106,6 +103,37 @@ protected void handlePost(RoutingContext event, MultiMap form) throws Exception
         }));
     }
 
+    private Map filterAndApplyProfile(Map autoconfig, List configFilter,
+            String profile) {
+        return autoconfig.entrySet().stream()
+                .filter((t) -> {
+                    if (configFilter != null && !configFilter.isEmpty()) {
+                        for (String sw : configFilter) {
+                            if (t.getKey().startsWith(sw)) {
+                                return true;
+                            }
+                        }
+                    } else {
+                        return true;
+                    }
+                    return false;
+                })
+                .collect(Collectors.toMap(
+                        e -> appendProfile(profile, e.getKey()),
+                        Map.Entry::getValue));
+    }
+
+    private List getConfigFilter(String filter) {
+        if (filter != null && !filter.isEmpty()) {
+            if (filter.contains(",")) {
+                return Arrays.asList(filter.split(","));
+            } else {
+                return List.of(filter);
+            }
+        }
+        return Collections.EMPTY_LIST;
+    }
+
     private String appendProfile(String profile, String originalKey) {
         return String.format("%%%s.%s", profile, originalKey);
     }
@@ -132,45 +160,47 @@ static byte[] getConfig() {
     }
 
     static void updateConfig(Map values) {
-        try {
-            Path configPath = getConfigPath();
-            String profile = ProfileManager.getActiveProfile();
-            List lines = Files.readAllLines(configPath);
-            for (Map.Entry entry : values.entrySet()) {
-                String name = entry.getKey();
-                String value = entry.getValue();
-                name = !profile.equals(DEVELOPMENT.getDefaultProfile()) ? "%" + profile + "." + name : name;
-                int nameLine = -1;
-                for (int i = 0, linesSize = lines.size(); i < linesSize; i++) {
-                    final String line = lines.get(i);
-                    if (line.startsWith(name + "=")) {
-                        nameLine = i;
-                        break;
+        if (values != null && !values.isEmpty()) {
+            try {
+                Path configPath = getConfigPath();
+                String profile = ProfileManager.getActiveProfile();
+                List lines = Files.readAllLines(configPath);
+                for (Map.Entry entry : values.entrySet()) {
+                    String name = entry.getKey();
+                    String value = entry.getValue();
+                    name = !profile.equals(DEVELOPMENT.getDefaultProfile()) ? "%" + profile + "." + name : name;
+                    int nameLine = -1;
+                    for (int i = 0, linesSize = lines.size(); i < linesSize; i++) {
+                        final String line = lines.get(i);
+                        if (line.startsWith(name + "=")) {
+                            nameLine = i;
+                            break;
+                        }
                     }
-                }
 
-                if (nameLine != -1) {
-                    if (value.isEmpty()) {
-                        lines.remove(nameLine);
+                    if (nameLine != -1) {
+                        if (value.isEmpty()) {
+                            lines.remove(nameLine);
+                        } else {
+                            lines.set(nameLine, name + "=" + value);
+                        }
                     } else {
-                        lines.set(nameLine, name + "=" + value);
-                    }
-                } else {
-                    if (!value.isEmpty()) {
-                        lines.add(name + "=" + value);
+                        if (!value.isEmpty()) {
+                            lines.add(name + "=" + value);
+                        }
                     }
                 }
-            }
 
-            try (BufferedWriter writer = Files.newBufferedWriter(configPath)) {
-                for (String i : lines) {
-                    writer.write(i);
-                    writer.newLine();
+                try (BufferedWriter writer = Files.newBufferedWriter(configPath)) {
+                    for (String i : lines) {
+                        writer.write(i);
+                        writer.newLine();
+                    }
                 }
+                preventKill();
+            } catch (Throwable t) {
+                throw new RuntimeException(t);
             }
-            preventKill();
-        } catch (Throwable t) {
-            throw new RuntimeException(t);
         }
     }
 
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketListener.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketListener.java
deleted file mode 100644
index 703dfe9514f448..00000000000000
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/ContinuousTestingWebSocketListener.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package io.quarkus.vertx.http.deployment.devmode.console;
-
-import java.util.function.Consumer;
-
-import org.junit.platform.launcher.TestIdentifier;
-
-import io.quarkus.deployment.dev.testing.TestController;
-import io.quarkus.deployment.dev.testing.TestListener;
-import io.quarkus.deployment.dev.testing.TestResult;
-import io.quarkus.deployment.dev.testing.TestRunListener;
-import io.quarkus.deployment.dev.testing.TestRunResults;
-import io.quarkus.dev.testing.ContinuousTestingWebsocketListener;
-
-public class ContinuousTestingWebSocketListener implements TestListener {
-
-    @Override
-    public void listenerRegistered(TestController testController) {
-
-    }
-
-    @Override
-    public void testsEnabled() {
-        ContinuousTestingWebsocketListener
-                .setLastState(
-                        new ContinuousTestingWebsocketListener.State(true, true, 0L, 0L, 0L, 0L, false, false, false, true));
-    }
-
-    @Override
-    public void testsDisabled() {
-        ContinuousTestingWebsocketListener.setRunning(false);
-    }
-
-    @Override
-    public void testRunStarted(Consumer listenerConsumer) {
-        ContinuousTestingWebsocketListener.setInProgress(true);
-        listenerConsumer.accept(new TestRunListener() {
-            @Override
-            public void runStarted(long toRun) {
-
-            }
-
-            @Override
-            public void testComplete(TestResult result) {
-
-            }
-
-            @Override
-            public void runComplete(TestRunResults testRunResults) {
-                ContinuousTestingWebsocketListener.setLastState(
-                        new ContinuousTestingWebsocketListener.State(true, false,
-                                testRunResults.getPassedCount() +
-                                        testRunResults.getFailedCount() +
-                                        testRunResults.getSkippedCount(),
-                                testRunResults.getPassedCount(),
-                                testRunResults.getFailedCount(), testRunResults.getSkippedCount(),
-                                ContinuousTestingWebsocketListener.getLastState().isBrokenOnly,
-                                ContinuousTestingWebsocketListener.getLastState().isTestOutput,
-                                ContinuousTestingWebsocketListener.getLastState().isInstrumentationBasedReload,
-                                ContinuousTestingWebsocketListener.getLastState().isLiveReload));
-            }
-
-            @Override
-            public void runAborted() {
-                ContinuousTestingWebsocketListener.setInProgress(false);
-            }
-
-            @Override
-            public void testStarted(TestIdentifier testIdentifier, String className) {
-
-            }
-        });
-
-    }
-
-    @Override
-    public void setBrokenOnly(boolean bo) {
-        ContinuousTestingWebsocketListener.setBrokenOnly(bo);
-    }
-
-    @Override
-    public void setTestOutput(boolean to) {
-        ContinuousTestingWebsocketListener.setTestOutput(to);
-    }
-
-    @Override
-    public void setInstrumentationBasedReload(boolean ibr) {
-        ContinuousTestingWebsocketListener.setInstrumentationBasedReload(ibr);
-    }
-
-    @Override
-    public void setLiveReloadEnabled(boolean lre) {
-        ContinuousTestingWebsocketListener.setLiveReloadEnabled(lre);
-    }
-
-}
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java
index e251597a536a1f..b7942c1ddd55bb 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java
@@ -175,9 +175,11 @@ public void sendMainPage(RoutingContext event) {
             Template simpleTemplate = engine.getTemplate(namespace + "/embedded.html");
             boolean hasConsoleEntry = simpleTemplate != null;
             boolean hasGuide = metadata.containsKey("guide");
+            boolean isUnlisted = metadata.containsKey("unlisted")
+                    && (metadata.get("unlisted").equals(true) || metadata.get("unlisted").equals("true"));
             loaded.put("hasConsoleEntry", hasConsoleEntry);
             loaded.put("hasGuide", hasGuide);
-            if (hasConsoleEntry || hasGuide) {
+            if (!isUnlisted) {
                 if (hasConsoleEntry) {
                     Map data = new HashMap<>();
                     data.putAll(globalData);
diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java
index fe0a98105eb8bc..8b58de97ce3ff5 100644
--- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java
+++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java
@@ -23,7 +23,6 @@
 import io.quarkus.devconsole.spi.DevConsoleTemplateInfoBuildItem;
 import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
 import io.quarkus.vertx.http.deployment.RouteBuildItem;
-import io.quarkus.vertx.http.deployment.devmode.console.ContinuousTestingWebSocketListener;
 import io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder;
 import io.quarkus.vertx.http.runtime.devmode.Json;
 import io.vertx.core.Handler;
@@ -61,7 +60,6 @@ public void setupTestRoutes(
                     .route("dev/test")
                     .handler(recorder.continousTestHandler(shutdownContextBuildItem))
                     .build());
-            testListenerBuildItemBuildProducer.produce(new TestListenerBuildItem(new ContinuousTestingWebSocketListener()));
         }
 
     }
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js
index aa3e4cd1f74f29..86fcb0883c56d6 100644
--- a/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-static/js/logstream.js
@@ -736,7 +736,7 @@ function populateLoggerLevelModal(loggerNamesArray, levelNamesArray){
         tbodyLevels.append(row);
     }
     
-    $('select').on('change', function() {
+    $('.logleveldropdown').on('change', function() {
         changeLogLevel(this.value, $(this).find('option:selected').text());
     });
     
@@ -764,7 +764,7 @@ function getTextClass(level){
 
 function createDropdown(name, level, levelNamesArray){
     
-    var dd = "";
     // Populate the dropdown
     for (var i = 0; i < levelNamesArray.length; i++) {
         var selected = "";
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html
index 8b7601c90d7cdd..43419922e74892 100644
--- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/config.html
@@ -69,11 +69,32 @@
     hideEmptyTables();
 }
 
-function changeInputValue(name){
+function changeSelectValue(element, name){
+    var $el = $("select[id='" + name + "']");
+    var $tr = $("tr[id='tr-" + name + "']");
+    var value = element.options[element.selectedIndex].text;
+    
+    postChangeConfigValue(name, value, $el);
+}
+
+function changeCheckboxValue(element, name){
     var $el = $("input[id='" + name + "']");
     var $tr = $("tr[id='tr-" + name + "']");
+    var value = element.checked;
     
+    postChangeConfigValue(name, value, $el);
+}
+
+function changeInputValue(name){
+    var $el = $("input[id='" + name + "']");
+    var $tr = $("tr[id='tr-" + name + "']");
     var value = $el.val();
+    
+    postChangeConfigValue(name, value, $el);
+}
+
+function postChangeConfigValue(name, value, $el){
+    $el.prop('disabled', true);
     $.post("",
         {
           action: "updateProperty",
@@ -90,6 +111,7 @@
                 hideEmptyTables();
                 changeBackgroundColor("#ff6366", $el);
             }
+            $el.prop('disabled', false);
         });
 
 }
@@ -168,10 +190,11 @@
 }
 
 function copyDevServices(environment){
-    var action = "copy" + environment + "DevServices";
     $.post("",
         {
-          action: action
+          action: "copyDevServices",
+          environment: environment,
+          filter: configfilter
         },
         function(data, status){
             if(status === "success"){
@@ -280,9 +303,22 @@
     });
     
     $('#configFilterModal').modal('hide');
+    
+    showHideDevServicesButton();
+    
     hideEmptyTables();
 }
 
+function showHideDevServicesButton(){
+    // Check if there is any dev services visible on the page
+    var numberOfMagicConfig = $('.fa-magic:visible').length;
+    if(numberOfMagicConfig === 0){
+        $('.devservices').hide();
+    }else {
+        $('.devservices').show();
+    }
+}
+
 function hideEmptyTables(){
     
     $('.filterableTable').filter(function(index){
@@ -306,6 +342,7 @@
         $(this).parent().show();
     });
     clearFilterInput();
+    showHideDevServicesButton();
 }
 
 {/script}
@@ -336,7 +373,7 @@
     

     

         {#if info:hasDevServices}
-        

+        

             
@@ -379,19 +416,60 @@
                     
 
                         
+                            {#if item.configPhase?? && (item.configPhase == "BUILD_AND_RUN_TIME_FIXED" || item.configPhase == "BUILD_TIME")}
+                            
+                            {#else}
+                            
+                            {/if}
+                            
                             {item.configValue.name}
+                            
                             {#if item.autoFromDevServices}
                             
                             {/if}
+                            
                         
                         
                             {#if configsource.key.editable}
-                            

-                                
-                                

-                                    
+                            
+                                {#if item.typeName && item.typeName == "java.lang.Boolean"}
+                                

+                                    

+                                        
+                                        
+                                    

+                                

+                                {#else if item.typeName && (item.typeName == "java.lang.Integer" || item.typeName == "java.lang.Long")}
+                                
    
+                                    
+                                    

+                                        
+                                    

+                                

+                                {#else if item.typeName && (item.typeName == "java.lang.Float" || item.typeName == "java.lang.Double")}
+                                
    
+                                    
+                                    

+                                        
+                                    

+                                
    
+                                {#else if item.typeName && (item.typeName == "java.lang.Enum" || item.typeName == "java.util.logging.Level")}
+                                

+                                    
                                 

-                            

+                                {#else}
+                                
    
+                                    
+                                    

+                                        
+                                    

+                                
    
+                                {/if}
                             {#else}
                                 {item.configValue.value}
                             {/if}
@@ -428,7 +506,7 @@
                     
                 
                 {#if info:hasDevServices}
-                
  • 
+                
  • 
                     
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html
index f5e8c77ca9141b..bf9981b60745ff 100644
--- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/io.quarkus.quarkus-vertx-http/tests.html
@@ -87,7 +87,7 @@
 
                         
    
                             
    
-                            
    
+                            
    
                                 
                                     {#for throwable in r.problems}
                                         
    {throwable.message}
    
@@ -100,7 +100,7 @@
                             
    
                             {#if !r.logOutput.empty}
                                 
    
-                                
    
+                                
    
                                     
                                         {#for log in r.logOutput}
                                             {log.raw} 
    
@@ -124,7 +124,7 @@
                         
    
                             {#if !r.logOutput.empty}
                                 
    
-                                
    
+                                
    
                                     
                                         {#for log in r.logOutput}
                                             {log.raw} 
    
@@ -149,7 +149,7 @@
                         
    
                             {#if !r.logOutput.empty}
                                 
    
-                                
    
+                                
    
                                     
                                         {#for log in r.logOutput}
                                             {log.raw} 
    
@@ -191,7 +191,7 @@
                     
                         
    
                             
    
-                            
    
+                            
    
                                 
                                     {#for log in r.logOutput}
                                         {log.raw} 
    
@@ -214,7 +214,7 @@
                     
                         
    
                             
    
-                            
    
+                            
    
                                 
                                     {#for log in r.logOutput}
                                         {log.raw} 
    
@@ -256,7 +256,7 @@
                     
                         
    
                             
    
-                            
    
+                            
    
                                 
                                     {#for log in r.logOutput}
                                         {log.raw} 
    
diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html
index 46f101d8d54260..739970bd2bca7b 100644
--- a/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html
+++ b/extensions/vertx-http/deployment/src/main/resources/dev-templates/tags/nonActionableExtension.html
@@ -1,4 +1,3 @@
-{#if it.metadata?? && !it.metadata.unlisted??}
 
    
     
    
         
    
@@ -31,5 +30,4 @@
         
    
         {/if}
     
    
-
    
-{/if}
\ No newline at end of file
+
    
\ No newline at end of file
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java
deleted file mode 100644
index 5ae3209c3dfff3..00000000000000
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/ContinuousTestingTestUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.quarkus.vertx.http.testrunner;
-
-import java.util.Arrays;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
-
-import org.awaitility.Awaitility;
-import org.awaitility.core.ConditionTimeoutException;
-
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.restassured.RestAssured;
-
-/**
- * Utilities for testing the test runner itself
- */
-public class ContinuousTestingTestUtils {
-
-    long runtToWaitFor = 1;
-
-    public TestStatus waitForNextCompletion() {
-        try {
-            Awaitility.waitAtMost(1, TimeUnit.MINUTES).pollInterval(50, TimeUnit.MILLISECONDS).until(new Callable() {
-                @Override
-                public Boolean call() throws Exception {
-                    TestStatus ts = RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/status").as(TestStatus.class);
-                    if (ts.getLastRun() > runtToWaitFor) {
-                        throw new RuntimeException(
-                                "Waiting for run " + runtToWaitFor + " but run " + ts.getLastRun() + " has already occurred");
-                    }
-                    boolean runComplete = ts.getLastRun() == runtToWaitFor;
-                    if (runComplete && ts.getRunning() > 0) {
-                        //there is a small chance of a race, where changes are picked up twice, due to how filesystems work
-                        //this works around it by waiting for the next run
-                        runtToWaitFor = ts.getRunning();
-                        return false;
-                    } else if (runComplete) {
-                        runtToWaitFor++;
-                    }
-                    return runComplete;
-                }
-            });
-        } catch (Exception e) {
-            TestStatus ts = RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/status").as(TestStatus.class);
-            throw new ConditionTimeoutException("Failed to wait for test run" + runtToWaitFor + " " + ts);
-        }
-        return RestAssured.get("q/dev/io.quarkus.quarkus-vertx-http/tests/status").as(TestStatus.class);
-    }
-
-    public static String appProperties(String... props) {
-        return "quarkus.test.continuous-testing=enabled\nquarkus.test.display-test-output=true\nquarkus.test.basic-console=true\nquarkus.test.disable-console-input=true\n"
-                + String.join("\n", Arrays.asList(props));
-    }
-}
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java
index 344e0412ba79be..b1fe0916dc5853 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/QuarkusTestTypeTestCase.java
@@ -9,8 +9,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
 
 public class QuarkusTestTypeTestCase {
 
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java
index fd7735b789b0bc..bb9228f8a6c948 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestChangeTrackingWhenStartFailsTestCase.java
@@ -10,8 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
 
 public class TestChangeTrackingWhenStartFailsTestCase {
 
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java
index f5c74a428b92a4..ce3e1e9f0423b9 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestFailingBeforeAllTestCase.java
@@ -9,8 +9,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
 
 public class TestFailingBeforeAllTestCase {
 
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java
index 423c9fe8fceb09..f09ec12148800a 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/TestRunnerSmokeTestCase.java
@@ -10,10 +10,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
 import io.quarkus.vertx.http.deployment.devmode.tests.ClassResult;
 import io.quarkus.vertx.http.deployment.devmode.tests.SuiteResult;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
 import io.restassured.RestAssured;
 
 public class TestRunnerSmokeTestCase {
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java
index bf2d3946d51f7e..db944cd60ccaae 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/UnitTestTypeTestCase.java
@@ -9,8 +9,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
 
 public class UnitTestTypeTestCase {
 
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java
index e6e48c30f25440..411a751b0a6e6b 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/brokenonly/TestBrokenOnlyTestCase.java
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 import io.restassured.RestAssured;
 
 public class TestBrokenOnlyTestCase {
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java
index cb9aa737d133e3..aa5b9f6d033286 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/ExcludePatternTestCase.java
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 import io.quarkus.vertx.http.testrunner.HelloResource;
 
 public class ExcludePatternTestCase {
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java
index 715800e8597a8b..69bcf14d1e857c 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/includes/IncludePatternTestCase.java
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 import io.quarkus.vertx.http.testrunner.HelloResource;
 
 public class IncludePatternTestCase {
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java
index f90ef041fdbd47..57c14bc6694f16 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 
 public class TestParameterizedTestCase {
 
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java
index b263e5890688f1..f3bdea49bd1ae1 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/ExcludeTagsTestCase.java
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 import io.quarkus.vertx.http.testrunner.HelloResource;
 
 public class ExcludeTagsTestCase {
diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java
index 15b12b553e4968..8d136c596def60 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/tags/IncludeTagsTestCase.java
@@ -10,9 +10,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+import io.quarkus.test.ContinuousTestingTestUtils;
+import io.quarkus.test.ContinuousTestingTestUtils.TestStatus;
 import io.quarkus.test.QuarkusDevModeTest;
-import io.quarkus.vertx.http.deployment.devmode.tests.TestStatus;
-import io.quarkus.vertx.http.testrunner.ContinuousTestingTestUtils;
 import io.quarkus.vertx.http.testrunner.HelloResource;
 
 public class IncludeTagsTestCase {
diff --git a/extensions/vertx-http/runtime/pom.xml b/extensions/vertx-http/runtime/pom.xml
index a1f7c667077d84..fabcf3c34282df 100644
--- a/extensions/vertx-http/runtime/pom.xml
+++ b/extensions/vertx-http/runtime/pom.xml
@@ -53,6 +53,11 @@
                 
             
         
+        
+            org.graalvm.nativeimage
+            svm
+            provided
+        
         
         
             org.junit.jupiter
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java
index 04fae63b0f3965..6484de2a3f34d8 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/QuarkusErrorHandler.java
@@ -41,40 +41,49 @@ public QuarkusErrorHandler(boolean showStack) {
 
     @Override
     public void handle(RoutingContext event) {
-        if (event.failure() == null) {
-            event.response().setStatusCode(event.statusCode());
-            event.response().end();
-            return;
-        }
-        //this can happen if there is no auth mechanisms
-        if (event.failure() instanceof UnauthorizedException) {
-            HttpAuthenticator authenticator = event.get(HttpAuthenticator.class.getName());
-            if (authenticator != null) {
-                authenticator.sendChallenge(event).subscribe().with(new Consumer() {
-                    @Override
-                    public void accept(Boolean aBoolean) {
-                        event.response().end();
-                    }
-                }, new Consumer() {
-                    @Override
-                    public void accept(Throwable throwable) {
-                        event.fail(throwable);
-                    }
-                });
-            } else {
+        try {
+            if (event.failure() == null) {
+                event.response().setStatusCode(event.statusCode());
+                event.response().end();
+                return;
+            }
+            //this can happen if there is no auth mechanisms
+            if (event.failure() instanceof UnauthorizedException) {
+                HttpAuthenticator authenticator = event.get(HttpAuthenticator.class.getName());
+                if (authenticator != null) {
+                    authenticator.sendChallenge(event).subscribe().with(new Consumer() {
+                        @Override
+                        public void accept(Boolean aBoolean) {
+                            event.response().end();
+                        }
+                    }, new Consumer() {
+                        @Override
+                        public void accept(Throwable throwable) {
+                            event.fail(throwable);
+                        }
+                    });
+                } else {
+                    event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end();
+                }
+                return;
+            }
+            if (event.failure() instanceof ForbiddenException) {
+                event.response().setStatusCode(HttpResponseStatus.FORBIDDEN.code()).end();
+                return;
+            }
+            if (event.failure() instanceof AuthenticationFailedException) {
+                //generally this should be handled elsewhere
+                //but if we get to this point bad things have happened
+                //so it is better to send a response than to hang
                 event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end();
+                return;
+            }
+        } catch (IllegalStateException e) {
+            //ignore this if the response is already started
+            if (!event.response().ended()) {
+                //could be that just the head is committed
+                event.response().end();
             }
-            return;
-        }
-        if (event.failure() instanceof ForbiddenException) {
-            event.response().setStatusCode(HttpResponseStatus.FORBIDDEN.code()).end();
-            return;
-        }
-        if (event.failure() instanceof AuthenticationFailedException) {
-            //generally this should be handled elsewhere
-            //but if we get to this point bad things have happened
-            //so it is better to send a response than to hang
-            event.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code()).end();
             return;
         }
 
@@ -100,6 +109,15 @@ public void accept(Throwable throwable) {
         } else {
             log.errorf(exception, "HTTP Request to %s failed, error id: %s", event.request().uri(), uuid);
         }
+        //we have logged the error
+        //now lets see if we can actually send a response
+        //if not we just return
+        if (event.response().ended()) {
+            return;
+        } else if (event.response().headWritten()) {
+            event.response().end();
+            return;
+        }
         String accept = event.request().getHeader("Accept");
         if (accept != null && accept.contains("application/json")) {
             event.response().headers().set(HttpHeaderNames.CONTENT_TYPE, "application/json; charset=utf-8");
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java
index d1baf58b0d3f0b..20f3aea287d10a 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescription.java
@@ -1,5 +1,7 @@
 package io.quarkus.vertx.http.runtime.devmode;
 
+import java.util.List;
+
 import io.smallrye.config.ConfigValue;
 
 public class ConfigDescription implements Comparable {
@@ -8,16 +10,22 @@ public class ConfigDescription implements Comparable {
     private String defaultValue;
     private ConfigValue configValue;
     private boolean autoFromDevServices = false;
+    private String typeName;
+    private List allowedValues;
+    private String configPhase;
 
     public ConfigDescription() {
     }
 
     public ConfigDescription(final String name, final String description, final String defaultValue,
-            final boolean autoFromDevServices) {
+            final boolean autoFromDevServices, String typeName, List allowedValues, String configPhase) {
         this.name = name;
         this.description = description;
         this.defaultValue = defaultValue;
         this.autoFromDevServices = autoFromDevServices;
+        this.typeName = typeName;
+        this.allowedValues = allowedValues;
+        this.configPhase = configPhase;
     }
 
     public ConfigDescription(
@@ -71,6 +79,30 @@ public void setAutoFromDevServices(boolean autoFromDevServices) {
         this.autoFromDevServices = autoFromDevServices;
     }
 
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public List getAllowedValues() {
+        return allowedValues;
+    }
+
+    public void setAllowedValues(List allowedValues) {
+        this.allowedValues = allowedValues;
+    }
+
+    public String getConfigPhase() {
+        return configPhase;
+    }
+
+    public void setConfigPhase(String configPhase) {
+        this.configPhase = configPhase;
+    }
+
     @Override
     public int compareTo(ConfigDescription o) {
         int ordinal = Integer.compare(o.configValue.getConfigSourceOrdinal(), this.configValue.getConfigSourceOrdinal());
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java
index 683ddf8eafc937..34f37b59bf3f65 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ContinuousTestWebSocketHandler.java
@@ -8,21 +8,21 @@
 import org.jboss.logging.Logger;
 
 import io.netty.handler.codec.http.HttpHeaderNames;
-import io.quarkus.dev.testing.ContinuousTestingWebsocketListener;
+import io.quarkus.dev.testing.ContinuousTestingSharedStateManager;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.http.ServerWebSocket;
 import io.vertx.ext.web.RoutingContext;
 
 public class ContinuousTestWebSocketHandler
-        implements Handler, Consumer {
+        implements Handler, Consumer {
 
-    private static final Logger log = Logger.getLogger(ContinuousTestingWebsocketListener.class);
+    private static final Logger log = Logger.getLogger(ContinuousTestingSharedStateManager.class);
     private static final Set sockets = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private static volatile String lastMessage;
 
     @Override
-    public void accept(ContinuousTestingWebsocketListener.State state) {
+    public void accept(ContinuousTestingSharedStateManager.State state) {
         Json.JsonObjectBuilder response = Json.object();
         response.put("running", state.running);
         response.put("inProgress", state.inProgress);
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java
index ec5126f6b59098..8b2e5cb4ee7558 100644
--- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/DevConsoleRecorder.java
@@ -15,7 +15,7 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.dev.console.DevConsoleManager;
-import io.quarkus.dev.testing.ContinuousTestingWebsocketListener;
+import io.quarkus.dev.testing.ContinuousTestingSharedStateManager;
 import io.quarkus.runtime.ShutdownContext;
 import io.quarkus.runtime.annotations.Recorder;
 import io.vertx.core.Handler;
@@ -48,11 +48,12 @@ public Handler devConsoleHandler(String devConsoleFinalDestinati
     public Handler continousTestHandler(ShutdownContext context) {
 
         ContinuousTestWebSocketHandler handler = new ContinuousTestWebSocketHandler();
-        ContinuousTestingWebsocketListener.setStateListener(handler);
+        ContinuousTestingSharedStateManager.addStateListener(handler);
         context.addShutdownTask(new Runnable() {
             @Override
             public void run() {
-                ContinuousTestingWebsocketListener.setStateListener(null);
+                ContinuousTestingSharedStateManager.removeStateListener(handler);
+                ContinuousTestingSharedStateManager.reset();
 
             }
         });
diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java
new file mode 100644
index 00000000000000..37dac442fbcf17
--- /dev/null
+++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/graal/HttpContentCompressorSubstitutions.java
@@ -0,0 +1,115 @@
+package io.quarkus.vertx.http.runtime.graal;
+
+import static io.netty.handler.codec.http.HttpHeaderValues.DEFLATE;
+import static io.netty.handler.codec.http.HttpHeaderValues.GZIP;
+import static io.netty.handler.codec.http.HttpHeaderValues.X_DEFLATE;
+import static io.netty.handler.codec.http.HttpHeaderValues.X_GZIP;
+
+import java.util.function.BooleanSupplier;
+
+import com.oracle.svm.core.annotate.Alias;
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.http2.CompressorHttp2ConnectionEncoder;
+import io.netty.handler.codec.http2.Http2Exception;
+
+public class HttpContentCompressorSubstitutions {
+
+    @TargetClass(className = "io.netty.handler.codec.compression.ZstdEncoder", onlyWith = IsZstdAbsent.class)
+    public static final class ZstdEncoderFactorySubstitution {
+
+        @Substitute
+        protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect) throws Exception {
+            throw new UnsupportedOperationException();
+        }
+
+        @Substitute
+        protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Substitute
+        public void flush(final ChannelHandlerContext ctx) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @TargetClass(className = "io.netty.handler.codec.compression.BrotliEncoder", onlyWith = IsBrotliAbsent.class)
+    public static final class BrEncoderFactorySubstitution {
+
+        @Substitute
+        protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect) throws Exception {
+            throw new UnsupportedOperationException();
+        }
+
+        @Substitute
+        protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @TargetClass(CompressorHttp2ConnectionEncoder.class)
+    public static final class CompressorHttp2ConnectionSubstitute {
+
+        @Substitute
+        protected EmbeddedChannel newContentCompressor(ChannelHandlerContext ctx, CharSequence contentEncoding)
+                throws Http2Exception {
+            if (GZIP.contentEqualsIgnoreCase(contentEncoding) || X_GZIP.contentEqualsIgnoreCase(contentEncoding)) {
+                return newCompressionChannel(ctx, ZlibWrapper.GZIP);
+            }
+            if (DEFLATE.contentEqualsIgnoreCase(contentEncoding) || X_DEFLATE.contentEqualsIgnoreCase(contentEncoding)) {
+                return newCompressionChannel(ctx, ZlibWrapper.ZLIB);
+            }
+            // 'identity' or unsupported
+            return null;
+        }
+
+        @Alias
+        private EmbeddedChannel newCompressionChannel(final ChannelHandlerContext ctx, ZlibWrapper wrapper) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public static class IsZstdAbsent implements BooleanSupplier {
+
+        private boolean zstdAbsent;
+
+        public IsZstdAbsent() {
+            try {
+                Class.forName("com.github.luben.zstd.Zstd");
+                zstdAbsent = false;
+            } catch (ClassNotFoundException e) {
+                zstdAbsent = true;
+            }
+        }
+
+        @Override
+        public boolean getAsBoolean() {
+            return zstdAbsent;
+        }
+    }
+
+    public static class IsBrotliAbsent implements BooleanSupplier {
+
+        private boolean brotliAbsent;
+
+        public IsBrotliAbsent() {
+            try {
+                Class.forName("com.aayushatharva.brotli4j.encoder.Encoder");
+                brotliAbsent = false;
+            } catch (ClassNotFoundException e) {
+                brotliAbsent = true;
+            }
+        }
+
+        @Override
+        public boolean getAsBoolean() {
+            return brotliAbsent;
+        }
+    }
+}
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java
index 97e31d960907cc..8c2d652896705c 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/NdjsonMultiRouteTest.java
@@ -47,7 +47,7 @@ public void testNdjsonMultiRoute() {
         // We get the item followed by the exception
         when().get("/hello-and-fail").then().statusCode(200)
                 .body(containsString("\"Hello\""))
-                .body(containsString("boom"));
+                .body(not(containsString("boom")));
 
         when().get("/void").then().statusCode(204).body(hasLength(0));
 
diff --git a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java
index 6c998dbf1a1067..3dd1656631f1ef 100644
--- a/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java
+++ b/extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/mutiny/SSEMultiRouteTest.java
@@ -44,7 +44,7 @@ public void testSSEMultiRoute() {
         // We get the item followed by the exception
         when().get("/hello-and-fail").then().statusCode(200)
                 .body(containsString("id: 0"))
-                .body(containsString("boom"));
+                .body(not(containsString("boom")));
 
         when().get("/buffer").then().statusCode(200)
                 .body(is("data: Buffer\nid: 0\n\n"))
diff --git a/extensions/websockets/client/deployment/pom.xml b/extensions/websockets/client/deployment/pom.xml
index 079ab2aa0e009c..0fa240617ff7e9 100644
--- a/extensions/websockets/client/deployment/pom.xml
+++ b/extensions/websockets/client/deployment/pom.xml
@@ -21,6 +21,10 @@
             io.quarkus
             quarkus-websockets-client
         
+        
+            io.quarkus
+            quarkus-undertow-spi
+        
         
             io.quarkus
             quarkus-junit5-internal
diff --git a/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java b/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java
index 44574779a8e86e..c38f426a850e0a 100644
--- a/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java
+++ b/extensions/websockets/client/deployment/src/main/java/io/quarkus/undertow/websockets/client/deployment/WebsocketClientProcessor.java
@@ -12,6 +12,7 @@
 import javax.websocket.ContainerProvider;
 import javax.websocket.Endpoint;
 import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerContainer;
 import javax.websocket.server.ServerEndpointConfig;
 
 import org.jboss.jandex.AnnotationInstance;
@@ -34,10 +35,11 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.netty.deployment.EventLoopSupplierBuildItem;
 import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.undertow.deployment.ServletContextAttributeBuildItem;
 import io.quarkus.undertow.websockets.client.runtime.WebsocketCoreRecorder;
 import io.undertow.websockets.DefaultContainerConfigurator;
+import io.undertow.websockets.ServerWebSocketContainer;
 import io.undertow.websockets.UndertowContainerProvider;
 import io.undertow.websockets.WebSocketDeploymentInfo;
 
@@ -70,16 +72,16 @@ void scanForAnnotatedEndpoints(CombinedIndexBuildItem indexBuildItem,
     }
 
     @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
+    @Record(ExecutionTime.STATIC_INIT)
     public ServerWebSocketContainerBuildItem deploy(final CombinedIndexBuildItem indexBuildItem,
             WebsocketCoreRecorder recorder,
             BuildProducer reflection,
-            EventLoopSupplierBuildItem eventLoopSupplierBuildItem,
             List annotatedEndpoints,
             BeanContainerBuildItem beanContainerBuildItem,
             WebsocketConfig websocketConfig,
             BuildProducer infoBuildItemBuildProducer,
-            Optional factoryBuildItem) throws Exception {
+            Optional factoryBuildItem,
+            BuildProducer servletContextAttributeBuildItemBuildProducer) throws Exception {
 
         final Set endpoints = new HashSet<>();
         final Set config = new HashSet<>();
@@ -121,10 +123,14 @@ public ServerWebSocketContainerBuildItem deploy(final CombinedIndexBuildItem ind
                 websocketConfig.maxFrameSize,
                 websocketConfig.dispatchToWorker);
         infoBuildItemBuildProducer.produce(new WebSocketDeploymentInfoBuildItem(deploymentInfo));
+        RuntimeValue serverContainer = recorder.createServerContainer(
+                beanContainerBuildItem.getValue(),
+                deploymentInfo,
+                factoryBuildItem.map(ServerWebSocketContainerFactoryBuildItem::getFactory).orElse(null));
+        servletContextAttributeBuildItemBuildProducer
+                .produce(new ServletContextAttributeBuildItem(ServerContainer.class.getName(), serverContainer));
         return new ServerWebSocketContainerBuildItem(
-                recorder.createServerContainer(beanContainerBuildItem.getValue(), eventLoopSupplierBuildItem.getMainSupplier(),
-                        deploymentInfo,
-                        factoryBuildItem.map(ServerWebSocketContainerFactoryBuildItem::getFactory).orElse(null)));
+                serverContainer);
     }
 
     public static void registerCodersForReflection(BuildProducer reflection,
diff --git a/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java b/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java
index 1c384fc46a3e5d..1a420478fefb49 100644
--- a/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java
+++ b/extensions/websockets/client/runtime/src/main/java/io/quarkus/undertow/websockets/client/runtime/WebsocketCoreRecorder.java
@@ -19,6 +19,7 @@
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
+import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
 import io.undertow.websockets.ServerWebSocketContainer;
 import io.undertow.websockets.UndertowContainerProvider;
 import io.undertow.websockets.WebSocketDeploymentInfo;
@@ -26,6 +27,7 @@
 import io.undertow.websockets.util.ObjectFactory;
 import io.undertow.websockets.util.ObjectHandle;
 import io.undertow.websockets.util.ObjectIntrospecter;
+import io.vertx.core.impl.VertxInternal;
 
 @Recorder
 public class WebsocketCoreRecorder {
@@ -105,7 +107,6 @@ public RuntimeValue createDeploymentInfo(Set an
     }
 
     public RuntimeValue createServerContainer(BeanContainer beanContainer,
-            Supplier eventLoopGroupSupplier,
             RuntimeValue infoVal, ServerWebSocketContainerFactory serverContainerFactory)
             throws DeploymentException {
         WebSocketDeploymentInfo info = infoVal.getValue();
@@ -136,7 +137,12 @@ public void release() {
                     }
                 };
             }
-        }, Thread.currentThread().getContextClassLoader(), eventLoopGroupSupplier,
+        }, Thread.currentThread().getContextClassLoader(), new Supplier() {
+            @Override
+            public EventLoopGroup get() {
+                return ((VertxInternal) VertxCoreRecorder.getVertx().get()).getEventLoopGroup();
+            }
+        },
                 Collections.singletonList(new ContextSetupHandler() {
                     @Override
                     public  Action create(Action action) {
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index 4ac3b17b0ea46c..af87d4d60866d7 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -38,7 +38,7 @@
         
         2.0.2
         1.3.3
-        2.3.1.Final
+        2.4.0.Final
         5.7.2
         3.8.1
         3.20.2
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
index 3ea6daa02c1d29..6e7299cef1daa8 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
@@ -32,6 +32,7 @@
 import org.jboss.jandex.Index;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.Indexer;
+import org.jboss.jandex.ModuleInfo;
 import org.jboss.jandex.Type;
 import org.jboss.logging.Logger;
 
@@ -177,6 +178,21 @@ public Collection getAnnotationsWithRepeatable(DotName annot
             return this.index.getAnnotationsWithRepeatable(annotationName, index);
         }
 
+        @Override
+        public Collection getKnownModules() {
+            return this.index.getKnownModules();
+        }
+
+        @Override
+        public ModuleInfo getModuleByName(DotName moduleName) {
+            return this.index.getModuleByName(moduleName);
+        }
+
+        @Override
+        public Collection getKnownUsers(DotName className) {
+            return this.index.getKnownUsers(className);
+        }
+
         private void getAllKnownSubClasses(DotName className, Set allKnown, Set processedClasses) {
             final Set subClassesToProcess = new HashSet();
             subClassesToProcess.add(className);
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
index 092d0b22a4e5de..0a814bda4d4862 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
@@ -483,6 +483,10 @@ ClassInfo getQualifier(DotName name) {
         return qualifiers.get(name);
     }
 
+    boolean isInheritedQualifier(DotName name) {
+        return (getQualifier(name).classAnnotation(DotNames.INHERITED) != null);
+    }
+
     /**
      * Extracts qualifiers from given annotation instance.
      * This returns a collection because in case of repeating qualifiers there can be multiple.
@@ -673,6 +677,10 @@ private Map findStereotypes(IndexView index, Map annotations : additionalStereotypes.values()) {
             stereotypeAnnotations.addAll(annotations);
         }
+        Set stereotypeNames = new HashSet<>();
+        for (AnnotationInstance stereotype : stereotypeAnnotations) {
+            stereotypeNames.add(stereotype.target().asClass().name());
+        }
         for (AnnotationInstance stereotype : stereotypeAnnotations) {
             final DotName stereotypeName = stereotype.target().asClass().name();
             ClassInfo stereotypeClass = getClassByName(index, stereotypeName);
@@ -682,6 +690,7 @@ private Map findStereotypes(IndexView index, Map scopes = new ArrayList<>();
                 List bindings = new ArrayList<>();
+                List parentStereotypes = new ArrayList<>();
                 boolean isNamed = false;
 
                 for (AnnotationInstance annotation : annotationStore.getAnnotations(stereotypeClass)) {
@@ -689,6 +698,8 @@ private Map findStereotypes(IndexView index, Map findStereotypes(IndexView index, Map findStereotypes(IndexView index, Map qualifiers = new HashSet<>();
-        List scopes = new ArrayList<>();
-        Set types = Types.getClassBeanTypeClosure(beanClass, beanDeployment);
-        Integer alternativePriority = null;
-        boolean isAlternative = false;
-        boolean isDefaultBean = false;
-        List stereotypes = new ArrayList<>();
-        String name = null;
+    private static class BeanInfoBuilder {
+        private static String name;
+        private static Integer alternativePriority;
+        private static boolean isAlternative;
+        private static boolean isDefaultBean;
+
+        static void processInheritedAnnotation(
+                AnnotationInstance annotation,
+                BeanDeployment beanDeployment,
+                Set qualifiers,
+                List stereotypes) {
+            Collection qualifierCollection = beanDeployment.extractQualifiers(annotation);
+            for (AnnotationInstance qualifierAnnotation : qualifierCollection) {
+                if (beanDeployment.isInheritedQualifier(qualifierAnnotation.name())) {
+                    qualifiers.add(qualifierAnnotation);
+                }
+            }
+            StereotypeInfo stereotype = beanDeployment.getStereotype(annotation.name());
+            if (stereotype != null) {
+                if (stereotype.isInherited()) {
+                    stereotypes.add(stereotype);
+                }
+            }
+        }
 
-        for (AnnotationInstance annotation : beanDeployment.getAnnotations(beanClass)) {
+        static void processAnnotation(AnnotationInstance annotation,
+                ClassInfo beanClass,
+                BeanDeployment beanDeployment,
+                Set qualifiers,
+                List stereotypes,
+                List scopes) {
             if (DotNames.NAMED.equals(annotation.name())) {
                 AnnotationValue nameValue = annotation.value();
                 if (nameValue != null) {
@@ -71,76 +91,119 @@ static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployme
             StereotypeInfo stereotype = beanDeployment.getStereotype(annotation.name());
             if (stereotype != null) {
                 stereotypes.add(stereotype);
-                continue;
+                return;
             }
             if (!qualifierCollection.isEmpty()) {
                 // we needn't process it further, the annotation was a qualifier (or multiple repeating ones)
-                continue;
+                return;
             }
             if (annotation.name()
                     .equals(DotNames.ALTERNATIVE)) {
                 isAlternative = true;
-                continue;
+                return;
             }
             if (annotation.name()
                     .equals(DotNames.ALTERNATIVE_PRIORITY)) {
                 isAlternative = true;
                 alternativePriority = annotation.value().asInt();
-                continue;
+                return;
             }
             if (DotNames.DEFAULT_BEAN.equals(annotation.name())) {
                 isDefaultBean = true;
-                continue;
+                return;
             }
             if (annotation.name()
                     .equals(DotNames.PRIORITY) && alternativePriority == null) {
                 alternativePriority = annotation.value()
                         .asInt();
-                continue;
+                return;
             }
             ScopeInfo scopeAnnotation = beanDeployment.getScope(annotation.name());
             if (scopeAnnotation != null) {
-                scopes.add(scopeAnnotation);
-                continue;
+                if (!scopes.contains(scopeAnnotation)) {
+                    scopes.add(scopeAnnotation);
+                }
             }
         }
 
-        if (scopes.size() > 1) {
-            throw multipleScopesFound("Bean class " + beanClass, scopes);
-        }
-        ScopeInfo scope;
-        if (scopes.isEmpty()) {
-            // try to search stereotypes for scope
-            scope = initStereotypeScope(stereotypes, beanClass);
-            // if that fails, try inheriting them
-            if (scope == null) {
-                scope = inheritScope(beanClass, beanDeployment);
+        static BeanInfo build(ClassInfo beanClass,
+                BeanDeployment beanDeployment,
+                InjectionPointModifier transformer) {
+            Set qualifiers = new HashSet<>();
+            List scopes = new ArrayList<>();
+            Set types = Types.getClassBeanTypeClosure(beanClass, beanDeployment);
+            alternativePriority = null;
+            isAlternative = false;
+            isDefaultBean = false;
+            List stereotypes = new ArrayList<>();
+            name = null;
+            Collection annotations = beanDeployment.getAnnotations(beanClass);
+
+            processSuperClass(beanClass, beanDeployment, qualifiers, stereotypes);
+            for (AnnotationInstance annotation : annotations) {
+                processAnnotation(annotation, beanClass, beanDeployment, qualifiers, stereotypes, scopes);
             }
-        } else {
-            scope = scopes.get(0);
-        }
-        if (!isAlternative) {
-            isAlternative = initStereotypeAlternative(stereotypes);
-        }
-        if (name == null) {
-            name = initStereotypeName(stereotypes, beanClass);
+
+            if (scopes.size() > 1) {
+                throw multipleScopesFound("Bean class " + beanClass, scopes);
+            }
+            ScopeInfo scope;
+            if (scopes.isEmpty()) {
+                // try to search stereotypes for scope
+                scope = initStereotypeScope(stereotypes, beanClass, beanDeployment);
+                // if that fails, try inheriting them
+                if (scope == null) {
+                    scope = inheritScope(beanClass, beanDeployment);
+                }
+            } else {
+                scope = scopes.get(0);
+            }
+            if (!isAlternative) {
+                isAlternative = initStereotypeAlternative(stereotypes);
+            }
+            if (name == null) {
+                name = initStereotypeName(stereotypes, beanClass);
+            }
+
+            if (isAlternative) {
+                alternativePriority = initAlternativePriority(beanClass, alternativePriority, stereotypes, beanDeployment);
+                if (alternativePriority == null) {
+                    // after all attempts, priority is still null, bean will be ignored
+                    LOGGER.debugf(
+                            "Ignoring bean defined via %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives",
+                            beanClass.name());
+                    return null;
+                }
+            }
+
+            return new BeanInfo(beanClass, beanDeployment, scope, types, qualifiers,
+                    Injection.forBean(beanClass, null, beanDeployment, transformer), null, null,
+                    isAlternative ? alternativePriority : null, stereotypes, name, isDefaultBean);
         }
 
-        if (isAlternative) {
-            alternativePriority = initAlternativePriority(beanClass, alternativePriority, stereotypes, beanDeployment);
-            if (alternativePriority == null) {
-                // after all attempts, priority is still null, bean will be ignored
-                LOGGER.debugf(
-                        "Ignoring bean defined via %s - declared as an @Alternative but not selected by @Priority, @AlternativePriority or quarkus.arc.selected-alternatives",
-                        beanClass.name());
-                return null;
+        private static void processSuperClass(ClassInfo beanClass, BeanDeployment beanDeployment,
+                Set qualifiers, List stereotypes) {
+            DotName superClassName = beanClass.superName();
+            while (!superClassName.equals(DotNames.OBJECT)) {
+                ClassInfo classFromIndex = getClassByName(beanDeployment.getBeanArchiveIndex(), superClassName);
+                if (classFromIndex == null) {
+                    // class not in index
+                    LOGGER.warnf("Unable to get inherited qualifier of stereotype for bean %s because its " +
+                            "super class %s is not part of Jandex index. This inheritance will not apply.",
+                            beanClass,
+                            superClassName);
+                    break;
+                }
+                for (AnnotationInstance annotation : beanDeployment.getAnnotationStore().getAnnotations(classFromIndex)) {
+                    processInheritedAnnotation(annotation, beanDeployment, qualifiers, stereotypes);
+                }
+                superClassName = classFromIndex.superName();
             }
         }
+    }
 
-        BeanInfo bean = new BeanInfo(beanClass, beanDeployment, scope, types, qualifiers,
-                Injection.forBean(beanClass, null, beanDeployment, transformer), null, null,
-                isAlternative ? alternativePriority : null, stereotypes, name, isDefaultBean);
-        return bean;
+    static BeanInfo createClassBean(ClassInfo beanClass, BeanDeployment beanDeployment, InjectionPointModifier transformer) {
+        return BeanInfoBuilder.build(beanClass, beanDeployment, transformer);
     }
 
     private static ScopeInfo inheritScope(ClassInfo beanClass, BeanDeployment beanDeployment) {
@@ -231,7 +294,7 @@ static BeanInfo createProducerMethod(MethodInfo producerMethod, BeanInfo declari
         }
         ScopeInfo scope;
         if (scopes.isEmpty()) {
-            scope = initStereotypeScope(stereotypes, producerMethod);
+            scope = initStereotypeScope(stereotypes, producerMethod, beanDeployment);
         } else {
             scope = scopes.get(0);
         }
@@ -322,7 +385,7 @@ static BeanInfo createProducerField(FieldInfo producerField, BeanInfo declaringB
         }
         ScopeInfo scope;
         if (scopes.isEmpty()) {
-            scope = initStereotypeScope(stereotypes, producerField);
+            scope = initStereotypeScope(stereotypes, producerField, beanDeployment);
         } else {
             scope = scopes.get(0);
         }
@@ -364,7 +427,8 @@ private static DefinitionException multipleScopesFound(String baseMessage, List<
                 + scopes.stream().map(s -> s.getDotName().toString()).collect(Collectors.joining(", ")));
     }
 
-    private static ScopeInfo initStereotypeScope(List stereotypes, AnnotationTarget target) {
+    private static ScopeInfo initStereotypeScope(List stereotypes, AnnotationTarget target,
+            BeanDeployment beanDeployment) {
         if (stereotypes.isEmpty()) {
             return null;
         }
@@ -372,7 +436,18 @@ private static ScopeInfo initStereotypeScope(List stereotypes, A
         final Set additionalBDAScopes = new HashSet<>();
         for (StereotypeInfo stereotype : stereotypes) {
             if (!stereotype.isAdditionalBeanDefiningAnnotation()) {
-                stereotypeScopes.add(stereotype.getDefaultScope());
+                ScopeInfo defaultScope = stereotype.getDefaultScope();
+                if (defaultScope == null) {
+                    List parentStereotypes = new ArrayList<>(stereotype.getParentStereotypes().size());
+                    for (AnnotationInstance annotation : stereotype.getParentStereotypes()) {
+                        StereotypeInfo parentStereotype = beanDeployment.getStereotype(annotation.name());
+                        parentStereotypes.add(parentStereotype);
+                    }
+                    defaultScope = initStereotypeScope(parentStereotypes, target, beanDeployment);
+                }
+                if (defaultScope != null) {
+                    stereotypeScopes.add(defaultScope);
+                }
             } else {
                 additionalBDAScopes.add(stereotype.getDefaultScope());
             }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
index ed4c848622314c..6d6112e4db772f 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
@@ -9,6 +9,7 @@
 import io.quarkus.arc.VetoedProducer;
 import io.quarkus.arc.impl.ComputingCache;
 import java.io.Serializable;
+import java.lang.annotation.Inherited;
 import java.lang.annotation.Repeatable;
 import java.util.Optional;
 import java.util.OptionalDouble;
@@ -67,6 +68,7 @@ public final class DotNames {
     public static final DotName DISPOSES = create(Disposes.class);
     public static final DotName QUALIFIER = create(Qualifier.class);
     public static final DotName REPEATABLE = create(Repeatable.class);
+    public static final DotName INHERITED = create(Inherited.class);
     public static final DotName NONBINDING = create(Nonbinding.class);
     public static final DotName INJECT = create(Inject.class);
     public static final DotName POST_CONSTRUCT = create(PostConstruct.class);
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
index d0769ac4639f5a..5505104f632aa8 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/Methods.java
@@ -495,6 +495,10 @@ public boolean test(MethodInfo method) {
                 // The algorithm we use to detect these methods is best effort, i.e. there might be use cases where the detection fails
                 return hasImplementation(method);
             }
+            if (method.hasAnnotation(DotNames.POST_CONSTRUCT) || method.hasAnnotation(DotNames.PRE_DESTROY)) {
+                // @PreDestroy and @PostConstruct methods declared on the bean are NOT candidates for around invoke interception
+                return true;
+            }
             if (isOverridenByBridgeMethod(method)) {
                 return true;
             }
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java
index 13e841e14c1c76..ad7c96239bcce1 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/StereotypeInfo.java
@@ -12,6 +12,8 @@ public class StereotypeInfo {
     private final boolean alternative;
     private final Integer alternativePriority;
     private final boolean isNamed;
+    private final boolean isInherited;
+    private final List parentStereotypes;
     private final ClassInfo target;
     // allows to differentiate between standard stereotype and one that is in fact additional bean defining annotation
     private final boolean isAdditionalBeanDefiningAnnotation;
@@ -21,7 +23,7 @@ public class StereotypeInfo {
     public StereotypeInfo(ScopeInfo defaultScope, List interceptorBindings, boolean alternative,
             Integer alternativePriority,
             boolean isNamed, boolean isAdditionalBeanDefiningAnnotation, boolean isAdditionalStereotypeBuildItem,
-            ClassInfo target) {
+            ClassInfo target, boolean isInherited, List parentStereotypes) {
         this.defaultScope = defaultScope;
         this.interceptorBindings = interceptorBindings;
         this.alternative = alternative;
@@ -30,12 +32,15 @@ public StereotypeInfo(ScopeInfo defaultScope, List intercept
         this.target = target;
         this.isAdditionalBeanDefiningAnnotation = isAdditionalBeanDefiningAnnotation;
         this.isAdditionalStereotypeBuildItem = isAdditionalStereotypeBuildItem;
+        this.isInherited = isInherited;
+        this.parentStereotypes = parentStereotypes;
     }
 
     public StereotypeInfo(ScopeInfo defaultScope, List interceptorBindings, boolean alternative,
             Integer alternativePriority,
-            boolean isNamed, ClassInfo target) {
-        this(defaultScope, interceptorBindings, alternative, alternativePriority, isNamed, false, false, target);
+            boolean isNamed, ClassInfo target, boolean isInherited, List parentStereotype) {
+        this(defaultScope, interceptorBindings, alternative, alternativePriority, isNamed, false, false, target, isInherited,
+                parentStereotype);
     }
 
     public ScopeInfo getDefaultScope() {
@@ -50,6 +55,10 @@ public boolean isAlternative() {
         return alternative;
     }
 
+    public boolean isInherited() {
+        return isInherited;
+    }
+
     public Integer getAlternativePriority() {
         return alternativePriority;
     }
@@ -78,4 +87,7 @@ public boolean isGenuine() {
         return !isAdditionalBeanDefiningAnnotation && !isAdditionalStereotypeBuildItem;
     }
 
+    public List getParentStereotypes() {
+        return parentStereotypes;
+    }
 }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java
index f1b5672e3220bd..4f220560035027 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/EventImpl.java
@@ -35,7 +35,8 @@
 import javax.enterprise.util.TypeLiteral;
 import javax.transaction.RollbackException;
 import javax.transaction.Synchronization;
-import javax.transaction.TransactionSynchronizationRegistry;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
 import org.jboss.logging.Logger;
 
 /**
@@ -56,6 +57,8 @@ class EventImpl implements Event {
 
     private transient volatile Notifier lastNotifier;
 
+    private static final Logger LOGGER = Logger.getLogger(EventImpl.class);
+
     EventImpl(Type eventType, Set qualifiers) {
         this.eventType = initEventType(eventType);
         this.injectionPointTypeHierarchy = new HierarchyDiscovery(this.eventType);
@@ -246,35 +249,47 @@ void notify(T event, ObserverExceptionHandler exceptionHandler, boolean async) {
 
                 if (!async && hasTxObservers) {
                     // Note that tx observers are never async
-                    InstanceHandle registryInstance = Arc.container()
-                            .instance(TransactionSynchronizationRegistry.class);
-
-                    if (registryInstance.isAvailable() &&
-                            registryInstance.get().getTransactionStatus() == javax.transaction.Status.STATUS_ACTIVE) {
-                        // we have one or more transactional OM, and TransactionSynchronizationRegistry is available
-                        // we attempt to register a JTA synchronization
-                        List> deferredEvents = new ArrayList<>();
-                        EventContext eventContext = new EventContextImpl<>(event, eventMetadata);
-
-                        for (ObserverMethod om : observerMethods) {
-                            if (isTxObserver(om)) {
-                                deferredEvents.add(new DeferredEventNotification<>(om, eventContext,
-                                        Status.valueOf(om.getTransactionPhase())));
+                    InstanceHandle transactionManagerInstance = Arc.container()
+                            .instance(TransactionManager.class);
+
+                    try {
+                        if (transactionManagerInstance.isAvailable() &&
+                                transactionManagerInstance.get().getStatus() == javax.transaction.Status.STATUS_ACTIVE) {
+                            // we have one or more transactional OM, and TransactionManager is available
+                            // we attempt to register a JTA synchronization
+                            List> deferredEvents = new ArrayList<>();
+                            EventContext eventContext = new EventContextImpl<>(event, eventMetadata);
+
+                            for (ObserverMethod om : observerMethods) {
+                                if (isTxObserver(om)) {
+                                    deferredEvents.add(new DeferredEventNotification<>(om, eventContext,
+                                            Status.valueOf(om.getTransactionPhase())));
+                                }
                             }
-                        }
 
-                        Synchronization sync = new ArcSynchronization(deferredEvents);
-                        TransactionSynchronizationRegistry registry = registryInstance.get();
-                        try {
-                            registry.registerInterposedSynchronization(sync);
-                            // registration succeeded, notify all non-tx observers synchronously
-                            predicate = predicate.and(this::isNotTxObserver);
-                        } catch (Exception e) {
-                            if (e.getCause() instanceof RollbackException || e.getCause() instanceof IllegalStateException) {
-                                // registration failed, AFTER_SUCCESS OMs are accordingly to CDI spec left out
-                                predicate = predicate.and(this::isNotAfterSuccess);
+                            Synchronization sync = new ArcSynchronization(deferredEvents);
+                            TransactionManager txManager = transactionManagerInstance.get();
+                            try {
+                                // NOTE - We are using standard synchronization on purpose as that seems more
+                                // fitting than interposed sync. Either way will have some use-cases that won't work.
+                                // See for instance discussions on https://github.com/eclipse-ee4j/cdi/issues/467
+                                txManager.getTransaction().registerSynchronization(sync);
+                                // registration succeeded, notify all non-tx observers synchronously
+                                predicate = predicate.and(this::isNotTxObserver);
+                            } catch (Exception e) {
+                                if (e.getCause() instanceof RollbackException
+                                        || e.getCause() instanceof IllegalStateException
+                                        || e.getCause() instanceof SystemException) {
+                                    // registration failed, AFTER_SUCCESS OMs are accordingly to CDI spec left out
+                                    predicate = predicate.and(this::isNotAfterSuccess);
+                                }
                             }
                         }
+                    } catch (SystemException e) {
+                        // In theory, this can be thrown by TransactionManager#getStatus() at which point we cannot even
+                        // determine if we should register some synchronization, therefore, we only log this
+                        LOGGER.debugf("Failure when trying to invoke TransactionManager#getStatus(). Stacktrace: %s",
+                                e.getCause() != null ? e.getCause() : e);
                     }
                 }
 
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java
new file mode 100644
index 00000000000000..27cd06dd332c70
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/MemberLevelInheritanceTest.java
@@ -0,0 +1,120 @@
+package io.quarkus.arc.test.inheritance;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Typed;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class MemberLevelInheritanceTest {
+
+    @RegisterExtension
+    ArcTestContainer testContainer = new ArcTestContainer(Foo.class, FooExtended.class, DummyBean.class,
+            MyBinding.class, MyInterceptor.class);
+
+    @Test
+    public void testMemberLevelInheritance() {
+        ArcContainer container = Arc.container();
+        // IP inheritance
+        FooExtended fooExtended = container.instance(FooExtended.class).get();
+        assertNotNull(fooExtended);
+        assertNotNull(fooExtended.getBar());
+
+        // producer inheritance is tested simply by not getting ambiguous dependency while running the test
+
+        // initializer inheritance
+        assertNotNull(fooExtended.getBeanFromInitMethod());
+
+        // interceptor binding on a method inheritance
+        assertEquals(0, MyInterceptor.timesInvoked);
+        fooExtended.interceptedMethod();
+        assertEquals(1, MyInterceptor.timesInvoked);
+    }
+
+    @ApplicationScoped
+    static class Foo {
+        @Inject
+        DummyBean bar;
+
+        public DummyBean getBar() {
+            return bar;
+        }
+
+        @Produces
+        String string = "42";
+
+        @Produces
+        public Integer answerToLifeUniverseAndAll() {
+            return 42;
+        }
+
+        DummyBean beanFromInitMethod = null;
+
+        public DummyBean getBeanFromInitMethod() {
+            return beanFromInitMethod;
+        }
+
+        @Inject
+        public void initializerMethod(DummyBean bean) {
+            this.beanFromInitMethod = bean;
+        }
+
+        @MyBinding
+        public void interceptedMethod() {
+        }
+    }
+
+    @ApplicationScoped
+    @Typed(FooExtended.class)
+    static class FooExtended extends Foo {
+        // does inherit injected field
+        // does not inherit producers
+        // does inherit initializer
+        // does inherit intercepted interceptedMethod
+    }
+
+    @ApplicationScoped
+    static class DummyBean {
+
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @Inherited
+    @InterceptorBinding
+    @interface MyBinding {
+    }
+
+    @MyBinding
+    @Interceptor
+    @Priority(1)
+    static class MyInterceptor {
+        public static int timesInvoked = 0;
+
+        @AroundInvoke
+        Object aroundInvoke(InvocationContext ctx) throws Exception {
+            timesInvoked++;
+            return ctx.proceed();
+        }
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java
new file mode 100644
index 00000000000000..289688b8c8cad1
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/inheritance/TypeLevelInheritanceTest.java
@@ -0,0 +1,182 @@
+package io.quarkus.arc.test.inheritance;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.Typed;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Qualifier;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InterceptorBinding;
+import javax.interceptor.InvocationContext;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/**
+ * Tests type inheritence, e.g. that scopes, stereotypes, bindings and qualifiers are inherited so long as they
+ * declare {@code @Inherited}
+ *
+ * Scope inheritance is tested separately, see ScopeInheritanceTest
+ */
+public class TypeLevelInheritanceTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder().removeUnusedBeans(false)
+            .beanClasses(BasicBean.class, SubBean.class, FirstInterceptor.class, SecondInterceptor.class,
+                    ThirdInterceptor.class, MyBinding.class, MyStereotype.class, MyStereotype2.class,
+                    SecondaryBinding.class, MyQualifier.class, ThirdBinding.class, MyQualifier2.class)
+            .build();
+
+    @Test
+    public void testTypeInheritance() {
+        ArcContainer container = Arc.container();
+
+        assertEquals(0, FirstInterceptor.timesInvoked);
+        assertEquals(0, SecondInterceptor.timesInvoked);
+        assertEquals(0, ThirdInterceptor.timesInvoked);
+
+        BasicBean basicBean = container.instance(BasicBean.class, new MyQualifier.Literal(), new MyQualifier2.Literal()).get();
+        assertNotNull(basicBean);
+        basicBean.ping();
+        assertEquals(1, FirstInterceptor.timesInvoked);
+        assertEquals(1, SecondInterceptor.timesInvoked);
+        assertEquals(1, ThirdInterceptor.timesInvoked);
+
+        SubBean subBean = container.instance(SubBean.class, new MyQualifier.Literal(), new MyQualifier2.Literal()).get();
+        assertNull(subBean);
+        subBean = container.instance(SubBean.class, new MyQualifier.Literal()).get();
+        assertNotNull(subBean);
+        subBean.ping();
+        assertEquals(2, FirstInterceptor.timesInvoked);
+        assertEquals(2, SecondInterceptor.timesInvoked);
+        assertEquals(1, ThirdInterceptor.timesInvoked);
+    }
+
+    @ApplicationScoped
+    @MyBinding
+    @MyQualifier
+    @MyQualifier2
+    @MyStereotype2
+    @MyStereotype
+    static class BasicBean {
+        public void ping() {
+
+        }
+    }
+
+    @Typed(SubBean.class)
+    @ApplicationScoped
+    static class SubBean extends BasicBean {
+
+    }
+
+    @MyBinding
+    @Interceptor
+    @Priority(1)
+    static class FirstInterceptor {
+        public static int timesInvoked = 0;
+
+        @AroundInvoke
+        Object aroundInvoke(InvocationContext ctx) throws Exception {
+            timesInvoked++;
+            return ctx.proceed();
+        }
+    }
+
+    @ThirdBinding
+    @Interceptor
+    @Priority(2)
+    static class ThirdInterceptor {
+        public static int timesInvoked = 0;
+
+        @AroundInvoke
+        Object aroundInvoke(InvocationContext ctx) throws Exception {
+            timesInvoked++;
+            return ctx.proceed();
+        }
+    }
+
+    @SecondaryBinding
+    @Interceptor
+    @Priority(1)
+    static class SecondInterceptor {
+        public static int timesInvoked = 0;
+
+        @AroundInvoke
+        Object aroundInvoke(InvocationContext ctx) throws Exception {
+            timesInvoked++;
+            return ctx.proceed();
+        }
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @Inherited
+    @InterceptorBinding
+    @interface MyBinding {
+    }
+
+    @Stereotype
+    @Inherited
+    @SecondaryBinding
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @interface MyStereotype {
+    }
+
+    @Stereotype
+    @ThirdBinding
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @interface MyStereotype2 {
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @InterceptorBinding
+    @interface SecondaryBinding {
+    }
+
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @InterceptorBinding
+    @interface ThirdBinding {
+    }
+
+    @Inherited
+    @Qualifier
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @interface MyQualifier {
+
+        static class Literal extends AnnotationLiteral implements MyQualifier {
+
+        }
+    }
+
+    @Qualifier
+    @Target({ TYPE, METHOD, FIELD, PARAMETER })
+    @Retention(RUNTIME)
+    @interface MyQualifier2 {
+
+        static class Literal extends AnnotationLiteral implements MyQualifier2 {
+
+        }
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java
new file mode 100644
index 00000000000000..2c6dabf1a0ffa4
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MultipleInterceptionTypesTogetherTest.java
@@ -0,0 +1,53 @@
+package io.quarkus.arc.test.interceptors.complex;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.InstanceHandle;
+import io.quarkus.arc.test.ArcTestContainer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class MultipleInterceptionTypesTogetherTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyBinding.class, SomeBean.class, MyInterceptor.class);
+
+    @Test
+    public void testInterceptionIsInvokedWhenAppropriate() {
+        SomeBean.reset();
+        MyInterceptor.reset();
+        // assert initial state
+        Assertions.assertEquals(false, SomeBean.postConstructInvoked.get());
+        Assertions.assertEquals(false, SomeBean.preDestroyInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.aroundConstructInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.postConstructInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.preDestroyInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.aroundInvokeInvoked.get());
+        // create bean instance, no method was invoked so far
+        InstanceHandle instance = Arc.container().instance(SomeBean.class);
+        SomeBean bean = instance.get();
+        // assert lifecycle callback were invoked but no around invoke was triggered
+        Assertions.assertEquals(true, SomeBean.postConstructInvoked.get());
+        Assertions.assertEquals(false, SomeBean.preDestroyInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.aroundConstructInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.postConstructInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.preDestroyInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.aroundInvokeInvoked.get());
+        // invoke bean method and assert around invoke was triggered
+        bean.ping();
+        Assertions.assertEquals(true, SomeBean.postConstructInvoked.get());
+        Assertions.assertEquals(false, SomeBean.preDestroyInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.aroundConstructInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.postConstructInvoked.get());
+        Assertions.assertEquals(false, MyInterceptor.preDestroyInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.aroundInvokeInvoked.get());
+        // trigger bean destruction and assert lifecycle interceptors were triggered
+        instance.destroy();
+        Assertions.assertEquals(true, SomeBean.postConstructInvoked.get());
+        Assertions.assertEquals(true, SomeBean.preDestroyInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.aroundConstructInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.postConstructInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.preDestroyInvoked.get());
+        Assertions.assertEquals(true, MyInterceptor.aroundInvokeInvoked.get());
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java
new file mode 100644
index 00000000000000..21b0676c746308
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyBinding.java
@@ -0,0 +1,17 @@
+package io.quarkus.arc.test.interceptors.complex;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@InterceptorBinding
+public @interface MyBinding {
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java
new file mode 100644
index 00000000000000..c61548c310a04a
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/MyInterceptor.java
@@ -0,0 +1,50 @@
+package io.quarkus.arc.test.interceptors.complex;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Priority;
+import javax.interceptor.AroundConstruct;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Priority(1)
+@MyBinding
+public class MyInterceptor {
+
+    public static AtomicBoolean preDestroyInvoked = new AtomicBoolean(false);
+    public static AtomicBoolean postConstructInvoked = new AtomicBoolean(false);
+    public static AtomicBoolean aroundConstructInvoked = new AtomicBoolean(false);
+    public static AtomicBoolean aroundInvokeInvoked = new AtomicBoolean(false);
+
+    @PreDestroy
+    public void preDestroy(InvocationContext ic) {
+        preDestroyInvoked.set(true);
+    }
+
+    @PostConstruct
+    public void postConstruct(InvocationContext ic) {
+        postConstructInvoked.set(true);
+    }
+
+    @AroundConstruct
+    public void aroundConstruct(InvocationContext ic) throws Exception {
+        aroundConstructInvoked.set(true);
+        ic.proceed();
+    }
+
+    @AroundInvoke
+    public Object aroundInvoke(InvocationContext ic) throws Exception {
+        aroundInvokeInvoked.set(true);
+        return ic.proceed();
+    }
+
+    public static void reset() {
+        preDestroyInvoked.set(false);
+        postConstructInvoked.set(false);
+        aroundConstructInvoked.set(false);
+        aroundInvokeInvoked.set(false);
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java
new file mode 100644
index 00000000000000..4de05da30ffb93
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/interceptors/complex/SomeBean.java
@@ -0,0 +1,33 @@
+package io.quarkus.arc.test.interceptors.complex;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Singleton;
+
+@Singleton
+@MyBinding
+public class SomeBean {
+
+    public static AtomicBoolean preDestroyInvoked = new AtomicBoolean(false);
+    public static AtomicBoolean postConstructInvoked = new AtomicBoolean(false);
+
+    @PreDestroy
+    public void preDestroy() {
+        preDestroyInvoked.set(true);
+    }
+
+    @PostConstruct
+    public void postConstruct() {
+        postConstructInvoked.set(true);
+    }
+
+    public void ping() {
+
+    }
+
+    public static void reset() {
+        preDestroyInvoked.set(false);
+        postConstructInvoked.set(false);
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java
new file mode 100644
index 00000000000000..9945e7cb774913
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/StereotypeInheritanceTest.java
@@ -0,0 +1,99 @@
+package io.quarkus.arc.test.stereotypes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.Set;
+import java.util.UUID;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class StereotypeInheritanceTest {
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyStereotype.class, MyBeanDefiningAnnotation.class,
+            MySuperclass.class, MyBean.class);
+
+    @Test
+    public void test() {
+        ArcContainer container = Arc.container();
+        BeanManager bm = container.beanManager();
+
+        String beanId;
+
+        {
+            container.requestContext().activate();
+            MyBean bean = container.instance(MyBean.class).get();
+            assertNotNull(bean);
+            beanId = bean.getId();
+            assertNotNull(beanId);
+
+            Set> metadata = bm.getBeans(MyBean.class);
+            assertEquals(1, metadata.size());
+            assertEquals(RequestScoped.class, metadata.iterator().next().getScope());
+
+            container.requestContext().deactivate();
+        }
+
+        {
+            container.requestContext().activate();
+            MyBean bean = container.instance(MyBean.class).get();
+            assertNotNull(bean);
+            assertNotNull(bean.getId());
+            assertNotEquals(beanId, bean.getId());
+
+            Set> metadata = bm.getBeans(MyBean.class);
+            assertEquals(1, metadata.size());
+            assertEquals(RequestScoped.class, metadata.iterator().next().getScope());
+
+            container.requestContext().deactivate();
+        }
+    }
+
+    @RequestScoped
+    @Stereotype
+    @Target({ TYPE, METHOD, FIELD })
+    @Retention(RUNTIME)
+    @Inherited
+    @interface MyStereotype {
+    }
+
+    @Stereotype
+    @Target({ TYPE, METHOD, FIELD })
+    @Retention(RUNTIME)
+    @interface MyBeanDefiningAnnotation {
+    }
+
+    @MyStereotype
+    static class MySuperclass {
+    }
+
+    @MyBeanDefiningAnnotation
+    static class MyBean extends MySuperclass {
+        private String id;
+
+        @PostConstruct
+        void init() {
+            id = UUID.randomUUID().toString();
+        }
+
+        public String getId() {
+            return id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java
new file mode 100644
index 00000000000000..f6374f3b3395c5
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/stereotypes/TransitiveStereotypeTest.java
@@ -0,0 +1,93 @@
+package io.quarkus.arc.test.stereotypes;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.arc.ArcContainer;
+import io.quarkus.arc.test.ArcTestContainer;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.Set;
+import java.util.UUID;
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+public class TransitiveStereotypeTest {
+    @RegisterExtension
+    public ArcTestContainer container = new ArcTestContainer(MyStereotype.class, MyOtherStereotype.class, MyBean.class);
+
+    @Test
+    public void test() {
+        ArcContainer container = Arc.container();
+        BeanManager bm = container.beanManager();
+
+        String beanId;
+
+        {
+            container.requestContext().activate();
+            MyBean bean = container.instance(MyBean.class).get();
+            assertNotNull(bean);
+            beanId = bean.getId();
+            assertNotNull(beanId);
+
+            Set> metadata = bm.getBeans(MyBean.class);
+            assertEquals(1, metadata.size());
+            assertEquals(RequestScoped.class, metadata.iterator().next().getScope());
+
+            container.requestContext().deactivate();
+        }
+
+        {
+            container.requestContext().activate();
+            MyBean bean = container.instance(MyBean.class).get();
+            assertNotNull(bean);
+            assertNotNull(bean.getId());
+            assertNotEquals(beanId, bean.getId());
+
+            Set> metadata = bm.getBeans(MyBean.class);
+            assertEquals(1, metadata.size());
+            assertEquals(RequestScoped.class, metadata.iterator().next().getScope());
+
+            container.requestContext().deactivate();
+        }
+    }
+
+    @RequestScoped
+    @Stereotype
+    @Target({ TYPE, METHOD, FIELD })
+    @Retention(RUNTIME)
+    @interface MyStereotype {
+    }
+
+    @MyStereotype
+    @Stereotype
+    @Target({ TYPE, METHOD, FIELD })
+    @Retention(RUNTIME)
+    @interface MyOtherStereotype {
+    }
+
+    @MyOtherStereotype
+    static class MyBean {
+        private String id;
+
+        @PostConstruct
+        void init() {
+            id = UUID.randomUUID().toString();
+        }
+
+        public String getId() {
+            return id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java
index f4598b0e8dbc14..d4ddb2a1390875 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java
+++ b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/StartupAction.java
@@ -26,4 +26,9 @@ public interface StartupAction {
      */
     RunningQuarkusApplication runMainClass(String... args) throws Exception;
 
+    /**
+     * Runs the application by running the main method of the main class, and runs it to completion
+     */
+    int runMainClassBlocking(String... args) throws Exception;
+
 }
diff --git a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java
index 4f66378b5e3ec1..638e1777996fe4 100644
--- a/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java
+++ b/independent-projects/qute/core/src/main/java/io/quarkus/qute/EngineBuilder.java
@@ -31,6 +31,7 @@ public final class EngineBuilder {
         this.resultMappers = new ArrayList<>();
         this.parserHooks = new ArrayList<>();
         this.strictRendering = true;
+        this.removeStandaloneLines = true;
     }
 
     public EngineBuilder addSectionHelper(SectionHelperFactory factory) {
@@ -175,4 +176,4 @@ public Engine build() {
         return new EngineImpl(this);
     }
 
-}
\ No newline at end of file
+}
diff --git a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java
index 517018911779c5..46a374068d1d94 100644
--- a/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java
+++ b/independent-projects/resteasy-reactive/common/processor/src/main/java/org/jboss/resteasy/reactive/common/processor/EndpointIndexer.java
@@ -177,7 +177,7 @@ public abstract class EndpointIndexer> classLevelExceptionMappers;
     private final Function> factoryCreator;
-    private final Consumer> resourceMethodCallback;
+    private final Consumer resourceMethodCallback;
 
     protected EndpointIndexer(Builder builder) {
         this.index = builder.index;
@@ -199,6 +199,10 @@ public ResourceClass createEndpoints(ClassInfo classInfo) {
         try {
             String path = scannedResourcePaths.get(classInfo.name());
             ResourceClass clazz = new ResourceClass();
+            if ((classInfo.enclosingClass() != null) && !Modifier.isStatic(classInfo.flags())) {
+                throw new DeploymentException(
+                        "Non static nested resources classes are not supported: '" + classInfo.name() + "'");
+            }
             clazz.setClassName(classInfo.name().toString());
             if (path != null) {
                 if (path.endsWith("/")) {
@@ -545,7 +549,7 @@ private ResourceMethod createResourceMethod(ClassInfo currentClassInfo, ClassInf
 
             handleAdditionalMethodProcessing((METHOD) method, currentClassInfo, currentMethodInfo);
             if (resourceMethodCallback != null) {
-                resourceMethodCallback.accept(new AbstractMap.SimpleEntry<>(currentMethodInfo, method));
+                resourceMethodCallback.accept(new ResourceMethodCallbackData(currentMethodInfo, actualEndpointInfo, method));
             }
             return method;
         } catch (Exception e) {
@@ -1048,6 +1052,13 @@ && isContextType(paramType.asClassType())) {
             elementType = paramType.name().toString();
             handleLocalDateParam(builder);
             typeHandled = true;
+        } else if (paramType.name().equals(LIST) && (type == ParameterType.QUERY)) { // RESTEasy Classic handles the non-generic List type
+            elementType = String.class.getName();
+            typeHandled = true;
+            builder.setSingle(false);
+            if (convertible) {
+                handleListParam(existingConverters, errorLocation, hasRuntimeConverters, builder, elementType);
+            }
         }
 
         if (!typeHandled) {
@@ -1133,7 +1144,7 @@ public static abstract class Builder, B
         private AdditionalWriters additionalWriters;
         private boolean hasRuntimeConverters;
         private Map> classLevelExceptionMappers;
-        private Consumer> resourceMethodCallback;
+        private Consumer resourceMethodCallback;
 
         public B setDefaultBlocking(BlockingDefault defaultBlocking) {
             this.defaultBlocking = defaultBlocking;
@@ -1195,7 +1206,7 @@ public B setClassLevelExceptionMappers(Map> classLe
             return (B) this;
         }
 
-        public B setResourceMethodCallback(Consumer> resourceMethodCallback) {
+        public B setResourceMethodCallback(Consumer resourceMethodCallback) {
             this.resourceMethodCallback = resourceMethodCallback;
             return (B) this;
         }
@@ -1203,4 +1214,28 @@ public B setResourceMethodCallback(Consumer11
         
         2.0.2
-        2.3.1.Final
+        2.4.0.Final
         5.7.2
         3.8.1
         3.20.2
@@ -52,7 +52,7 @@
         1.1.6
         1.0.0
         1.6.0
-        4.1.2
+        4.1.3
         4.4.0
         1.0.0.Final
         2.0.0.Final
diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java
index 5b5ef467906394..6464523f41e220 100644
--- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java
+++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/scanning/CacheControlScanner.java
@@ -61,18 +61,18 @@ private ExtendedCacheControl noCacheToCacheControl(AnnotationInstance noCacheIns
         if (noCacheInstance == null) {
             return null;
         }
+        ExtendedCacheControl cacheControl = new ExtendedCacheControl();
+        cacheControl.setNoCache(true);
+        cacheControl.setNoTransform(false);
         AnnotationValue fieldsValue = noCacheInstance.value("fields");
         if (fieldsValue != null) {
             String[] fields = fieldsValue.asStringArray();
             if ((fields != null) && (fields.length > 0)) {
-                ExtendedCacheControl cacheControl = new ExtendedCacheControl();
-                cacheControl.setNoCache(true);
-                cacheControl.setNoTransform(false);
                 cacheControl.getNoCacheFields().addAll(Arrays.asList(fields));
-                return cacheControl;
+
             }
         }
-        return null;
+        return cacheControl;
     }
 
     private ExtendedCacheControl cacheToCacheControl(AnnotationInstance cacheInstance) {
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java
index 06318c42c1c2d0..74c67f38224201 100644
--- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/injection/ContextProducers.java
@@ -133,6 +133,10 @@ SecurityContext securityContext() {
     }
 
     private ResteasyReactiveRequestContext getContext() {
-        return CurrentRequestManager.get();
+        ResteasyReactiveRequestContext context = CurrentRequestManager.get();
+        if (context == null) {
+            throw new IllegalStateException("No RESTEasy Reactive request in progress");
+        }
+        return context;
     }
 }
diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java
index 5daaa95dca5758..13295cdd4c374f 100644
--- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java
+++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/UriInfoImpl.java
@@ -90,7 +90,13 @@ public UriBuilder getRequestUriBuilder() {
     public URI getAbsolutePath() {
         try {
             // TCK says normalized
-            return new URI(currentRequest.getAbsoluteURI()).normalize();
+            String effectiveURI = currentRequest.getAbsoluteURI();
+            int queryParamsIndex = effectiveURI.indexOf('?');
+            if (queryParamsIndex > 0) {
+                // the spec says that getAbsolutePath() does not contain query parameters
+                effectiveURI = effectiveURI.substring(0, queryParamsIndex);
+            }
+            return new URI(effectiveURI).normalize();
         } catch (URISyntaxException e) {
             throw new RuntimeException(e);
         }
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
index 687990707f1973..2a7e4b6591428e 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/gradle/kotlin/build.tpl.qute.gradle
@@ -15,18 +15,10 @@ allOpen {
 }
 
 compileKotlin {
-    {#if java.version == "11"}
     kotlinOptions.jvmTarget = JavaVersion.VERSION_11
-    {#else}
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-    {/if}
     kotlinOptions.javaParameters = true
 }
 
 compileTestKotlin {
-    {#if java.version == "11"}
     kotlinOptions.jvmTarget = JavaVersion.VERSION_11
-    {#else}
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
-    {/if}
 }
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
index 034755124e4b7f..e4b6c73d62bc7a 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/kotlin/pom.tpl.qute.xml
@@ -40,7 +40,7 @@
                 
                 
                     true
-                    1.8
+                    11
                     
                     
                         all-open
@@ -64,4 +64,4 @@
             
         
     
-
\ No newline at end of file
+
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
index d33429cbfeb496..d06ba6177c47b8 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/handlers/CreateProjectCommandHandler.java
@@ -189,7 +189,8 @@ private List computeRequiredExtensions(ExtensionCatalog catalog,
         return extensionsToAdd;
     }
 
-    private List getExtensionOrigins(ExtensionCatalog extensionCatalog, List extensionsToAdd)
+    private static List getExtensionOrigins(ExtensionCatalog extensionCatalog,
+            List extensionsToAdd)
             throws QuarkusCommandException {
 
         final List extOrigins = new ArrayList<>(extensionsToAdd.size());
@@ -227,7 +228,7 @@ private List getExtensionOrigins(ExtensionCatalog extensionCat
         return recommendedCombination.getUniqueSortedOrigins().stream().map(o -> o.getCatalog()).collect(Collectors.toList());
     }
 
-    public void addOrigins(final List extOrigins, Extension e) {
+    private static void addOrigins(final List extOrigins, Extension e) {
         ExtensionOrigins.Builder eoBuilder = null;
         for (ExtensionOrigin o : e.getOrigins()) {
             if (!(o instanceof ExtensionCatalog)) {
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java
index 70f6a22777edd8..97f532d2a36387 100644
--- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClient.java
@@ -120,6 +120,9 @@ private ExtensionCatalog deserializeExtensionCatalog(Path p) throws RegistryReso
     public PlatformCatalog resolvePlatforms(String quarkusVersion) throws RegistryResolutionException {
         final Path json = TestRegistryClientBuilder.getRegistryPlatformsCatalogPath(registryDir, quarkusVersion);
         log.debug("%s resolvePlatforms %s", config.getId(), json);
+        if (!Files.exists(json)) {
+            return null;
+        }
         try {
             return JsonCatalogMapperHelper.deserialize(json, JsonPlatformCatalog.class);
         } catch (IOException e) {
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
index 74936a9ea295a0..195a7c1103ee43 100644
--- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
@@ -106,6 +106,7 @@ public static class TestRegistryBuilder {
         private JsonRegistryQuarkusVersionsConfig quarkusVersions;
         private boolean external;
         private PlatformCatalog platformCatalog;
+        private JsonPlatformCatalog archivedPlatformCatalog;
 
         private List memberCatalogs;
         private List nonPlatformCatalogs;
@@ -221,37 +222,72 @@ private void configure(Path registryDir) {
             platformConfig
                     .setArtifact(new ArtifactCoords(registryGroupId, Constants.DEFAULT_REGISTRY_PLATFORMS_CATALOG_ARTIFACT_ID,
                             null, "json", Constants.DEFAULT_REGISTRY_ARTIFACT_VERSION));
-            if (platformCatalog == null) {
+            if (platformCatalog == null && archivedPlatformCatalog == null) {
                 platformConfig.setDisabled(true);
             } else {
                 final Path platformsDir = getRegistryPlatformsDir(registryDir);
-                persistPlatformCatalog(platformCatalog, platformsDir);
                 final Map platformsByQuarkusVersion = new HashMap<>();
-                for (Platform p : platformCatalog.getPlatforms()) {
-                    for (PlatformStream s : p.getStreams()) {
-                        for (PlatformRelease r : s.getReleases()) {
-                            if (r.getQuarkusCoreVersion() == null) {
-                                throw new IllegalStateException("Quarkus version has not be configured for platform release "
-                                        + p.getPlatformKey() + ":" + s.getId() + ":" + r.getVersion());
-                            }
-                            final JsonPlatformCatalog c = platformsByQuarkusVersion.computeIfAbsent(r.getQuarkusCoreVersion(),
-                                    v -> new JsonPlatformCatalog());
-                            JsonPlatform platform = (JsonPlatform) c.getPlatform(p.getPlatformKey());
-                            if (platform == null) {
-                                platform = new JsonPlatform();
-                                platform.setPlatformKey(p.getPlatformKey());
-                                c.addPlatform(platform);
+                if (platformCatalog != null) {
+                    persistPlatformCatalog(platformCatalog, platformsDir);
+                    for (Platform p : platformCatalog.getPlatforms()) {
+                        for (PlatformStream s : p.getStreams()) {
+                            for (PlatformRelease r : s.getReleases()) {
+                                if (r.getQuarkusCoreVersion() == null) {
+                                    throw new IllegalStateException(
+                                            "Quarkus version has not be configured for platform release "
+                                                    + p.getPlatformKey() + ":" + s.getId() + ":" + r.getVersion());
+                                }
+                                final JsonPlatformCatalog c = platformsByQuarkusVersion.computeIfAbsent(
+                                        r.getQuarkusCoreVersion(),
+                                        v -> new JsonPlatformCatalog());
+                                JsonPlatform platform = (JsonPlatform) c.getPlatform(p.getPlatformKey());
+                                if (platform == null) {
+                                    platform = new JsonPlatform();
+                                    platform.setPlatformKey(p.getPlatformKey());
+                                    c.addPlatform(platform);
+                                }
+                                JsonPlatformStream stream = (JsonPlatformStream) platform.getStream(s.getId());
+                                if (stream == null) {
+                                    stream = new JsonPlatformStream();
+                                    stream.setId(s.getId());
+                                    platform.addStream(stream);
+                                }
+                                stream.addRelease(r);
                             }
-                            JsonPlatformStream stream = (JsonPlatformStream) platform.getStream(s.getId());
-                            if (stream == null) {
-                                stream = new JsonPlatformStream();
-                                stream.setId(s.getId());
-                                platform.addStream(stream);
+                        }
+                    }
+                }
+
+                if (archivedPlatformCatalog != null) {
+                    for (Platform p : archivedPlatformCatalog.getPlatforms()) {
+                        for (PlatformStream s : p.getStreams()) {
+                            for (PlatformRelease r : s.getReleases()) {
+                                if (r.getQuarkusCoreVersion() == null) {
+                                    throw new IllegalStateException(
+                                            "Quarkus version has not be configured for platform release "
+                                                    + p.getPlatformKey() + ":" + s.getId() + ":" + r.getVersion());
+                                }
+                                final JsonPlatformCatalog c = platformsByQuarkusVersion.computeIfAbsent(
+                                        r.getQuarkusCoreVersion(),
+                                        v -> new JsonPlatformCatalog());
+                                JsonPlatform platform = (JsonPlatform) c.getPlatform(p.getPlatformKey());
+                                if (platform == null) {
+                                    platform = new JsonPlatform();
+                                    platform.setPlatformKey(p.getPlatformKey());
+                                    c.addPlatform(platform);
+                                }
+                                JsonPlatformStream stream = (JsonPlatformStream) platform.getStream(s.getId());
+                                if (stream == null) {
+                                    stream = new JsonPlatformStream();
+                                    stream.setId(s.getId());
+                                    platform.addStream(stream);
+                                }
+                                stream.addRelease(r);
                             }
-                            stream.addRelease(r);
                         }
                     }
                 }
+
                 for (Map.Entry entry : platformsByQuarkusVersion.entrySet()) {
                     persistPlatformCatalog(entry.getValue(), platformsDir.resolve(entry.getKey()));
                 }
@@ -339,6 +375,33 @@ public TestPlatformCatalogReleaseBuilder newRelease(String version) {
             return new TestPlatformCatalogReleaseBuilder(this, release);
         }
 
+        public TestPlatformCatalogReleaseBuilder newArchivedRelease(String version) {
+            final JsonPlatformRelease release = new JsonPlatformRelease();
+            release.setVersion(JsonPlatformReleaseVersion.fromString(version));
+
+            if (platform.registry.archivedPlatformCatalog == null) {
+                platform.registry.archivedPlatformCatalog = new JsonPlatformCatalog();
+            }
+
+            JsonPlatform archivedPlatform = (JsonPlatform) platform.registry.archivedPlatformCatalog
+                    .getPlatform(platform.platform.getPlatformKey());
+            if (archivedPlatform == null) {
+                archivedPlatform = new JsonPlatform();
+                archivedPlatform.setPlatformKey(platform.platform.getPlatformKey());
+                platform.registry.archivedPlatformCatalog.addPlatform(archivedPlatform);
+            }
+
+            JsonPlatformStream archivedStream = (JsonPlatformStream) archivedPlatform.getStream(stream.getId());
+            if (archivedStream == null) {
+                archivedStream = new JsonPlatformStream();
+                archivedStream.setId(stream.getId());
+                archivedPlatform.addStream(archivedStream);
+            }
+
+            archivedStream.addRelease(release);
+            return new TestPlatformCatalogReleaseBuilder(this, release);
+        }
+
         public TestPlatformCatalogPlatformBuilder platform() {
             return platform;
         }
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java
index 8003a183e4e067..79b6c2a0f30811 100644
--- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientFactory.java
@@ -1,5 +1,6 @@
 package io.quarkus.devtools.testing.registry.client;
 
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.registry.RegistryResolutionException;
 import io.quarkus.registry.client.RegistryClient;
 import io.quarkus.registry.client.RegistryClientFactory;
@@ -11,7 +12,13 @@ public class TestRegistryClientFactory implements RegistryClientFactory {
     private static TestRegistryClientFactory instance;
 
     public static TestRegistryClientFactory getInstance(RegistryClientEnvironment env) {
-        return instance == null ? instance = new TestRegistryClientFactory(env) : instance;
+        if (instance != null) {
+            return instance;
+        }
+        if (Thread.currentThread().getContextClassLoader() instanceof QuarkusClassLoader) {
+            ((QuarkusClassLoader) Thread.currentThread().getContextClassLoader()).addCloseTask(() -> instance = null);
+        }
+        return instance = new TestRegistryClientFactory(env);
     }
 
     private final RegistryClientEnvironment env;
@@ -24,4 +31,8 @@ private TestRegistryClientFactory(RegistryClientEnvironment env) {
     public RegistryClient buildRegistryClient(RegistryConfig config) throws RegistryResolutionException {
         return new TestRegistryClient(env, config);
     }
+
+    public static void reset() {
+        instance = null;
+    }
 }
diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java
index d38ae9eb041363..59c58b2007a9dd 100644
--- a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java
+++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/MultiplePlatformBomsTestBase.java
@@ -13,6 +13,8 @@
 import io.quarkus.devtools.project.QuarkusProjectHelper;
 import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder;
 import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.RegistryResolutionException;
+import io.quarkus.registry.catalog.PlatformStreamCoords;
 import io.quarkus.registry.config.RegistriesConfigLocator;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -89,7 +91,7 @@ protected QuarkusCommandOutcome addExtensions(Path projectDir, List exte
 
     protected QuarkusCommandOutcome createProject(Path projectDir, List extensions)
             throws Exception {
-        return createProject(projectDir, null, extensions);
+        return createProject(projectDir, (String) null, extensions);
     }
 
     protected QuarkusCommandOutcome createProject(Path projectDir, String quarkusVersion, List extensions)
@@ -103,6 +105,17 @@ protected QuarkusCommandOutcome createProject(Path projectDir, String quarkusVer
                         .execute();
     }
 
+    protected QuarkusCommandOutcome createProject(Path projectDir, PlatformStreamCoords stream, List extensions)
+            throws Exception {
+        return new CreateProject(
+                getQuarkusProject(projectDir, stream))
+                        .groupId("org.acme")
+                        .artifactId("acme-app")
+                        .version("0.0.1-SNAPSHOT")
+                        .extensions(new HashSet<>(extensions))
+                        .execute();
+    }
+
     protected List toPlatformExtensionCoords(String... artifactIds) {
         return toPlatformExtensionCoords(Arrays.asList(artifactIds));
     }
@@ -171,6 +184,12 @@ protected QuarkusProject getQuarkusProject(Path projectDir, String quarkusVersio
         return QuarkusProjectHelper.getProject(projectDir, BuildTool.MAVEN, quarkusVersion);
     }
 
+    protected QuarkusProject getQuarkusProject(Path projectDir, PlatformStreamCoords stream)
+            throws RegistryResolutionException {
+        return QuarkusProjectHelper.getProject(projectDir,
+                QuarkusProjectHelper.getCatalogResolver().resolveExtensionCatalog(stream), BuildTool.MAVEN);
+    }
+
     static Path newProjectDir(String name) {
         Path projectDir = getProjectDir(name);
         if (Files.exists(projectDir)) {
diff --git a/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java
new file mode 100644
index 00000000000000..289b13db421308
--- /dev/null
+++ b/independent-projects/tools/devtools-testing/src/test/java/io/quarkus/devtools/project/create/QuarkusPlatformReferencingArchivedUpstreamVersionTest.java
@@ -0,0 +1,162 @@
+package io.quarkus.devtools.project.create;
+
+import io.quarkus.devtools.testing.registry.client.TestRegistryClientBuilder;
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.PlatformStreamCoords;
+import java.nio.file.Path;
+import java.util.Arrays;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class QuarkusPlatformReferencingArchivedUpstreamVersionTest extends MultiplePlatformBomsTestBase {
+
+    private static final String DOWNSTREAM_PLATFORM_KEY = "io.downstream.platform";
+    private static final String UPSTREAM_PLATFORM_KEY = "io.upstream.platform";
+
+    @BeforeAll
+    public static void setup() throws Exception {
+        TestRegistryClientBuilder.newInstance()
+                //.debug()
+                .baseDir(configDir())
+                // registry
+                .newRegistry("downstream.registry.test")
+                .recognizedQuarkusVersions("*-downstream")
+                // platform key
+                .newPlatform(DOWNSTREAM_PLATFORM_KEY)
+                // 2.0 STREAM
+                .newStream("2.0")
+                // 2.0.4 release
+                .newRelease("2.0.4-downstream")
+                .quarkusVersion("2.2.2-downstream")
+                .upstreamQuarkusVersion("2.2.2")
+                // default bom including quarkus-core + essential metadata
+                .addCoreMember()
+                // foo platform member
+                .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "2.0.4-downstream").release().stream().platform()
+                .newStream("1.0")
+                // 1.0.4 release
+                .newRelease("1.0.4-downstream")
+                .quarkusVersion("1.1.1-downstream")
+                .upstreamQuarkusVersion("1.1.1")
+                // default bom including quarkus-core + essential metadata
+                .addCoreMember()
+                // foo platform member
+                .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "1.0.4-downstream").release()
+                .newMember("acme-e-bom").addExtension("io.acme", "ext-e", "1.0.4-downstream").release()
+                .stream().platform().registry()
+                .newNonPlatformCatalog("1.1.1-downstream").addExtension("io.acme", "ext-d", "4.0-downstream").registry()
+                .clientBuilder()
+                .newRegistry("upstream.registry.test")
+                // platform key
+                .newPlatform(UPSTREAM_PLATFORM_KEY)
+                // 2.0 STREAM
+                .newStream("2.0")
+                // 2.0.5 release
+                .newRelease("2.0.5")
+                .quarkusVersion("2.2.5")
+                // default bom including quarkus-core + essential metadata
+                .addCoreMember()
+                .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "2.0.5").release()
+                .newMember("acme-e-bom").addExtension("io.acme", "ext-e", "2.0.5").release()
+                .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "2.0.5").release().stream()
+                // 2.0.4 release
+                .newArchivedRelease("2.0.4")
+                .quarkusVersion("2.2.2")
+                // default bom including quarkus-core + essential metadata
+                .addCoreMember()
+                .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "2.0.4").release()
+                .newMember("acme-e-bom").addExtension("io.acme", "ext-e", "2.0.4").release()
+                .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "2.0.4").release().stream().platform()
+                // 1.0 STREAM
+                .newStream("1.0")
+                .newRelease("1.0.5")
+                .quarkusVersion("1.1.5")
+                // default bom including quarkus-core + essential metadata
+                .addCoreMember()
+                .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "1.0.5").addExtension("io.acme", "ext-e", "1.0.5")
+                .release()
+                .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "1.0.5").release()
+                .stream()
+                .newArchivedRelease("1.0.4")
+                .quarkusVersion("1.1.1")
+                // default bom including quarkus-core + essential metadata
+                .addCoreMember()
+                .newMember("acme-foo-bom").addExtension("io.acme", "ext-a", "1.0.4").addExtension("io.acme", "ext-e", "1.0.4")
+                .release()
+                .newMember("acme-bar-bom").addExtension("io.acme", "ext-b", "1.0.4").release()
+                .stream().platform().registry()
+                .newNonPlatformCatalog("2.2.2").addExtension("io.acme", "ext-c", "5.1").addExtension("io.acme", "ext-d", "6.0")
+                .registry()
+                .clientBuilder()
+                .build();
+
+        enableRegistryClient();
+    }
+
+    protected String getMainPlatformKey() {
+        return DOWNSTREAM_PLATFORM_KEY;
+    }
+
+    @Test
+    public void addExtensionsFromAlreadyImportedPlatform() throws Exception {
+        final Path projectDir = newProjectDir("downstream-upstream-platform");
+        createProject(projectDir, Arrays.asList("ext-a"));
+
+        assertModel(projectDir,
+                toPlatformBomCoords("acme-foo-bom"),
+                Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null)),
+                "2.0.4-downstream");
+
+        addExtensions(projectDir, Arrays.asList("ext-b", "ext-c", "ext-d", "ext-e"));
+        assertModel(projectDir,
+                Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"),
+                        new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "2.0.4"),
+                        new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-e-bom", "pom", "2.0.4")),
+                Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null),
+                        new ArtifactCoords("io.acme", "ext-b", null),
+                        new ArtifactCoords("io.acme", "ext-e", null),
+                        new ArtifactCoords("io.acme", "ext-c", "jar", "5.1"),
+                        new ArtifactCoords("io.acme", "ext-d", "jar", "6.0")),
+                "2.0.4-downstream");
+    }
+
+    @Test
+    public void createWithExtensionsFromDifferentPlatforms() throws Exception {
+        final Path projectDir = newProjectDir("create-downstream-upstream-platform");
+        createProject(projectDir, Arrays.asList("ext-a", "ext-b"));
+
+        assertModel(projectDir,
+                Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"),
+                        new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "2.0.4")),
+                Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), new ArtifactCoords("io.acme", "ext-b", null)),
+                "2.0.4-downstream");
+    }
+
+    @Test
+    public void createPreferringOlderStreamToNewerStreamCoveringLessExtensions() throws Exception {
+        final Path projectDir = newProjectDir("create-downstream-upstream-platform");
+        createProject(projectDir, Arrays.asList("ext-a", "ext-b", "ext-e"));
+
+        assertModel(projectDir,
+                Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"), platformMemberBomCoords("acme-e-bom"),
+                        new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "1.0.4")),
+                Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), new ArtifactCoords("io.acme", "ext-b", null),
+                        new ArtifactCoords("io.acme", "ext-e", null)),
+                "1.0.4-downstream");
+    }
+
+    @Test
+    public void createUsingStream2_0() throws Exception {
+        final Path projectDir = newProjectDir("created-using-downstream-stream");
+        createProject(projectDir, new PlatformStreamCoords(DOWNSTREAM_PLATFORM_KEY, "2.0"),
+                Arrays.asList("ext-a", "ext-b", "ext-e"));
+
+        assertModel(projectDir,
+                Arrays.asList(mainPlatformBom(), platformMemberBomCoords("acme-foo-bom"),
+                        new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-e-bom", "pom", "2.0.4"),
+                        new ArtifactCoords(UPSTREAM_PLATFORM_KEY, "acme-bar-bom", "pom", "2.0.4")),
+                Arrays.asList(new ArtifactCoords("io.acme", "ext-a", null), new ArtifactCoords("io.acme", "ext-b", null),
+                        new ArtifactCoords("io.acme", "ext-e", null)),
+                "2.0.4-downstream");
+    }
+}
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index 5b5fc826e20ef2..69b9bf3c9181ff 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -54,7 +54,7 @@
         18
         2.11.0
         1.6.0
-        1.1.1
+        1.2.0
     
     
         artifact-api
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java
index 3d2059862f1467..ec04881f12ed5f 100644
--- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/ExtensionCatalogResolver.java
@@ -4,12 +4,12 @@
 import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver;
 import io.quarkus.devtools.messagewriter.MessageWriter;
 import io.quarkus.maven.ArtifactCoords;
-import io.quarkus.maven.StreamCoords;
 import io.quarkus.registry.catalog.ExtensionCatalog;
 import io.quarkus.registry.catalog.Platform;
 import io.quarkus.registry.catalog.PlatformCatalog;
 import io.quarkus.registry.catalog.PlatformRelease;
 import io.quarkus.registry.catalog.PlatformStream;
+import io.quarkus.registry.catalog.PlatformStreamCoords;
 import io.quarkus.registry.catalog.json.JsonCatalogMerger;
 import io.quarkus.registry.catalog.json.JsonExtensionCatalog;
 import io.quarkus.registry.catalog.json.JsonPlatform;
@@ -291,6 +291,15 @@ public PlatformCatalog resolvePlatformCatalog(String quarkusVersion) throws Regi
         return result;
     }
 
+    private void collectPlatforms(PlatformCatalog catalog, List collectedPlatforms,
+            Set collectedPlatformKeys) {
+        for (Platform p : catalog.getPlatforms()) {
+            if (collectedPlatformKeys.add(p.getPlatformKey())) {
+                collectedPlatforms.add(p);
+            }
+        }
+    }
+
     public PlatformCatalog resolvePlatformCatalogFromRegistry(String registryId) throws RegistryResolutionException {
         return registries.get(getRegistryIndex(registryId)).resolvePlatformCatalog();
     }
@@ -301,15 +310,6 @@ public PlatformCatalog resolvePlatformCatalogFromRegistry(String registryId, Str
                 : registries.get(getRegistryIndex(registryId)).resolvePlatformCatalog(quarkusVersion);
     }
 
-    private void collectPlatforms(PlatformCatalog catalog, List collectedPlatforms,
-            Set collectedPlatformKeys) {
-        for (Platform p : catalog.getPlatforms()) {
-            if (collectedPlatformKeys.add(p.getPlatformKey())) {
-                collectedPlatforms.add(p);
-            }
-        }
-    }
-
     private class ExtensionCatalogBuilder {
         private final List catalogs = new ArrayList<>();
         final Map> registriesByQuarkusCore = new HashMap<>();
@@ -320,6 +320,12 @@ void addCatalog(ExtensionCatalog c) {
             catalogs.add(c);
         }
 
+        void addUpstreamQuarkusVersion(String quarkusVersion) {
+            if (!upstreamQuarkusVersions.contains(quarkusVersion)) {
+                upstreamQuarkusVersions.add(quarkusVersion);
+            }
+        }
+
         List getRegistriesForQuarkusCore(String quarkusVersion) {
             return registriesByQuarkusCore.computeIfAbsent(quarkusVersion, v -> getRegistriesForQuarkusVersion(v));
         }
@@ -364,41 +370,71 @@ public ExtensionCatalog resolveExtensionCatalog() throws RegistryResolutionExcep
         final ExtensionCatalogBuilder catalogBuilder = new ExtensionCatalogBuilder();
 
         for (int registryIndex = 0; registryIndex < registries.size(); ++registryIndex) {
-            RegistryExtensionResolver registry = registries.get(registryIndex);
-            final PlatformCatalog pc = registry.resolvePlatformCatalog();
+            collectPlatformExtensions(catalogBuilder, registryIndex);
+        }
+
+        return catalogBuilder.build();
+    }
+
+    private void collectPlatformExtensions(final ExtensionCatalogBuilder catalogBuilder, int registryIndex)
+            throws RegistryResolutionException {
+        final RegistryExtensionResolver registry = registries.get(registryIndex);
+
+        final List downstreamPreferences = new ArrayList<>(catalogBuilder.upstreamQuarkusVersions.size());
+        for (String quarkusVersion : catalogBuilder.upstreamQuarkusVersions) {
+            if (!registry.isAcceptsQuarkusVersionQueries(quarkusVersion)) {
+                continue;
+            }
+            final PlatformCatalog pc = registry.resolvePlatformCatalog(quarkusVersion);
             if (pc == null) {
                 continue;
             }
-            int platformIndex = 0;
-            for (Platform platform : pc.getPlatforms()) {
-                platformIndex++;
-                for (PlatformStream stream : platform.getStreams()) {
-                    int releaseIndex = 0;
-                    for (PlatformRelease release : stream.getReleases()) {
-                        releaseIndex++;
-                        final int compatiblityCode = catalogBuilder
-                                .getCompatibilityCode(release.getQuarkusCoreVersion(),
-                                        release.getUpstreamQuarkusCoreVersion());
-
-                        int memberIndex = 0;
-                        for (ArtifactCoords bom : release.getMemberBoms()) {
-                            memberIndex++;
-                            final ExtensionCatalog ec = registry.resolvePlatformExtensions(bom);
-                            if (ec != null) {
-                                final OriginPreference originPreference = new OriginPreference(registryIndex, platformIndex,
-                                        releaseIndex, memberIndex, compatiblityCode);
-                                addOriginPreference(ec, originPreference);
-                                catalogBuilder.addCatalog(ec);
-                            } else {
-                                log.warn("Failed to resolve extension catalog for %s from registry %s", bom, registry.getId());
-                            }
+            downstreamPreferences.add(pc);
+        }
+
+        PlatformCatalog pc = registry.resolvePlatformCatalog();
+        if (pc == null && downstreamPreferences.isEmpty()) {
+            return;
+        }
+        if (!downstreamPreferences.isEmpty()) {
+            downstreamPreferences.add(pc);
+            pc = JsonCatalogMerger.mergePlatformCatalogs(downstreamPreferences);
+        }
+
+        int platformIndex = 0;
+        for (Platform platform : pc.getPlatforms()) {
+            platformIndex++;
+            for (PlatformStream stream : platform.getStreams()) {
+                int releaseIndex = 0;
+                for (PlatformRelease release : stream.getReleases()) {
+                    releaseIndex++;
+                    final String quarkusVersion = release.getQuarkusCoreVersion();
+                    final int compatiblityCode = catalogBuilder.getCompatibilityCode(quarkusVersion,
+                            release.getUpstreamQuarkusCoreVersion());
+
+                    if (!registry.isExclusiveProviderOf(quarkusVersion)) {
+                        catalogBuilder.addUpstreamQuarkusVersion(quarkusVersion);
+                    }
+                    if (release.getUpstreamQuarkusCoreVersion() != null) {
+                        catalogBuilder.addUpstreamQuarkusVersion(release.getUpstreamQuarkusCoreVersion());
+                    }
+
+                    int memberIndex = 0;
+                    for (ArtifactCoords bom : release.getMemberBoms()) {
+                        memberIndex++;
+                        final ExtensionCatalog ec = registry.resolvePlatformExtensions(bom);
+                        if (ec != null) {
+                            final OriginPreference originPreference = new OriginPreference(registryIndex, platformIndex,
+                                    releaseIndex, memberIndex, compatiblityCode);
+                            addOriginPreference(ec, originPreference);
+                            catalogBuilder.addCatalog(ec);
+                        } else {
+                            log.warn("Failed to resolve extension catalog for %s from registry %s", bom, registry.getId());
                         }
                     }
                 }
             }
         }
-
-        return catalogBuilder.build();
     }
 
     private void addOriginPreference(final ExtensionCatalog ec, OriginPreference originPreference) {
@@ -426,25 +462,22 @@ public ExtensionCatalog resolveExtensionCatalog(String quarkusCoreVersion) throw
     private ExtensionCatalog resolveExtensionCatalog(String quarkusCoreVersion,
             final ExtensionCatalogBuilder catalogBuilder, Set preferredPlatforms)
             throws RegistryResolutionException {
-        collectPlatforms(quarkusCoreVersion, catalogBuilder, preferredPlatforms);
+        collectPlatformExtensions(quarkusCoreVersion, catalogBuilder, preferredPlatforms);
         int i = 0;
         while (i < catalogBuilder.upstreamQuarkusVersions.size()) {
-            collectPlatforms(catalogBuilder.upstreamQuarkusVersions.get(i++), catalogBuilder, preferredPlatforms);
+            collectPlatformExtensions(catalogBuilder.upstreamQuarkusVersions.get(i++), catalogBuilder, preferredPlatforms);
         }
         return catalogBuilder.build();
     }
 
-    public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throws RegistryResolutionException {
+    public ExtensionCatalog resolveExtensionCatalog(PlatformStreamCoords streamCoords) throws RegistryResolutionException {
 
         ensureRegistriesConfigured();
 
-        final ExtensionCatalogBuilder catalogBuilder = new ExtensionCatalogBuilder();
-
         final String platformKey = streamCoords.getPlatformKey();
         final String streamId = streamCoords.getStreamId();
 
         PlatformStream stream = null;
-        RegistryExtensionResolver registry = null;
         int registryIndex = 0;
         while (registryIndex < registries.size()) {
             final RegistryExtensionResolver qer = registries.get(registryIndex++);
@@ -456,7 +489,6 @@ public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throw
                 for (Platform p : platforms.getPlatforms()) {
                     stream = p.getStream(streamId);
                     if (stream != null) {
-                        registry = qer;
                         break;
                     }
                 }
@@ -466,7 +498,6 @@ public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throw
                     continue;
                 }
                 stream = platform.getStream(streamId);
-                registry = qer;
             }
             break;
         }
@@ -510,24 +541,12 @@ public ExtensionCatalog resolveExtensionCatalog(StreamCoords streamCoords) throw
             throw new RegistryResolutionException(buf.toString());
         }
 
-        int releaseIndex = 0;
+        final List catalogs = new ArrayList<>();
         for (PlatformRelease release : stream.getReleases()) {
-            final int compatiblityCode = catalogBuilder
-                    .getCompatibilityCode(release.getQuarkusCoreVersion(),
-                            release.getUpstreamQuarkusCoreVersion());
-            ++releaseIndex;
-            int memberIndex = 0;
-            for (ArtifactCoords bom : release.getMemberBoms()) {
-                final ExtensionCatalog ec = registry.resolvePlatformExtensions(bom);
-                final OriginPreference originPreference = new OriginPreference(registryIndex, 1,
-                        releaseIndex, ++memberIndex, compatiblityCode);
-                addOriginPreference(ec, originPreference);
-
-                catalogBuilder.addCatalog(ec);
-            }
+            catalogs.add(resolveExtensionCatalog(release.getMemberBoms()));
         }
 
-        return catalogBuilder.build();
+        return JsonCatalogMerger.merge(catalogs);
     }
 
     @SuppressWarnings("unchecked")
@@ -623,7 +642,7 @@ public ExtensionCatalog resolveExtensionCatalog(Collection prefe
                             release.setMemberBoms(coords);
                         }
 
-                        collectPlatforms(quarkusVersion, catalogBuilder, registry, platformIndex,
+                        collectPlatformExtensions(quarkusVersion, catalogBuilder, registry, platformIndex,
                                 p);
                         continue;
                     }
@@ -688,8 +707,8 @@ private int getRegistryIndex(String registryId) {
         throw new IllegalStateException(buf.toString());
     }
 
-    private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder,
-            Set preferredPlatforms)
+    private void collectPlatformExtensions(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder,
+            Set processedPlatforms)
             throws RegistryResolutionException {
         final List quarkusVersionRegistries = catalogBuilder
                 .getRegistriesForQuarkusCore(quarkusCoreVersion);
@@ -703,18 +722,18 @@ private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder
             if (platforms.isEmpty()) {
                 continue;
             }
-            int platformIndex = preferredPlatforms.size();
+            int platformIndex = processedPlatforms.size();
             for (Platform p : platforms) {
-                if (preferredPlatforms.contains(p.getPlatformKey())) {
+                if (processedPlatforms.contains(p.getPlatformKey())) {
                     continue;
                 }
                 ++platformIndex;
-                collectPlatforms(quarkusCoreVersion, catalogBuilder, registry, platformIndex, p);
+                collectPlatformExtensions(quarkusCoreVersion, catalogBuilder, registry, platformIndex, p);
             }
         }
     }
 
-    private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder,
+    private void collectPlatformExtensions(String quarkusCoreVersion, ExtensionCatalogBuilder catalogBuilder,
             RegistryExtensionResolver registry, int platformIndex,
             Platform p) throws RegistryResolutionException {
         for (PlatformStream s : p.getStreams()) {
@@ -738,9 +757,8 @@ private void collectPlatforms(String quarkusCoreVersion, ExtensionCatalogBuilder
                 }
 
                 final String upstreamQuarkusVersion = r.getUpstreamQuarkusCoreVersion();
-                if (upstreamQuarkusVersion != null
-                        && !catalogBuilder.upstreamQuarkusVersions.contains(upstreamQuarkusVersion)) {
-                    catalogBuilder.upstreamQuarkusVersions.add(upstreamQuarkusVersion);
+                if (upstreamQuarkusVersion != null) {
+                    catalogBuilder.addUpstreamQuarkusVersion(upstreamQuarkusVersion);
                 }
             }
         }
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java
index 72eda74c8fcd98..0f203f1a5dc78b 100644
--- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/RegistryExtensionResolver.java
@@ -56,6 +56,14 @@ int checkQuarkusVersion(String quarkusVersion) {
                 : VERSION_RECOGNIZED;
     }
 
+    boolean isExclusiveProviderOf(String quarkusVersion) {
+        return checkQuarkusVersion(quarkusVersion) == VERSION_EXCLUSIVE_PROVIDER;
+    }
+
+    boolean isAcceptsQuarkusVersionQueries(String quarkusVersion) {
+        return checkQuarkusVersion(quarkusVersion) >= 0;
+    }
+
     int checkPlatform(ArtifactCoords platform) {
         // TODO this should be allowed to check the full coordinates
         return checkQuarkusVersion(platform.getVersion());
diff --git a/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java
similarity index 71%
rename from independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java
rename to independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java
index 147ce225506010..8c8db274dbcca0 100644
--- a/independent-projects/tools/artifact-api/src/main/java/io/quarkus/maven/StreamCoords.java
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/PlatformStreamCoords.java
@@ -1,17 +1,17 @@
-package io.quarkus.maven;
+package io.quarkus.registry.catalog;
 
-public class StreamCoords {
+public class PlatformStreamCoords {
     final String platformKey;
     final String streamId;
 
-    public static StreamCoords fromString(String stream) {
+    public static PlatformStreamCoords fromString(String stream) {
         final int colon = stream.indexOf(':');
         String platformKey = colon <= 0 ? null : stream.substring(0, colon);
         String streamId = colon < 0 ? stream : stream.substring(colon + 1);
-        return new StreamCoords(platformKey, streamId);
+        return new PlatformStreamCoords(platformKey, streamId);
     }
 
-    public StreamCoords(String platformKey, String streamId) {
+    public PlatformStreamCoords(String platformKey, String streamId) {
         this.platformKey = platformKey;
         this.streamId = streamId;
     }
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java
index 4f7b79ed2695b3..621565acb161b2 100644
--- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/catalog/json/JsonCatalogMerger.java
@@ -5,6 +5,10 @@
 import io.quarkus.registry.catalog.Extension;
 import io.quarkus.registry.catalog.ExtensionCatalog;
 import io.quarkus.registry.catalog.ExtensionOrigin;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import io.quarkus.registry.catalog.PlatformRelease;
+import io.quarkus.registry.catalog.PlatformStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -72,6 +76,48 @@ public static ExtensionCatalog merge(List catalogs) {
         return combined;
     }
 
+    public static PlatformCatalog mergePlatformCatalogs(List catalogs) {
+        if (catalogs.isEmpty()) {
+            throw new IllegalArgumentException("No catalogs provided");
+        }
+        if (catalogs.size() == 1) {
+            return catalogs.get(0);
+        }
+        final JsonPlatformCatalog merged = new JsonPlatformCatalog();
+        final Map platformMap = new HashMap<>();
+        for (PlatformCatalog c : catalogs) {
+            for (Platform p : c.getPlatforms()) {
+                final JsonPlatform mergedPlatform = platformMap.computeIfAbsent(p.getPlatformKey(), k -> {
+                    final JsonPlatform pl = new JsonPlatform();
+                    pl.setPlatformKey(p.getPlatformKey());
+                    merged.addPlatform(pl);
+                    return pl;
+                });
+                for (PlatformStream s : p.getStreams()) {
+                    JsonPlatformStream mergedStream = (JsonPlatformStream) mergedPlatform.getStream(s.getId());
+                    if (mergedStream == null) {
+                        mergedStream = new JsonPlatformStream();
+                        mergedStream.setId(s.getId());
+                        mergedPlatform.addStream(mergedStream);
+                    }
+                    for (PlatformRelease r : s.getReleases()) {
+                        final PlatformRelease release = mergedStream.getRelease(r.getVersion());
+                        if (release == null) {
+                            mergedStream.addRelease(r);
+                        }
+                    }
+                    final Map mergedStreamMetadata = mergedStream.getMetadata();
+                    s.getMetadata().entrySet()
+                            .forEach(entry -> mergedStreamMetadata.putIfAbsent(entry.getKey(), entry.getValue()));
+                }
+                p.getMetadata().entrySet()
+                        .forEach(entry -> mergedPlatform.getMetadata().putIfAbsent(entry.getKey(), entry.getValue()));
+            }
+            c.getMetadata().entrySet().forEach(entry -> merged.getMetadata().putIfAbsent(entry.getKey(), entry.getValue()));
+        }
+        return merged;
+    }
+
     private static List detectRoots(List catalogs) {
         final Set allDerivedFrom = new HashSet<>(catalogs.size());
         for (ExtensionCatalog catalog : catalogs) {
diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java
index 7edb924e28bdd2..7ebca7f054610c 100644
--- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java
+++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/client/maven/MavenRegistryClientFactory.java
@@ -90,7 +90,7 @@ public RegistryClient buildRegistryClient(RegistryConfig config) throws Registry
                 if (areMatching(registryRepos, aggregatedRepos)) {
                     // the original and aggregated repos are matching, meaning no mirrors/proxies have been applied
                     // there is nothing to fallback to
-                    throw new RegistryResolutionException(getDescriptorResolutionFailureMessage(config, resolver, e));
+                    throw new RegistryResolutionException(getDescriptorResolutionFailureMessage(config, resolver, e), e);
                 }
                 // if the mirror and proxies in the user settings were configured w/o taking the extension registry into account
                 // we will warn the user and try the original registry repos as a fallback
diff --git a/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java
new file mode 100644
index 00000000000000..0026ad35ba9365
--- /dev/null
+++ b/independent-projects/tools/registry-client/src/test/java/io/quarkus/registry/catalog/json/JsonCatalogMergerTest.java
@@ -0,0 +1,99 @@
+package io.quarkus.registry.catalog.json;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.quarkus.maven.ArtifactCoords;
+import io.quarkus.registry.catalog.Platform;
+import io.quarkus.registry.catalog.PlatformCatalog;
+import io.quarkus.registry.catalog.PlatformRelease;
+import io.quarkus.registry.catalog.PlatformStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+public class JsonCatalogMergerTest {
+
+    @Test
+    void testMergePlatformCatalogs() throws Exception {
+
+        final List catalogs = new ArrayList<>();
+
+        JsonPlatformCatalog c = new JsonPlatformCatalog();
+        catalogs.add(c);
+        JsonPlatform p = new JsonPlatform();
+        c.addPlatform(p);
+        p.setPlatformKey("platform");
+        JsonPlatformStream s = new JsonPlatformStream();
+        s.setId("2.0");
+        p.addStream(s);
+        JsonPlatformRelease r = new JsonPlatformRelease();
+        r.setQuarkusCoreVersion("2.0.0");
+        r.setVersion(JsonPlatformReleaseVersion.fromString("2.2.2"));
+        r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:2.2.2")));
+        s.addRelease(r);
+
+        s = new JsonPlatformStream();
+        s.setId("1.0");
+        p.addStream(s);
+        r = new JsonPlatformRelease();
+        r.setQuarkusCoreVersion("1.0.1");
+        r.setVersion(JsonPlatformReleaseVersion.fromString("1.1.2"));
+        r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:1.1.2")));
+        s.addRelease(r);
+
+        c = new JsonPlatformCatalog();
+        catalogs.add(c);
+        p = new JsonPlatform();
+        c.addPlatform(p);
+        p.setPlatformKey("platform");
+        s = new JsonPlatformStream();
+        s.setId("2.0");
+        p.addStream(s);
+        r = new JsonPlatformRelease();
+        r.setQuarkusCoreVersion("2.0.1");
+        r.setVersion(JsonPlatformReleaseVersion.fromString("2.2.3"));
+        r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:2.2.3")));
+        s.addRelease(r);
+
+        s = new JsonPlatformStream();
+        s.setId("1.0");
+        p.addStream(s);
+        r = new JsonPlatformRelease();
+        r.setQuarkusCoreVersion("1.0.0");
+        r.setVersion(JsonPlatformReleaseVersion.fromString("1.1.1"));
+        r.setMemberBoms(Collections.singletonList(ArtifactCoords.fromString("org.acme:acme-quarkus-bom::pom:1.1.1")));
+        s.addRelease(r);
+
+        final PlatformCatalog merged = JsonCatalogMerger.mergePlatformCatalogs(catalogs);
+        Collection platforms = merged.getPlatforms();
+        assertThat(platforms.size()).isEqualTo(1);
+        Platform platform = platforms.iterator().next();
+        assertThat(platform.getPlatformKey()).isEqualTo("platform");
+        assertThat(platform.getStreams().size()).isEqualTo(2);
+        Iterator streams = platform.getStreams().iterator();
+        PlatformStream stream = streams.next();
+        assertThat(stream.getId()).isEqualTo("2.0");
+        assertThat(stream.getReleases().size()).isEqualTo(2);
+        Iterator releases = stream.getReleases().iterator();
+        PlatformRelease release = releases.next();
+        assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("2.2.2"));
+        assertThat(release.getQuarkusCoreVersion()).isEqualTo("2.0.0");
+        release = releases.next();
+        assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("2.2.3"));
+        assertThat(release.getQuarkusCoreVersion()).isEqualTo("2.0.1");
+
+        stream = streams.next();
+        assertThat(stream.getId()).isEqualTo("1.0");
+        assertThat(stream.getReleases().size()).isEqualTo(2);
+        releases = stream.getReleases().iterator();
+        release = releases.next();
+        assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("1.1.2"));
+        assertThat(release.getQuarkusCoreVersion()).isEqualTo("1.0.1");
+        release = releases.next();
+        assertThat(release.getVersion()).isEqualTo(JsonPlatformReleaseVersion.fromString("1.1.1"));
+        assertThat(release.getQuarkusCoreVersion()).isEqualTo("1.0.0");
+    }
+}
diff --git a/integration-tests/amazon-lambda-http-resteasy/pom.xml b/integration-tests/amazon-lambda-http-resteasy/pom.xml
index 1b1b102f9b5bf8..062c285f3afe37 100644
--- a/integration-tests/amazon-lambda-http-resteasy/pom.xml
+++ b/integration-tests/amazon-lambda-http-resteasy/pom.xml
@@ -28,6 +28,7 @@
             quarkus-junit5
             test
         
+        
         
             io.quarkus
             quarkus-test-amazon-lambda
diff --git a/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties b/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties
index 92b4d0d030efee..7b3ccfbd22691e 100644
--- a/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties
+++ b/integration-tests/amazon-lambda-http-resteasy/src/main/resources/application.properties
@@ -1,3 +1 @@
-quarkus.lambda.enable-polling-jvm-mode=true
 quarkus.lambda-http.enable-security=true
-quarkus.http.virtual=true
diff --git a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
index 2086d4be41fd4f..b69b2b6a3ac8d8 100644
--- a/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
+++ b/integration-tests/amazon-lambda-http-resteasy/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -17,6 +17,9 @@
 @QuarkusTest
 public class AmazonLambdaSimpleTestCase {
 
+    // TODO: This is using the old deprecated LambdaClient test API.  I am keeping it here to test backward compatibility
+    // these tests will need to be ported once LambdaClient is removed from Quarkus.
+
     @Test
     public void testCustomIDPSecurityContext() throws Exception {
         APIGatewayV2HTTPEvent request = request("/security/username");
diff --git a/integration-tests/amazon-lambda-http/pom.xml b/integration-tests/amazon-lambda-http/pom.xml
index 62ce64d02e22fe..7b8a1a74ab6ac6 100644
--- a/integration-tests/amazon-lambda-http/pom.xml
+++ b/integration-tests/amazon-lambda-http/pom.xml
@@ -45,8 +45,8 @@
             test
         
         
-            io.quarkus
-            quarkus-test-amazon-lambda
+            io.rest-assured
+            rest-assured
             test
         
 
diff --git a/integration-tests/amazon-lambda-http/src/main/resources/application.properties b/integration-tests/amazon-lambda-http/src/main/resources/application.properties
index d16f99844778da..b5ab6f51a3ef5c 100644
--- a/integration-tests/amazon-lambda-http/src/main/resources/application.properties
+++ b/integration-tests/amazon-lambda-http/src/main/resources/application.properties
@@ -1,4 +1,2 @@
-quarkus.lambda.enable-polling-jvm-mode=true
-quarkus.http.virtual=true
 quarkus.lambda-http.enable-security=true
 quarkus.swagger-ui.always-include=true
diff --git a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
index 1bf83981f24d71..6287797bf1a282 100644
--- a/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
+++ b/integration-tests/amazon-lambda-http/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -1,19 +1,22 @@
 package io.quarkus.it.amazon.lambda;
 
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+import java.util.Arrays;
 import java.util.HashMap;
 
 import javax.ws.rs.core.MediaType;
 
-import org.apache.commons.codec.binary.Base64;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
-import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
 
-import io.quarkus.amazon.lambda.test.LambdaClient;
+import io.quarkus.amazon.lambda.runtime.AmazonLambdaApi;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
@@ -21,13 +24,11 @@ public class AmazonLambdaSimpleTestCase {
 
     @Test
     public void testContext() throws Exception {
-        APIGatewayV2HTTPEvent request = new APIGatewayV2HTTPEvent();
-        request.setRawPath("/hello/context");
-        request.setRequestContext(new APIGatewayV2HTTPEvent.RequestContext());
-        request.getRequestContext().setHttp(new APIGatewayV2HTTPEvent.RequestContext.Http());
-        request.getRequestContext().getHttp().setMethod("GET");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 204);
+        given()
+                .when()
+                .get("/hello/context")
+                .then()
+                .statusCode(204);
     }
 
     @Test
@@ -37,9 +38,16 @@ public void testJaxrsCognitoJWTSecurityContext() throws Exception {
         request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT());
         request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>());
         request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "Bill");
+
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -48,9 +56,15 @@ public void testJaxrsIAMSecurityContext() throws Exception {
         request.getRequestContext().setAuthorizer(new APIGatewayV2HTTPEvent.RequestContext.Authorizer());
         request.getRequestContext().getAuthorizer().setIam(new APIGatewayV2HTTPEvent.RequestContext.IAM());
         request.getRequestContext().getAuthorizer().getIam().setUserId("Bill");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "Bill");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -59,9 +73,15 @@ public void testJaxrsCustomLambdaSecurityContext() throws Exception {
         request.getRequestContext().setAuthorizer(new APIGatewayV2HTTPEvent.RequestContext.Authorizer());
         request.getRequestContext().getAuthorizer().setLambda(new HashMap<>());
         request.getRequestContext().getAuthorizer().getLambda().put("principalId", "Bill");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "Bill");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -71,9 +91,15 @@ public void testServletCognitoJWTSecurityContext() throws Exception {
         request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT());
         request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>());
         request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "Bill");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -83,40 +109,59 @@ public void testVertxCognitoJWTSecurityContext() throws Exception {
         request.getRequestContext().getAuthorizer().setJwt(new APIGatewayV2HTTPEvent.RequestContext.Authorizer.JWT());
         request.getRequestContext().getAuthorizer().getJwt().setClaims(new HashMap<>());
         request.getRequestContext().getAuthorizer().getJwt().getClaims().put("cognito:username", "Bill");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "Bill");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
+    }
+
+    @Test
+    public void testSwaggerUi() throws Exception {
+        given()
+                .when()
+                .get("/q/swagger-ui/")
+                .then()
+                .statusCode(200)
+                .body(containsString("OpenAPI UI"));
     }
 
     @Test
     public void testGetText() throws Exception {
+        testGetTextByEvent("/vertx/hello");
+        testGetTextByEvent("/servlet/hello");
+        testGetTextByEvent("/hello");
         testGetText("/vertx/hello");
         testGetText("/servlet/hello");
         testGetText("/hello");
     }
 
-    @Test
-    public void testSwaggerUi() throws Exception {
-        // this tests the FileRegion support in the handler
-        APIGatewayV2HTTPEvent request = request("/q/swagger-ui/");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("OpenAPI UI"));
-
-    }
-
-    private String body(APIGatewayV2HTTPResponse response) {
-        if (!response.getIsBase64Encoded())
-            return response.getBody();
-        return new String(Base64.decodeBase64(response.getBody()));
+    private void testGetTextByEvent(String path) {
+        APIGatewayV2HTTPEvent request = request(path);
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("hello"))
+                .body("headers.Content-Type", containsString("text/plain"));
     }
 
     private void testGetText(String path) {
-        APIGatewayV2HTTPEvent request = request(path);
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "hello");
-        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain"));
+        given()
+                .when()
+                .get(path)
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString("text/plain"))
+                .body(equalTo("hello"));
     }
 
     private APIGatewayV2HTTPEvent request(String path) {
@@ -130,80 +175,101 @@ private APIGatewayV2HTTPEvent request(String path) {
 
     @Test
     public void test404() throws Exception {
-        APIGatewayV2HTTPEvent request = request("/nowhere");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 404);
+        given()
+                .when()
+                .get("/nowhere")
+                .then()
+                .statusCode(404);
     }
 
     @Test
     public void testPostText() throws Exception {
+        testPostTextByEvent("/hello");
+        testPostTextByEvent("/servlet/hello");
+        testPostTextByEvent("/vertx/hello");
         testPostText("/hello");
         testPostText("/servlet/hello");
         testPostText("/vertx/hello");
     }
 
-    private void testPostText(String path) {
+    private void testPostTextByEvent(String path) {
         APIGatewayV2HTTPEvent request = request(path);
         request.getRequestContext().getHttp().setMethod("POST");
         request.setHeaders(new HashMap<>());
         request.getHeaders().put("Content-Type", "text/plain");
         request.setBody("Bill");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "hello Bill");
-        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("text/plain"));
+
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("hello Bill"))
+                .body("headers.Content-Type", containsString("text/plain"));
+    }
+
+    private void testPostText(String path) {
+        given()
+                .contentType("text/plain")
+                .body("Bill")
+                .when()
+                .post(path)
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString("text/plain"))
+                .body(equalTo("hello Bill"));
     }
 
     @Test
     public void testPostBinary() throws Exception {
         byte[] bytes = { 0, 1, 2, 3 };
-        String body = Base64.encodeBase64String(bytes);
-        APIGatewayV2HTTPEvent request = request("/hello");
-        request.getRequestContext().getHttp().setMethod("POST");
-        request.setHeaders(new HashMap<>());
-        request.getHeaders().put("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
-        request.setBody(body);
-        request.setIsBase64Encoded(true);
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(out.getHeaders().get("Content-Type"),
-                MediaType.APPLICATION_OCTET_STREAM);
-        Assertions.assertTrue(out.getIsBase64Encoded());
-        byte[] rtn = Base64.decodeBase64(out.getBody());
-        Assertions.assertEquals(rtn[0], 4);
-        Assertions.assertEquals(rtn[1], 5);
-        Assertions.assertEquals(rtn[2], 6);
+        byte[] resBytes = { 4, 5, 6 };
 
+        byte[] result = given()
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .body(bytes)
+                .when()
+                .post("hello")
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString(MediaType.APPLICATION_OCTET_STREAM))
+                .extract().asByteArray();
+        Assertions.assertTrue(Arrays.equals(resBytes, result));
     }
 
     @Test
     public void testPostEmpty() throws Exception {
-        APIGatewayV2HTTPEvent request = request("/hello/empty");
-        request.getRequestContext().getHttp().setMethod("POST");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 204);
-
+        given()
+                .when()
+                .post("/hello/empty")
+                .then()
+                .statusCode(204);
     }
 
     @ParameterizedTest
     @ValueSource(strings = { "/funqy", "/funqyAsync" })
     public void testFunqy(String path) {
-        APIGatewayV2HTTPEvent request = request(path);
-        request.getRequestContext().getHttp().setMethod("POST");
-        request.setHeaders(new HashMap<>());
-        request.getHeaders().put("Content-Type", MediaType.APPLICATION_JSON);
-        request.setBody("\"Bill\"");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "\"Make it funqy Bill\"");
-        Assertions.assertTrue(out.getHeaders().get("Content-Type").startsWith("application/json"));
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body("\"Bill\"")
+                .when()
+                .post(path)
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString("application/json"))
+                .body(equalTo("\"Make it funqy Bill\""));
     }
 
     @Test
     public void testProxyRequestContext() throws Exception {
-        APIGatewayV2HTTPEvent request = request("/hello/proxyRequestContext");
-        APIGatewayV2HTTPResponse out = LambdaClient.invoke(APIGatewayV2HTTPResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 204);
+        given()
+                .when()
+                .get("/hello/proxyRequestContext")
+                .then()
+                .statusCode(204);
     }
-
 }
diff --git a/integration-tests/amazon-lambda-rest/pom.xml b/integration-tests/amazon-lambda-rest/pom.xml
index cee1cbbf85a531..8f595271add45f 100644
--- a/integration-tests/amazon-lambda-rest/pom.xml
+++ b/integration-tests/amazon-lambda-rest/pom.xml
@@ -45,8 +45,8 @@
             test
         
         
-            io.quarkus
-            quarkus-test-amazon-lambda
+            io.rest-assured
+            rest-assured
             test
         
 
diff --git a/integration-tests/amazon-lambda-rest/src/main/resources/application.properties b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties
index d16f99844778da..b5ab6f51a3ef5c 100644
--- a/integration-tests/amazon-lambda-rest/src/main/resources/application.properties
+++ b/integration-tests/amazon-lambda-rest/src/main/resources/application.properties
@@ -1,4 +1,2 @@
-quarkus.lambda.enable-polling-jvm-mode=true
-quarkus.http.virtual=true
 quarkus.lambda-http.enable-security=true
 quarkus.swagger-ui.always-include=true
diff --git a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java
index b16ceefce0751b..1b237d62159006 100644
--- a/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java
+++ b/integration-tests/amazon-lambda-rest/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaV1SimpleTestCase.java
@@ -1,5 +1,10 @@
 package io.quarkus.it.amazon.lambda;
 
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.*;
+
+import java.util.Arrays;
+
 import javax.ws.rs.core.MediaType;
 
 import org.apache.commons.codec.binary.Base64;
@@ -15,7 +20,7 @@
 import io.quarkus.amazon.lambda.http.model.AwsProxyResponse;
 import io.quarkus.amazon.lambda.http.model.CognitoAuthorizerClaims;
 import io.quarkus.amazon.lambda.http.model.Headers;
-import io.quarkus.amazon.lambda.test.LambdaClient;
+import io.quarkus.amazon.lambda.runtime.AmazonLambdaApi;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
@@ -23,11 +28,11 @@ public class AmazonLambdaV1SimpleTestCase {
 
     @Test
     public void testContext() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("GET");
-        request.setPath("/hello/context");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 204);
+        given()
+                .when()
+                .get("/hello/context")
+                .then()
+                .statusCode(204);
     }
 
     @Test
@@ -38,9 +43,16 @@ public void testJaxrsSecurityIAM() throws Exception {
         request.setRequestContext(new AwsProxyRequestContext());
         request.getRequestContext().setIdentity(new ApiGatewayRequestIdentity());
         request.getRequestContext().getIdentity().setUser("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("Bill"));
+
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -51,9 +63,15 @@ public void testServletSecurityIAM() throws Exception {
         request.setRequestContext(new AwsProxyRequestContext());
         request.getRequestContext().setIdentity(new ApiGatewayRequestIdentity());
         request.getRequestContext().getIdentity().setUser("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("Bill"));
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -65,9 +83,15 @@ public void testJaxrsCognitoSecurityContext() throws Exception {
         request.getRequestContext().setAuthorizer(new ApiGatewayAuthorizerContext());
         request.getRequestContext().getAuthorizer().setClaims(new CognitoAuthorizerClaims());
         request.getRequestContext().getAuthorizer().getClaims().setUsername("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("Bill"));
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
@@ -78,26 +102,60 @@ public void testJaxrsCustomLambdaSecurityContext() throws Exception {
         request.setRequestContext(new AwsProxyRequestContext());
         request.getRequestContext().setAuthorizer(new ApiGatewayAuthorizerContext());
         request.getRequestContext().getAuthorizer().setPrincipalId("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("Bill"));
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("Bill"));
     }
 
     @Test
     public void testGetText() throws Exception {
+        testGetTextByEvent("/vertx/hello");
+        testGetTextByEvent("/servlet/hello");
+        testGetTextByEvent("/hello");
         testGetText("/vertx/hello");
         testGetText("/servlet/hello");
         testGetText("/hello");
     }
 
+    private void testGetTextByEvent(String path) {
+        AwsProxyRequest request = request(path);
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("hello"))
+                .body("multiValueHeaders.Content-Type", hasItem(containsString("text/plain")));
+    }
+
+    private void testGetText(String path) {
+        given()
+                .when()
+                .get(path)
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString("text/plain"))
+                .body(equalTo("hello"));
+    }
+
     @Test
     public void testSwaggerUi() throws Exception {
         // this tests the FileRegion support in the handler
-        AwsProxyRequest request = request("/q/swagger-ui/");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertTrue(body(out).contains("OpenAPI UI"));
-
+        given()
+                .when()
+                .get("/q/swagger-ui/")
+                .then()
+                .statusCode(200)
+                .body(containsString("OpenAPI UI"));
     }
 
     private String body(AwsProxyResponse response) {
@@ -106,14 +164,6 @@ private String body(AwsProxyResponse response) {
         return new String(Base64.decodeBase64(response.getBody()));
     }
 
-    private void testGetText(String path) {
-        AwsProxyRequest request = request(path);
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "hello");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
-    }
-
     private AwsProxyRequest request(String path) {
         AwsProxyRequest request = new AwsProxyRequest();
         request.setHttpMethod("GET");
@@ -123,87 +173,103 @@ private AwsProxyRequest request(String path) {
 
     @Test
     public void test404() throws Exception {
-        AwsProxyRequest request = request("/nowhere");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 404);
+        given()
+                .when()
+                .get("/nowhere")
+                .then()
+                .statusCode(404);
     }
 
     @Test
     public void testPostText() throws Exception {
+        testPostTextByEvent("/hello");
+        testPostTextByEvent("/servlet/hello");
+        testPostTextByEvent("/vertx/hello");
         testPostText("/hello");
         testPostText("/servlet/hello");
         testPostText("/vertx/hello");
     }
 
-    private void testPostText(String path) {
+    private void testPostTextByEvent(String path) {
         AwsProxyRequest request = new AwsProxyRequest();
         request.setHttpMethod("POST");
         request.setMultiValueHeaders(new Headers());
         request.getMultiValueHeaders().add("Content-Type", "text/plain");
         request.setPath(path);
         request.setBody("Bill");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "hello Bill");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("text/plain"));
+
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(request)
+                .when()
+                .post(AmazonLambdaApi.API_BASE_PATH_TEST)
+                .then()
+                .statusCode(200)
+                .body("body", equalTo("hello Bill"))
+                .body("multiValueHeaders.Content-Type", hasItem(containsString("text/plain")));
+    }
+
+    private void testPostText(String path) {
+        given()
+                .contentType("text/plain")
+                .body("Bill")
+                .when()
+                .post(path)
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString("text/plain"))
+                .body(equalTo("hello Bill"));
     }
 
     @Test
     public void testPostBinary() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
         byte[] bytes = { 0, 1, 2, 3 };
-        String body = Base64.encodeBase64String(bytes);
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", MediaType.APPLICATION_OCTET_STREAM);
-        request.setPath("/hello");
-        request.setBody(body);
-        request.setIsBase64Encoded(true);
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(out.getMultiValueHeaders().getFirst("Content-Type"), MediaType.APPLICATION_OCTET_STREAM);
-        Assertions.assertTrue(out.isBase64Encoded());
-        byte[] rtn = Base64.decodeBase64(out.getBody());
-        Assertions.assertEquals(rtn[0], 4);
-        Assertions.assertEquals(rtn[1], 5);
-        Assertions.assertEquals(rtn[2], 6);
+        byte[] resBytes = { 4, 5, 6 };
 
+        byte[] result = given()
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .body(bytes)
+                .when()
+                .post("hello")
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString(MediaType.APPLICATION_OCTET_STREAM))
+                .extract().asByteArray();
+        Assertions.assertTrue(Arrays.equals(resBytes, result));
     }
 
     @Test
     public void testPostEmpty() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.setPath("/hello/empty");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 204);
-
+        given()
+                .when()
+                .post("/hello/empty")
+                .then()
+                .statusCode(204);
     }
 
     @ParameterizedTest
     @ValueSource(strings = { "/funqy", "/funqyAsync" })
     public void testFunqy(String path) {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setHttpMethod("POST");
-        request.setMultiValueHeaders(new Headers());
-        request.getMultiValueHeaders().add("Content-Type", "application/json");
-        request.setPath(path);
-        request.setBody("\"Bill\"");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 200);
-        Assertions.assertEquals(body(out), "\"Make it funqy Bill\"");
-        Assertions.assertTrue(out.getMultiValueHeaders().getFirst("Content-Type").startsWith("application/json"));
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body("\"Bill\"")
+                .when()
+                .post(path)
+                .then()
+                .statusCode(200)
+                .header("Content-Type", containsString("application/json"))
+                .body(equalTo("\"Make it funqy Bill\""));
     }
 
     @Test
     public void testProxyRequestContext() throws Exception {
-        AwsProxyRequest request = new AwsProxyRequest();
-        request.setRequestContext(new AwsProxyRequestContext());
-        request.setHttpMethod("GET");
-        request.setPath("/hello/proxyRequestContext");
-        AwsProxyResponse out = LambdaClient.invoke(AwsProxyResponse.class, request);
-        Assertions.assertEquals(out.getStatusCode(), 204);
+        given()
+                .when()
+                .get("/hello/proxyRequestContext")
+                .then()
+                .statusCode(204);
     }
 
 }
diff --git a/integration-tests/amazon-lambda/pom.xml b/integration-tests/amazon-lambda/pom.xml
index 45bd0f3180a4fc..3194a0670c7f4a 100644
--- a/integration-tests/amazon-lambda/pom.xml
+++ b/integration-tests/amazon-lambda/pom.xml
@@ -29,8 +29,8 @@
             test
         
         
-            io.quarkus
-            quarkus-test-amazon-lambda
+            io.rest-assured
+            rest-assured
             test
         
 
diff --git a/integration-tests/amazon-lambda/src/main/resources/application.properties b/integration-tests/amazon-lambda/src/main/resources/application.properties
index 647c5c1c59140a..984150ad856c8b 100644
--- a/integration-tests/amazon-lambda/src/main/resources/application.properties
+++ b/integration-tests/amazon-lambda/src/main/resources/application.properties
@@ -1,2 +1 @@
 quarkus.lambda.handler=test
-quarkus.lambda.enable-polling-jvm-mode=true
\ No newline at end of file
diff --git a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
index 15fafdc5c6eb17..a8064da4cfb67d 100644
--- a/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
+++ b/integration-tests/amazon-lambda/src/test/java/io/quarkus/it/amazon/lambda/AmazonLambdaSimpleTestCase.java
@@ -1,12 +1,12 @@
 package io.quarkus.it.amazon.lambda;
 
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.amazon.lambda.test.LambdaClient;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
@@ -18,10 +18,15 @@ public void testSimpleLambdaSuccess() throws Exception {
         InputObject in = new InputObject();
         in.setGreeting("Hello");
         in.setName("Stu");
-        OutputObject out = LambdaClient.invoke(OutputObject.class, in);
-        assertEquals("Hello Stu", out.getResult());
-        assertCounter(1);
-        assertTrue(out.getRequestId().matches("aws-request-\\d"), "Expected requestId as 'aws-request-'");
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(in)
+                .when()
+                .post()
+                .then()
+                .statusCode(200)
+                .body(containsString("Hello Stu"));
     }
 
     @Test
@@ -30,14 +35,15 @@ public void testSimpleLambdaFailure() throws Exception {
         InputObject in = new InputObject();
         in.setGreeting("Hello");
         in.setName("Stuart");
-        try {
-            OutputObject out = LambdaClient.invoke(OutputObject.class, in);
-            out.getResult();
-            fail();
-        } catch (Exception e) {
-            assertEquals(ProcessingService.CAN_ONLY_GREET_NICKNAMES, e.getMessage());
-            //Assertions.assertEquals(IllegalArgumentException.class.getName(), e.getType());
-        }
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(in)
+                .when()
+                .post()
+                .then()
+                .statusCode(500)
+                .body("errorMessage", equalTo(ProcessingService.CAN_ONLY_GREET_NICKNAMES));
         assertCounter(1);
     }
 
diff --git a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java b/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java
deleted file mode 100644
index 822bd492209d15..00000000000000
--- a/integration-tests/artemis-core/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.quarkus.it.artemis;
-
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
-import org.apache.commons.io.FileUtils;
-
-import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-
-public class ArtemisTestResource implements QuarkusTestResourceLifecycleManager {
-
-    private EmbeddedActiveMQ embedded;
-
-    @Override
-    public Map start() {
-        try {
-            FileUtils.deleteDirectory(Paths.get("./target/artemis").toFile());
-            embedded = new EmbeddedActiveMQ();
-            embedded.start();
-        } catch (Exception e) {
-            throw new RuntimeException("Could not start embedded ActiveMQ server", e);
-        }
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void stop() {
-        if (embedded == null) {
-            return;
-        }
-        try {
-            embedded.stop();
-        } catch (Exception e) {
-            throw new RuntimeException("Could not stop embedded ActiveMQ server", e);
-        }
-    }
-}
diff --git a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java b/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java
deleted file mode 100644
index 822bd492209d15..00000000000000
--- a/integration-tests/artemis-jms/src/test/java/io/quarkus/it/artemis/ArtemisTestResource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.quarkus.it.artemis;
-
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
-import org.apache.commons.io.FileUtils;
-
-import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-
-public class ArtemisTestResource implements QuarkusTestResourceLifecycleManager {
-
-    private EmbeddedActiveMQ embedded;
-
-    @Override
-    public Map start() {
-        try {
-            FileUtils.deleteDirectory(Paths.get("./target/artemis").toFile());
-            embedded = new EmbeddedActiveMQ();
-            embedded.start();
-        } catch (Exception e) {
-            throw new RuntimeException("Could not start embedded ActiveMQ server", e);
-        }
-        return Collections.emptyMap();
-    }
-
-    @Override
-    public void stop() {
-        if (embedded == null) {
-            return;
-        }
-        try {
-            embedded.stop();
-        } catch (Exception e) {
-            throw new RuntimeException("Could not stop embedded ActiveMQ server", e);
-        }
-    }
-}
diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java
index 8c36ccdebd06b8..1d8c5114941501 100644
--- a/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java
+++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devconsole/DevConsoleOidcSmokeTest.java
@@ -20,9 +20,9 @@ public class DevConsoleOidcSmokeTest {
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
 
     @Test
-    public void testCaches() {
+    public void testOidcProviderTemplate() {
         RestAssured.get("q/dev/io.quarkus.quarkus-oidc/provider")
                 .then()
-                .statusCode(200).body(Matchers.containsString("Keycloak"));
+                .statusCode(200).body(Matchers.containsString("OpenId Connect Dev Console"));
     }
 }
diff --git a/integration-tests/funqy-amazon-lambda/pom.xml b/integration-tests/funqy-amazon-lambda/pom.xml
index b0e33dd4707080..3b9310bc5c225d 100644
--- a/integration-tests/funqy-amazon-lambda/pom.xml
+++ b/integration-tests/funqy-amazon-lambda/pom.xml
@@ -33,8 +33,8 @@
             test
         
         
-            io.quarkus
-            quarkus-test-amazon-lambda
+            io.rest-assured
+            rest-assured
             test
         
 
diff --git a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java
index 90cec435c494dd..52b48ac52df61c 100644
--- a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java
+++ b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/GreetTestBase.java
@@ -1,30 +1,36 @@
 package io.quarkus.funqy.test;
 
-import static io.quarkus.funqy.test.GreetingFunctions.ERR_MSG;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.equalTo;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.amazon.lambda.test.LambdaClient;
-import io.quarkus.amazon.lambda.test.LambdaException;
-
 public abstract class GreetTestBase {
     @Test
     public void testGreet() {
-        Greeting expectedGreeting = new Greeting("Matej", "Hello Matej!");
         Identity identity = new Identity();
         identity.setName("Matej");
-        Greeting actualGreeting = LambdaClient.invoke(Greeting.class, identity);
-
-        Assertions.assertEquals(expectedGreeting, actualGreeting);
+        given()
+                .contentType("application/json")
+                .accept("application/json")
+                .body(identity)
+                .when()
+                .post()
+                .then()
+                .statusCode(200)
+                .body("name", equalTo("Matej"))
+                .body("message", equalTo("Hello Matej!"));
     }
 
     @Test
     public void testGreetNPE() {
-        try {
-            LambdaClient.invoke(Greeting.class, null);
-        } catch (LambdaException e) {
-            Assertions.assertTrue(e.getMessage().contains(ERR_MSG));
-        }
+        given()
+                .when()
+                .post()
+                .then()
+                .statusCode(500)
+                .body("errorMessage", containsString("end-of-input"));
     }
+
 }
diff --git a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java
index 1fb94529c86a88..e5695c1935f0ee 100644
--- a/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java
+++ b/integration-tests/funqy-amazon-lambda/src/test/java/io/quarkus/funqy/test/NoArgFunTest.java
@@ -1,11 +1,11 @@
 package io.quarkus.funqy.test;
 
-import java.time.Duration;
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsString;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import io.quarkus.amazon.lambda.test.LambdaClient;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
@@ -14,6 +14,11 @@ public class NoArgFunTest {
 
     @Test
     public void testNoArgFun() throws Exception {
-        LambdaClient.invoke(String.class, null, Duration.ofSeconds(5));
+        given()
+                .when()
+                .post()
+                .then()
+                .statusCode(200)
+                .body(containsString("noArgFun"));
     }
 }
diff --git a/integration-tests/funqy-amazon-lambda/src/test/resources/application.properties b/integration-tests/funqy-amazon-lambda/src/test/resources/application.properties
deleted file mode 100644
index e04a99c3c9f730..00000000000000
--- a/integration-tests/funqy-amazon-lambda/src/test/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-quarkus.lambda.enable-polling-jvm-mode=true
\ No newline at end of file
diff --git a/integration-tests/gradle/pom.xml b/integration-tests/gradle/pom.xml
index 04ef293f49b86f..d9301122053a24 100644
--- a/integration-tests/gradle/pom.xml
+++ b/integration-tests/gradle/pom.xml
@@ -184,12 +184,12 @@
         
     
     
-        
-            
-                src/test/resources
+        
+            
+                src/main/resources
                 true
-            
-        
+            
+        
         
             
                 org.apache.maven.plugins
diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle
new file mode 100644
index 00000000000000..5ac19470fa8422
--- /dev/null
+++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm'
+    id 'io.quarkus'
+}
+
+repositories {
+    if (System.properties.containsKey('maven.repo.local')) {
+        maven {
+            url System.properties.get('maven.repo.local')
+        }
+    } else {
+        mavenLocal()
+    }
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-resteasy'
+    implementation 'io.quarkus:quarkus-kotlin'
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
+// This is a fix as kotlin 1.5.30 does not support Java 17 yet
+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+    tasks.quarkusDev {
+        compilerArgs = ["-jvm-target", "16"]
+    }
+}
diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties
new file mode 100644
index 00000000000000..41c5c0fe733b9f
--- /dev/null
+++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/gradle.properties
@@ -0,0 +1,4 @@
+kotlinVersion=${kotlin.version}
+
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle
new file mode 100644
index 00000000000000..fb99dc799e1e2f
--- /dev/null
+++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/settings.gradle
@@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        if (System.properties.containsKey('maven.repo.local')) {
+            maven {
+                url System.properties.get('maven.repo.local')
+            }
+        } else {
+            mavenLocal()
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'org.jetbrains.kotlin.jvm' version  "${kotlinVersion}"
+    }
+}
+rootProject.name='code-with-quarkus'
diff --git a/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt
new file mode 100644
index 00000000000000..7634ba14219048
--- /dev/null
+++ b/integration-tests/gradle/src/main/resources/basic-kotlin-application-project/src/main/kotlin/org/acme/GreetingResource.kt
@@ -0,0 +1,16 @@
+package org.acme
+
+import javax.ws.rs.GET
+import javax.ws.rs.Path
+import javax.ws.rs.Produces
+import javax.ws.rs.core.MediaType
+
+@Path("/hello")
+class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    fun hello(): String {
+        return "hello"
+    }
+}
\ No newline at end of file
diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle
index d67f9aaa686262..28f0d81161779a 100644
--- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
     id 'io.quarkus'
-    id 'org.jetbrains.kotlin.jvm' version "1.5.30"
-    id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30"
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.plugin.allopen'
 }
 
 repositories {
diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties
index ec2b6ef199c2ca..1fde479f847f83 100644
--- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties
+++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/gradle.properties
@@ -1,2 +1,3 @@
+kotlinVersion=${kotlin.version}
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus
diff --git a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle
index 2342a44865b5cd..7034c8acb938b6 100644
--- a/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle
+++ b/integration-tests/gradle/src/main/resources/bean-in-testsources-project/settings.gradle
@@ -11,7 +11,9 @@ pluginManagement {
         }
     }
     plugins {
-      id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}"
+        id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}"
     }
 }
 rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle
index 7595b95a938b6d..76e136b7022732 100644
--- a/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle
+++ b/integration-tests/gradle/src/main/resources/conditional-dependencies/ext-a/runtime/build.gradle
@@ -8,6 +8,7 @@ dependencies {
     api("org.acme:simple-dependency:1.0-SNAPSHOT") {
         exclude module: "transitive-dependency"
     }
+    api("io.quarkus:quarkus-hibernate-reactive-panache")
 }
 
 publishing {
diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle
index fed218e5f7b90c..2ab309ef84913d 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version "1.5.30"
-    id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30"
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.plugin.allopen'
     id 'io.quarkus'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties
index 8f063b7d88ba4a..f4494d9c018570 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties
+++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/gradle.properties
@@ -1,2 +1,3 @@
+kotlinVersion=${kotlin.version}
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle
index 9fb4b0f54c909f..4f8ea526e9125a 100644
--- a/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle
+++ b/integration-tests/gradle/src/main/resources/kotlin-grpc-project/settings.gradle
@@ -12,7 +12,9 @@ pluginManagement {
         }
     }
     plugins {
-      id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}"
+        id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}"
     }
 }
 rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties
index 663c1b3b7991ed..b8ff81712a4976 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties
+++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/gradle.properties
@@ -3,5 +3,5 @@
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus
 
-kotlinVersion=1.5.30
+kotlinVersion=${kotlin.version}
 
diff --git a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts
index dd4627b9f7240f..55afb0a79cdbbd 100644
--- a/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts
+++ b/integration-tests/gradle/src/main/resources/multi-module-kotlin-project/web/build.gradle.kts
@@ -3,6 +3,12 @@ plugins {
     kotlin("jvm")
 }
 
+// This is a fix as kotlin 1.5.30 does not support Java 17 yet
+if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+    tasks.quarkusDev {
+        compilerArgs = listOf("-jvm-target", "16")
+    }
+}
 dependencies {
     implementation(project(":port"))
     implementation(project(":domain"))
diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle
index d7466be3bc153f..349362885e842f 100644
--- a/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle
+++ b/integration-tests/gradle/src/main/resources/multi-source-project/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version "1.5.30"
-    id "org.jetbrains.kotlin.plugin.allopen" version "1.5.30"
+    id 'org.jetbrains.kotlin.jvm'
+    id 'org.jetbrains.kotlin.plugin.allopen'
     id 'io.quarkus'
 }
 
diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties b/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties
index 8f063b7d88ba4a..f4494d9c018570 100644
--- a/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties
+++ b/integration-tests/gradle/src/main/resources/multi-source-project/gradle.properties
@@ -1,2 +1,3 @@
+kotlinVersion=${kotlin.version}
 quarkusPlatformArtifactId=quarkus-bom
 quarkusPlatformGroupId=io.quarkus
\ No newline at end of file
diff --git a/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle b/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle
index 9fb4b0f54c909f..4f8ea526e9125a 100644
--- a/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle
+++ b/integration-tests/gradle/src/main/resources/multi-source-project/settings.gradle
@@ -12,7 +12,9 @@ pluginManagement {
         }
     }
     plugins {
-      id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'io.quarkus' version "${quarkusPluginVersion}"
+        id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}"
+        id 'org.jetbrains.kotlin.plugin.allopen' version "${kotlinVersion}"
     }
 }
 rootProject.name='code-with-quarkus'
\ No newline at end of file
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java
index fb6a41b53dc253..4dacdd806b78ef 100644
--- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/ConditionalDependenciesTest.java
@@ -86,6 +86,7 @@ public void shouldImportConditionalDependency() throws IOException, URISyntaxExc
 
         final Path deploymentLib = buildDir.toPath().resolve("quarkus-app").resolve("lib").resolve("deployment");
         assertThat(deploymentLib.resolve("org.acme.transitive-dependency-1.0-SNAPSHOT.jar")).exists();
+        assertThat(deploymentLib.resolve("io.quarkus.quarkus-agroal-" + getQuarkusVersion() + ".jar")).doesNotExist();
     }
 
     @Test
diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java
new file mode 100644
index 00000000000000..a98c32842b24b9
--- /dev/null
+++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/devmode/BasicKotlinApplicationModuleDevModeTest.java
@@ -0,0 +1,26 @@
+package io.quarkus.gradle.devmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.UUID;
+
+import com.google.common.collect.ImmutableMap;
+
+public class BasicKotlinApplicationModuleDevModeTest extends QuarkusDevGradleTestBase {
+
+    @Override
+    protected String projectDirectoryName() {
+        return "basic-kotlin-application-project";
+    }
+
+    @Override
+    protected void testDevMode() throws Exception {
+        assertThat(getHttpResponse("/hello")).contains("hello");
+
+        final String uuid = UUID.randomUUID().toString();
+        replace("src/main/kotlin/org/acme/GreetingResource.kt",
+                ImmutableMap.of("return \"hello\"", "return \"" + uuid + "\""));
+
+        assertUpdatedResponseContains("/hello", uuid);
+    }
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/pom.xml b/integration-tests/hibernate-orm-graphql-panache/pom.xml
new file mode 100644
index 00000000000000..983efc7595d192
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/pom.xml
@@ -0,0 +1,122 @@
+
+
+    4.0.0
+    
+        quarkus-integration-tests-parent
+        io.quarkus
+        999-SNAPSHOT
+    
+
+    quarkus-integration-test-hibernate-orm-graphql-panache
+    Quarkus - Integration Tests - GraphQL and Hibernate ORM with Panache
+
+    
+        
+            io.quarkus
+            quarkus-smallrye-graphql
+        
+        
+            io.quarkus
+            quarkus-jdbc-h2
+        
+        
+            io.quarkus
+            quarkus-hibernate-orm-panache
+        
+        
+            io.quarkus
+            quarkus-hibernate-validator
+        
+        
+            io.quarkus
+            quarkus-junit5
+            test
+        
+        
+            io.quarkus
+            quarkus-test-h2
+            test
+        
+        
+            org.assertj
+            assertj-core
+            test
+        
+        
+            io.rest-assured
+            rest-assured
+            test
+        
+
+        
+        
+            io.quarkus
+            quarkus-hibernate-orm-panache-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-smallrye-graphql-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-jdbc-h2-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-hibernate-validator-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+    
+
+    
+        
+            
+                io.quarkus
+                quarkus-maven-plugin
+                
+                    
+                        
+                            build
+                        
+                    
+                
+            
+        
+    
+
+
\ No newline at end of file
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java
new file mode 100644
index 00000000000000..952f7062fd7c5e
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Author.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import java.time.LocalDate;
+
+import javax.persistence.Entity;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+
+@Entity
+public class Author extends PanacheEntity {
+
+    public String name;
+    public LocalDate dob;
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java
new file mode 100644
index 00000000000000..1a636496400c1c
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/Book.java
@@ -0,0 +1,41 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.validation.constraints.NotBlank;
+
+@Entity
+public class Book {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @NotBlank
+    private String title;
+
+    @ManyToOne
+    private Author author;
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Author getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(Author author) {
+        this.author = author;
+    }
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java
new file mode 100644
index 00000000000000..35052b9b0976ae
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/BookRepository.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+
+@ApplicationScoped
+public class BookRepository implements PanacheRepository {
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java
new file mode 100644
index 00000000000000..a3e8b1d1a1e314
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/main/java/io/quarkus/it/hibertnate/orm/graphql/panache/GraphQLResource.java
@@ -0,0 +1,32 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.eclipse.microprofile.graphql.Description;
+import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Query;
+
+import io.quarkus.logging.Log;
+
+@GraphQLApi
+public class GraphQLResource {
+
+    @Inject
+    BookRepository bookRepository;
+
+    @Query("authors")
+    @Description("Retrieve the stored authors")
+    public List getAuthors() {
+        Log.info("Getting all authors");
+        return Author.listAll();
+    }
+
+    @Query("books")
+    @Description("Retrieve the stored books")
+    public List getBooks() {
+        Log.info("Getting all books");
+        return bookRepository.listAll();
+    }
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties
new file mode 100644
index 00000000000000..bbcff456cb710f
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/application.properties
@@ -0,0 +1,9 @@
+quarkus.datasource.db-kind=h2
+quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test
+quarkus.datasource.jdbc.max-size=8
+quarkus.hibernate-orm.database.generation=drop-and-create
+#quarkus.hibernate-orm.log.sql=true
+quarkus.hibernate-orm.sql-load-script=import.sql
+
+quarkus.default-locale=en_US
+quarkus.locales=en_US
\ No newline at end of file
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql
new file mode 100644
index 00000000000000..91854e2f738d88
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/main/resources/import.sql
@@ -0,0 +1,6 @@
+insert into author(id, name, dob) values (nextval('hibernate_sequence'), 'Fyodor Dostoevsky', '1821-11-11');
+
+insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Crime and Punishment', 1);
+insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Idiot', 1);
+insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'Demons', 1);
+insert into book(id, title, author_id) values (nextval('hibernate_sequence'), 'The adolescent', 1);
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java
new file mode 100644
index 00000000000000..f9ac8e27659c9f
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import io.quarkus.test.junit.NativeImageTest;
+
+@NativeImageTest
+class HibernateOrmGraphQLPanacheIT extends HibernateOrmGraphQLPanacheTest {
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java
new file mode 100644
index 00000000000000..2f9224fdf81cae
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/HibernateOrmGraphQLPanacheTest.java
@@ -0,0 +1,69 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.contains;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class HibernateOrmGraphQLPanacheTest {
+
+    private static final int DOSTOEVSKY_ID = 1;
+
+    private static final String DOSTOEVSKY_NAME = "Fyodor Dostoevsky";
+
+    private static final String DOSTOEVSKY_DOB = "1821-11-11";
+
+    private static final int CRIME_AND_PUNISHMENT_ID = 2;
+
+    private static final String CRIME_AND_PUNISHMENT_TITLE = "Crime and Punishment";
+
+    private static final int IDIOT_ID = 3;
+
+    private static final String IDIOT_TITLE = "Idiot";
+
+    private static final int DEMONS_ID = 4;
+
+    private static final String DEMONS_TITLE = "Demons";
+
+    private static final int THE_ADOLESCENT_ID = 5;
+
+    private static final String THE_ADOLESCENT_TITLE = "The adolescent";
+
+    @Test
+    void testEndpoint() {
+
+        String bookAndAuthorRequest = PayloadCreator.getPayload("{\n" +
+                "  authors {\n" +
+                "    id\n" +
+                "    name\n" +
+                "    dob\n" +
+                "  }\n" +
+                "  books {\n" +
+                "    id\n" +
+                "    title\n" +
+                "    author {\n" +
+                "      name\n" +
+                "    }\n" +
+                "  }\n" +
+                "}");
+
+        given()
+                .when()
+                .accept("application/json")
+                .contentType("application/json")
+                .body(bookAndAuthorRequest)
+                .post("/graphql")
+                .then()
+                .statusCode(200)
+                .and().body("data.authors.id", contains(DOSTOEVSKY_ID))
+                .and().body("data.authors.name", contains(DOSTOEVSKY_NAME))
+                .and().body("data.authors.dob", contains(DOSTOEVSKY_DOB))
+                .and().body("data.books.id", contains(CRIME_AND_PUNISHMENT_ID, IDIOT_ID, DEMONS_ID, THE_ADOLESCENT_ID))
+                .and().body("data.books.title",
+                        contains(CRIME_AND_PUNISHMENT_TITLE, IDIOT_TITLE, DEMONS_TITLE, THE_ADOLESCENT_TITLE));
+    }
+
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java
new file mode 100644
index 00000000000000..47682edf351acd
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/PayloadCreator.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+
+public class PayloadCreator {
+
+    private PayloadCreator() {
+    }
+
+    public static String getPayload(String query) {
+        JsonObject jsonObject = createRequestBody(query);
+        return jsonObject.toString();
+    }
+
+    private static JsonObject createRequestBody(String graphQL) {
+        return createRequestBody(graphQL, null);
+    }
+
+    private static JsonObject createRequestBody(String graphQL, JsonObject variables) {
+        // Create the request
+        if (variables == null || variables.isEmpty()) {
+            variables = Json.createObjectBuilder().build();
+        }
+        return Json.createObjectBuilder().add(QUERY, graphQL).add(VARIABLES, variables).build();
+    }
+
+    public static final String MEDIATYPE_JSON = "application/json";
+    private static final String QUERY = "query";
+    private static final String VARIABLES = "variables";
+}
diff --git a/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java
new file mode 100644
index 00000000000000..87980f0eb266dc
--- /dev/null
+++ b/integration-tests/hibernate-orm-graphql-panache/src/test/java/io/quarkus/it/hibertnate/orm/graphql/panache/TestResources.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.hibertnate.orm.graphql.panache;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
+
+@QuarkusTestResource(H2DatabaseTestResource.class)
+public class TestResources {
+}
diff --git a/integration-tests/hibernate-orm-rest-data-panache/pom.xml b/integration-tests/hibernate-orm-rest-data-panache/pom.xml
index 6811ac56be68d3..08bb5e9971b5a1 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/pom.xml
+++ b/integration-tests/hibernate-orm-rest-data-panache/pom.xml
@@ -23,7 +23,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jackson
+            quarkus-resteasy-reactive-jackson
         
         
             io.quarkus
@@ -79,7 +79,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jackson-deployment
+            quarkus-resteasy-reactive-jackson-deployment
             ${project.version}
             pom
             test
diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
index 656972dd443dd0..5b84ebf1678168 100644
--- a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
+++ b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
@@ -237,8 +237,8 @@ void shouldNotCreateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().post("/books")
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("add.arg0.title"))
-                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+                .and().body("violations[0].field", equalTo("add.arg0.title"))
+                .and().body("violations[0].message", equalTo("must not be blank"));
     }
 
     @Test
@@ -307,7 +307,7 @@ void shouldNotUpdateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().put("/books/" + CRIME_AND_PUNISHMENT_ID)
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("update.arg1.title"))
-                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+                .and().body("violations[0].field", equalTo("update.arg1.title"))
+                .and().body("violations[0].message", equalTo("must not be blank"));
     }
 }
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/pom.xml b/integration-tests/hibernate-validator-resteasy-reactive/pom.xml
new file mode 100644
index 00000000000000..9862dac97f3d36
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/pom.xml
@@ -0,0 +1,182 @@
+
+
+    
+        quarkus-integration-tests-parent
+        io.quarkus
+        999-SNAPSHOT
+    
+    4.0.0
+
+    quarkus-integration-test-hibernate-validator-resteasy-reactive
+    Quarkus - Integration Tests - Hibernate Validator
+    Module that contains Hibernate Validator/Bean Validation related tests using RESTEasy Reactive
+
+    
+        
+            io.quarkus
+            quarkus-resteasy-reactive-jsonb
+        
+        
+            io.quarkus
+            quarkus-hibernate-validator
+        
+        
+            io.quarkus
+            quarkus-arc
+        
+
+        
+        
+            io.quarkus
+            quarkus-hibernate-orm
+        
+        
+            io.quarkus
+            quarkus-jdbc-h2
+        
+
+        
+        
+            io.quarkus
+            quarkus-junit5
+            test
+        
+        
+            io.rest-assured
+            rest-assured
+            test
+        
+        
+            io.quarkus
+            quarkus-test-h2
+            test
+        
+        
+        
+            io.quarkus
+            quarkus-arc-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-hibernate-orm-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-hibernate-validator-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-jdbc-h2-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-resteasy-reactive-jsonb-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+    
+
+    
+        
+            
+                src/main/resources
+                true
+            
+        
+        
+            
+                io.quarkus
+                quarkus-maven-plugin
+                
+                    
+                        
+                            build
+                        
+                    
+                
+            
+            
+                org.apache.maven.plugins
+                maven-surefire-plugin
+                
+                    
+                        
+                        en
+                    
+                
+            
+        
+    
+
+    
+        
+            native-image
+            
+                
+                    native
+                
+            
+            
+                
+                
+                    
+                        org.apache.maven.plugins
+                        maven-failsafe-plugin
+                        
+                            
+                                
+                                en
+                            
+                        
+                    
+                
+            
+        
+    
+
+
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java
new file mode 100644
index 00000000000000..cc7f0929c2e147
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResource.java
@@ -0,0 +1,167 @@
+package io.quarkus.it.hibernate.validator;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import javax.validation.ConstraintViolation;
+import javax.validation.Valid;
+import javax.validation.Validator;
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.Email;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.hibernate.validator.constraints.Length;
+
+import io.quarkus.it.hibernate.validator.custom.MyOtherBean;
+import io.quarkus.runtime.StartupEvent;
+
+@Path("/hibernate-validator/test")
+public class HibernateValidatorTestResource {
+
+    @Inject
+    Validator validator;
+
+    public void testValidationOutsideOfResteasyContext(@Observes StartupEvent startupEvent) {
+        validator.validate(new MyOtherBean(null));
+    }
+
+    @GET
+    @Path("/basic-features")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testBasicFeatures() {
+        ResultBuilder result = new ResultBuilder();
+
+        Map> invalidCategorizedEmails = new HashMap<>();
+        invalidCategorizedEmails.put("a", Collections.singletonList("b"));
+
+        result.append(formatViolations(validator.validate(new MyBean(
+                "Bill Jones",
+                "b",
+                Collections.singletonList("c"),
+                -4d,
+                invalidCategorizedEmails))));
+
+        Map> validCategorizedEmails = new HashMap<>();
+        validCategorizedEmails.put("Professional", Collections.singletonList("bill.jones@example.com"));
+
+        result.append(formatViolations(validator.validate(new MyBean(
+                "Bill Jones",
+                "bill.jones@example.com",
+                Collections.singletonList("biji@example.com"),
+                5d,
+                validCategorizedEmails))));
+
+        return result.build();
+    }
+
+    private String formatViolations(Set> violations) {
+        if (violations.isEmpty()) {
+            return "passed";
+        }
+
+        return "failed: " + violations.stream()
+                .map(v -> v.getPropertyPath().toString() + " (" + v.getMessage() + ")")
+                .sorted()
+                .collect(Collectors.joining(", "));
+    }
+
+    public static class MyBean {
+
+        private String name;
+
+        @Email
+        private String email;
+
+        private List<@Email String> additionalEmails;
+
+        @DecimalMin("0")
+        private Double score;
+
+        private Map<@Length(min = 3) String, List<@Email String>> categorizedEmails;
+
+        @Valid
+        private NestedBeanWithoutConstraints nestedBeanWithoutConstraints;
+
+        public MyBean(String name, String email, List additionalEmails, Double score,
+                Map> categorizedEmails) {
+            this.name = name;
+            this.email = email;
+            this.additionalEmails = additionalEmails;
+            this.score = score;
+            this.categorizedEmails = categorizedEmails;
+            this.nestedBeanWithoutConstraints = new NestedBeanWithoutConstraints();
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getEmail() {
+            return email;
+        }
+
+        public void setEmail(String email) {
+            this.email = email;
+        }
+
+        public List getAdditionalEmails() {
+            return additionalEmails;
+        }
+
+        public void setAdditionalEmails(List additionalEmails) {
+            this.additionalEmails = additionalEmails;
+        }
+
+        public Double getScore() {
+            return score;
+        }
+
+        public void setScore(Double score) {
+            this.score = score;
+        }
+
+        public Map> getCategorizedEmails() {
+            return categorizedEmails;
+        }
+
+        public void setCategorizedEmails(Map> categorizedEmails) {
+            this.categorizedEmails = categorizedEmails;
+        }
+    }
+
+    private static class ResultBuilder {
+
+        private StringBuilder builder = new StringBuilder();
+
+        public ResultBuilder append(String element) {
+            if (builder.length() > 0) {
+                builder.append("\n");
+            }
+            builder.append(element);
+            return this;
+        }
+
+        public String build() {
+            return builder.toString();
+        }
+    }
+
+    private static class NestedBeanWithoutConstraints {
+
+        @SuppressWarnings("unused")
+        private String property;
+    }
+}
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java
new file mode 100644
index 00000000000000..d2dfd4aa2222f5
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceGenericInterface.java
@@ -0,0 +1,9 @@
+package io.quarkus.it.hibernate.validator;
+
+import javax.validation.constraints.Digits;
+
+public interface HibernateValidatorTestResourceGenericInterface {
+
+    T testRestEndpointGenericMethodValidation(@Digits(integer = 5, fraction = 0) T id);
+
+}
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java
new file mode 100644
index 00000000000000..fe76470c7c2521
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/HibernateValidatorTestResourceInterface.java
@@ -0,0 +1,22 @@
+package io.quarkus.it.hibernate.validator;
+
+import javax.validation.constraints.Digits;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+public interface HibernateValidatorTestResourceInterface {
+
+    @GET
+    @Path("/rest-end-point-interface-validation/{id}/")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testRestEndPointInterfaceValidation(@Digits(integer = 5, fraction = 0) @PathParam("id") String id);
+
+    @GET
+    @Path("/rest-end-point-interface-validation-annotation-on-impl-method/{id}/")
+    @Produces(MediaType.TEXT_PLAIN)
+    public String testRestEndPointInterfaceValidationWithAnnotationOnImplMethod(
+            @Digits(integer = 5, fraction = 0) @PathParam("id") String id);
+}
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java
new file mode 100644
index 00000000000000..ad412dea04eb52
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyCustomConstraint.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.hibernate.validator.custom;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.Payload;
+
+@Target({ ElementType.TYPE_USE, ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = MyCustomConstraint.Validator.class)
+public @interface MyCustomConstraint {
+
+    String message() default "{MyCustomConstraint.message}";
+
+    Class[] groups() default {};
+
+    Class[] payload() default {};
+
+    class Validator implements ConstraintValidator {
+
+        @Override
+        public boolean isValid(MyOtherBean value, ConstraintValidatorContext context) {
+            return value.getName() != null;
+        }
+    }
+}
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java
new file mode 100644
index 00000000000000..4961a6d0103b0b
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/custom/MyOtherBean.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.hibernate.validator.custom;
+
+@MyCustomConstraint
+public class MyOtherBean {
+
+    private String name;
+
+    public MyOtherBean(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java b/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java
new file mode 100644
index 00000000000000..433213be9fad86
--- /dev/null
+++ b/integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/HibernateValidatorFunctionalityTest.java
@@ -0,0 +1,31 @@
+package io.quarkus.it.hibernate.validator;
+
+import static org.hamcrest.Matchers.is;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+@QuarkusTestResource(H2DatabaseTestResource.class)
+public class HibernateValidatorFunctionalityTest {
+
+    @Test
+    public void testBasicFeatures() throws Exception {
+        StringBuilder expected = new StringBuilder();
+        expected.append("failed: additionalEmails[0]. (must be a well-formed email address)").append(", ")
+                .append("categorizedEmails[a]. (length must be between 3 and 2147483647)").append(", ")
+                .append("categorizedEmails[a].[0]. (must be a well-formed email address)").append(", ")
+                .append("email (must be a well-formed email address)").append(", ")
+                .append("score (must be greater than or equal to 0)").append("\n");
+        expected.append("passed");
+
+        RestAssured.when()
+                .get("/hibernate-validator/test/basic-features")
+                .then()
+                .body(is(expected.toString()));
+    }
+}
diff --git a/integration-tests/jpa-oracle/src/main/resources/application.properties b/integration-tests/jpa-oracle/src/main/resources/application.properties
index 7c08376aa4a756..0abd503fde3ec0 100644
--- a/integration-tests/jpa-oracle/src/main/resources/application.properties
+++ b/integration-tests/jpa-oracle/src/main/resources/application.properties
@@ -4,4 +4,4 @@ quarkus.datasource.password=hibernate_orm_test
 quarkus.datasource.jdbc.url=${oracledb.url}
 quarkus.datasource.jdbc.max-size=1
 quarkus.hibernate-orm.database.generation=drop-and-create
-quarkus.datasource.jdbc.additional-jdbc-properties."oracle.jdbc.timezoneAsRegion"=false
\ No newline at end of file
+quarkus.datasource.jdbc.additional-jdbc-properties."oracle.jdbc.timezoneAsRegion"=false
diff --git a/integration-tests/liquibase-mongodb/pom.xml b/integration-tests/liquibase-mongodb/pom.xml
new file mode 100644
index 00000000000000..dc1d8393d2d02e
--- /dev/null
+++ b/integration-tests/liquibase-mongodb/pom.xml
@@ -0,0 +1,106 @@
+
+
+    
+        quarkus-integration-tests-parent
+        io.quarkus
+        999-SNAPSHOT
+    
+    4.0.0
+
+    quarkus-integration-test-liquibase-mongodb
+    Quarkus - Integration Tests - Liquibase MongoDB
+    Module that contains Liquibase MongoDB related tests
+
+    
+        
+            io.quarkus
+            quarkus-liquibase-mongodb
+        
+        
+            io.quarkus
+            quarkus-mongodb-panache
+        
+        
+            io.quarkus
+            quarkus-resteasy-jackson
+        
+
+        
+        
+            io.quarkus
+            quarkus-junit5
+            test
+        
+        
+            io.rest-assured
+            rest-assured
+            test
+        
+        
+            io.quarkus
+            quarkus-test-mongodb
+            test
+        
+
+        
+        
+            io.quarkus
+            quarkus-liquibase-mongodb-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-mongodb-panache-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+        
+            io.quarkus
+            quarkus-resteasy-jackson-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+    
+
+    
+        
+            
+                io.quarkus
+                quarkus-maven-plugin
+                
+                    
+                        
+                            build
+                        
+                    
+                
+            
+        
+    
+
+
+
\ No newline at end of file
diff --git a/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java
new file mode 100644
index 00000000000000..b5d0483404c0e2
--- /dev/null
+++ b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/Fruit.java
@@ -0,0 +1,8 @@
+package io.quarkus.it.liquibase.mongodb;
+
+import io.quarkus.mongodb.panache.PanacheMongoEntity;
+
+public class Fruit extends PanacheMongoEntity {
+    public String name;
+    public String color;
+}
diff --git a/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java
new file mode 100644
index 00000000000000..cdbb0a4efc69c2
--- /dev/null
+++ b/integration-tests/liquibase-mongodb/src/main/java/io/quarkus/it/liquibase/mongodb/FruitResource.java
@@ -0,0 +1,33 @@
+package io.quarkus.it.liquibase.mongodb;
+
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.bson.types.ObjectId;
+
+@Path("/fruits")
+@Produces(MediaType.APPLICATION_JSON)
+public class FruitResource {
+
+    @GET
+    public List list() {
+        return Fruit.listAll();
+    }
+
+    @GET
+    @Path("/{id}")
+    public Fruit get(@PathParam("id") String id) {
+        return Fruit.findById(new ObjectId(id));
+    }
+
+    @POST
+    public void save(Fruit fruit) {
+        fruit.persist();
+    }
+}
diff --git a/integration-tests/liquibase-mongodb/src/main/resources/application.properties b/integration-tests/liquibase-mongodb/src/main/resources/application.properties
new file mode 100644
index 00000000000000..9a40534908c6fb
--- /dev/null
+++ b/integration-tests/liquibase-mongodb/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+quarkus.mongodb.connection-string=mongodb://localhost:27017
+quarkus.mongodb.database=fruits
+quarkus.liquibase-mongodb.change-log=liquibase/changelog.xml
+quarkus.liquibase-mongodb.migrate-at-start=true
\ No newline at end of file
diff --git a/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml b/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml
new file mode 100644
index 00000000000000..18bd43e5611b40
--- /dev/null
+++ b/integration-tests/liquibase-mongodb/src/main/resources/liquibase/changelog.xml
@@ -0,0 +1,23 @@
+
+
+    
+
+        
+
+        
+            {color: 1}
+            {name: "colorIdx"}
+        
+
+        
+            {"name":"orange", "color": "orange"}
+        
+
+    
+
+
\ No newline at end of file
diff --git a/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java b/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java
new file mode 100644
index 00000000000000..6f9a203d3ec4fe
--- /dev/null
+++ b/integration-tests/liquibase-mongodb/src/test/java/io/quarkus/it/liquibase/mongodb/FruitResourceTest.java
@@ -0,0 +1,51 @@
+package io.quarkus.it.liquibase.mongodb;
+
+import static io.restassured.RestAssured.get;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import javax.inject.Inject;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MongoClient;
+
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.mongodb.MongoTestResource;
+import io.restassured.common.mapper.TypeRef;
+
+@QuarkusTest
+@QuarkusTestResource(MongoTestResource.class)
+@DisabledOnOs(OS.WINDOWS)
+class FruitResourceTest {
+
+    @Inject
+    MongoClient mongoClient;
+
+    @Test
+    public void testTheEndpoint() {
+        // assert that a fruit exist as one has been created in the changelog
+        List list = get("/fruits").as(new TypeRef>() {
+        });
+        Assertions.assertEquals(1, list.size());
+    }
+
+    @Test
+    public void validateTheIdx() {
+        // check that the index that the changelog created exist
+        ListIndexesIterable indexes = mongoClient.getDatabase("fruits").getCollection("Fruit").listIndexes();
+        Set names = StreamSupport.stream(indexes.spliterator(), false)
+                .map(doc -> doc.getString("name"))
+                .collect(Collectors.toSet());
+        Assertions.assertTrue(names.contains("colorIdx"));
+    }
+}
diff --git a/integration-tests/logging-panache/pom.xml b/integration-tests/logging-panache/pom.xml
new file mode 100644
index 00000000000000..e15484e26d3e57
--- /dev/null
+++ b/integration-tests/logging-panache/pom.xml
@@ -0,0 +1,60 @@
+
+
+    4.0.0
+
+    
+        quarkus-integration-tests-parent
+        io.quarkus
+        999-SNAPSHOT
+    
+
+    quarkus-integration-test-logging-panache
+
+    Quarkus - Integration Tests - Logging with Panache
+
+    
+        
+            io.quarkus
+            quarkus-arc-deployment
+            test
+        
+        
+            io.quarkus
+            quarkus-resteasy
+            test
+        
+
+        
+            io.quarkus
+            quarkus-junit5-internal
+            test
+        
+        
+            io.rest-assured
+            rest-assured
+            test
+        
+        
+            org.assertj
+            assertj-core
+            test
+        
+
+        
+        
+            io.quarkus
+            quarkus-resteasy-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
+    
+
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java
new file mode 100644
index 00000000000000..4341ee3c653dab
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GenerateAllLogUsages.java
@@ -0,0 +1,62 @@
+package io.quarkus.logging;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.util.Arrays;
+import java.util.Comparator;
+
+import org.jboss.logging.Logger;
+
+public class GenerateAllLogUsages {
+    public static void main(String[] args) {
+        println("package io.quarkus.logging;");
+        println("");
+        println("// generated by GenerateAllLogUsages, don't update manually");
+        println("public class GeneratedBean {");
+        println("    public void testLogging() {");
+        Arrays.stream(Log.class.getDeclaredMethods())
+                .filter(method -> Modifier.isPublic(method.getModifiers()))
+                .sorted(Comparator.comparing(Method::getName).thenComparingInt(Method::getParameterCount))
+                .forEach(method -> {
+                    Parameter[] parameters = method.getParameters();
+                    String[] arguments = new String[method.getParameterCount()];
+                    for (int i = 0; i < parameters.length; i++) {
+                        Parameter parameter = parameters[i];
+                        String argument;
+                        if (parameter.getType() == Object.class && "message".equals(parameter.getName())) {
+                            argument = "\"foobar\"";
+                        } else if (parameter.getType() == Object.class
+                                && (parameter.getName().startsWith("param") || parameter.getName().startsWith("arg"))) {
+                            argument = "new Object()";
+                        } else if (parameter.getType() == Object[].class && "params".equals(parameter.getName())) {
+                            argument = "new Object[] {}";
+                        } else if (parameter.getType() == String.class && "loggerFqcn".equals(parameter.getName())) {
+                            argument = "\"io.quarkus.logging.GeneratedBean\"";
+                        } else if (parameter.getType() == String.class && "format".equals(parameter.getName())) {
+                            argument = "\"foobar\"";
+                        } else if (parameter.getType() == int.class) {
+                            argument = "13";
+                        } else if (parameter.getType() == long.class) {
+                            argument = "42L";
+                        } else if (parameter.getType() == Throwable.class) {
+                            argument = "new NoStackTraceTestException()";
+                        } else if (parameter.getType() == Logger.Level.class) {
+                            argument = "org.jboss.logging.Logger.Level.INFO";
+                        } else {
+                            throw new RuntimeException("Couldn't generate argument value for parameter " + i + " of type "
+                                    + method.getParameterTypes()[i] + ": " + method);
+                        }
+                        arguments[i] = argument;
+                    }
+
+                    println("        Log." + method.getName() + "(" + String.join(", ", arguments) + ");");
+                });
+        println("    }");
+        println("}");
+    }
+
+    private static void println(String string) {
+        System.out.println(string);
+    }
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java
new file mode 100644
index 00000000000000..7dea885e5c4c9a
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/GeneratedBean.java
@@ -0,0 +1,219 @@
+package io.quarkus.logging;
+
+// generated by GenerateAllLogUsages, don't update manually
+public class GeneratedBean {
+    public void testLogging() {
+        Log.debug("foobar");
+        Log.debug("foobar", new NoStackTraceTestException());
+        Log.debug("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException());
+        Log.debug("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException());
+        Log.debugf("foobar", new Object[] {});
+        Log.debugf("foobar", new Object());
+        Log.debugf("foobar", 13);
+        Log.debugf("foobar", 42L);
+        Log.debugf("foobar", 13, new Object());
+        Log.debugf("foobar", 13, 13);
+        Log.debugf(new NoStackTraceTestException(), "foobar", 13);
+        Log.debugf(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.debugf("foobar", new Object(), new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 42L);
+        Log.debugf("foobar", 42L, new Object());
+        Log.debugf("foobar", 42L, 42L);
+        Log.debugf(new NoStackTraceTestException(), "foobar", 42L, new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 42L, 42L);
+        Log.debugf("foobar", 13, 13, new Object());
+        Log.debugf("foobar", 13, 13, 13);
+        Log.debugf(new NoStackTraceTestException(), "foobar", 13, new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 13, 13);
+        Log.debugf("foobar", 13, new Object(), new Object());
+        Log.debugf("foobar", new Object(), new Object(), new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.debugf("foobar", 42L, 42L, 42L);
+        Log.debugf("foobar", 42L, 42L, new Object());
+        Log.debugf("foobar", 42L, new Object(), new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 42L, 42L, 42L);
+        Log.debugf(new NoStackTraceTestException(), "foobar", 42L, 42L, new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 42L, new Object(), new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 13, new Object(), new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 13, 13, new Object());
+        Log.debugf(new NoStackTraceTestException(), "foobar", 13, 13, 13);
+        Log.debugv("foobar", new Object[] {});
+        Log.debugv("foobar", new Object());
+        Log.debugv(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.debugv("foobar", new Object(), new Object());
+        Log.debugv(new NoStackTraceTestException(), "foobar", new Object());
+        Log.debugv("foobar", new Object(), new Object(), new Object());
+        Log.debugv(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.debugv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.error("foobar");
+        Log.error("foobar", new NoStackTraceTestException());
+        Log.error("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException());
+        Log.error("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException());
+        Log.errorf("foobar", new Object[] {});
+        Log.errorf("foobar", new Object());
+        Log.errorf("foobar", new Object(), new Object());
+        Log.errorf(new NoStackTraceTestException(), "foobar", new Object());
+        Log.errorf(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.errorf(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.errorf("foobar", new Object(), new Object(), new Object());
+        Log.errorf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.errorv("foobar", new Object[] {});
+        Log.errorv("foobar", new Object());
+        Log.errorv(new NoStackTraceTestException(), "foobar", new Object());
+        Log.errorv("foobar", new Object(), new Object());
+        Log.errorv(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.errorv(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.errorv("foobar", new Object(), new Object(), new Object());
+        Log.errorv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.fatal("foobar");
+        Log.fatal("foobar", new NoStackTraceTestException());
+        Log.fatal("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException());
+        Log.fatal("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException());
+        Log.fatalf("foobar", new Object());
+        Log.fatalf("foobar", new Object[] {});
+        Log.fatalf(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.fatalf(new NoStackTraceTestException(), "foobar", new Object());
+        Log.fatalf("foobar", new Object(), new Object());
+        Log.fatalf("foobar", new Object(), new Object(), new Object());
+        Log.fatalf(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.fatalf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.fatalv("foobar", new Object[] {});
+        Log.fatalv("foobar", new Object());
+        Log.fatalv(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.fatalv(new NoStackTraceTestException(), "foobar", new Object());
+        Log.fatalv("foobar", new Object(), new Object());
+        Log.fatalv(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.fatalv("foobar", new Object(), new Object(), new Object());
+        Log.fatalv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.info("foobar");
+        Log.info("foobar", new NoStackTraceTestException());
+        Log.info("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException());
+        Log.info("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException());
+        Log.infof("foobar", new Object[] {});
+        Log.infof("foobar", new Object());
+        Log.infof(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.infof(new NoStackTraceTestException(), "foobar", new Object());
+        Log.infof("foobar", new Object(), new Object());
+        Log.infof(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.infof("foobar", new Object(), new Object(), new Object());
+        Log.infof(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.infov("foobar", new Object[] {});
+        Log.infov("foobar", new Object());
+        Log.infov(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.infov(new NoStackTraceTestException(), "foobar", new Object());
+        Log.infov("foobar", new Object(), new Object());
+        Log.infov("foobar", new Object(), new Object(), new Object());
+        Log.infov(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.infov(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.isDebugEnabled();
+        Log.isEnabled(org.jboss.logging.Logger.Level.INFO);
+        Log.isInfoEnabled();
+        Log.isTraceEnabled();
+        Log.log(org.jboss.logging.Logger.Level.INFO, "foobar");
+        Log.log(org.jboss.logging.Logger.Level.INFO, "foobar", new NoStackTraceTestException());
+        Log.log(org.jboss.logging.Logger.Level.INFO, "io.quarkus.logging.GeneratedBean", "foobar",
+                new NoStackTraceTestException());
+        Log.log("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, "foobar", new Object[] {},
+                new NoStackTraceTestException());
+        Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object());
+        Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object[] {});
+        Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object());
+        Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object());
+        Log.logf(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object(), new Object());
+        Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object());
+        Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object[] {});
+        Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object(), new Object());
+        Log.logf(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object(),
+                new Object());
+        Log.logf("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object(), new Object(), new Object());
+        Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object());
+        Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object[] {});
+        Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object());
+        Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object());
+        Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.logv(org.jboss.logging.Logger.Level.INFO, "foobar", new Object(), new Object(), new Object());
+        Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object[] {});
+        Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object());
+        Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.logv(org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(), "foobar", new Object(), new Object(),
+                new Object());
+        Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object(), new Object());
+        Log.logv("io.quarkus.logging.GeneratedBean", org.jboss.logging.Logger.Level.INFO, new NoStackTraceTestException(),
+                "foobar", new Object(), new Object(), new Object());
+        Log.trace("foobar");
+        Log.trace("foobar", new NoStackTraceTestException());
+        Log.trace("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException());
+        Log.trace("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException());
+        Log.tracef("foobar", new Object[] {});
+        Log.tracef("foobar", new Object());
+        Log.tracef("foobar", 13);
+        Log.tracef("foobar", 42L);
+        Log.tracef(new NoStackTraceTestException(), "foobar", 42L);
+        Log.tracef("foobar", new Object(), new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.tracef(new NoStackTraceTestException(), "foobar", new Object());
+        Log.tracef("foobar", 13, new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 13);
+        Log.tracef("foobar", 13, 13);
+        Log.tracef("foobar", 42L, 42L);
+        Log.tracef("foobar", 42L, new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 42L, new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 42L, 42L);
+        Log.tracef("foobar", 42L, new Object(), new Object());
+        Log.tracef("foobar", new Object(), new Object(), new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.tracef("foobar", 13, new Object(), new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 13, 13);
+        Log.tracef("foobar", 13, 13, 13);
+        Log.tracef("foobar", 13, 13, new Object());
+        Log.tracef("foobar", 42L, 42L, 42L);
+        Log.tracef("foobar", 42L, 42L, new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 13, new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 42L, 42L, 42L);
+        Log.tracef(new NoStackTraceTestException(), "foobar", 42L, 42L, new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 42L, new Object(), new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 13, new Object(), new Object());
+        Log.tracef(new NoStackTraceTestException(), "foobar", 13, 13, 13);
+        Log.tracef(new NoStackTraceTestException(), "foobar", 13, 13, new Object());
+        Log.tracev("foobar", new Object());
+        Log.tracev("foobar", new Object[] {});
+        Log.tracev("foobar", new Object(), new Object());
+        Log.tracev(new NoStackTraceTestException(), "foobar", new Object());
+        Log.tracev(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.tracev(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.tracev("foobar", new Object(), new Object(), new Object());
+        Log.tracev(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.warn("foobar");
+        Log.warn("foobar", new NoStackTraceTestException());
+        Log.warn("io.quarkus.logging.GeneratedBean", "foobar", new NoStackTraceTestException());
+        Log.warn("io.quarkus.logging.GeneratedBean", "foobar", new Object[] {}, new NoStackTraceTestException());
+        Log.warnf("foobar", new Object[] {});
+        Log.warnf("foobar", new Object());
+        Log.warnf(new NoStackTraceTestException(), "foobar", new Object());
+        Log.warnf("foobar", new Object(), new Object());
+        Log.warnf(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.warnf(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.warnf("foobar", new Object(), new Object(), new Object());
+        Log.warnf(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+        Log.warnv("foobar", new Object[] {});
+        Log.warnv("foobar", new Object());
+        Log.warnv("foobar", new Object(), new Object());
+        Log.warnv(new NoStackTraceTestException(), "foobar", new Object[] {});
+        Log.warnv(new NoStackTraceTestException(), "foobar", new Object());
+        Log.warnv(new NoStackTraceTestException(), "foobar", new Object(), new Object());
+        Log.warnv("foobar", new Object(), new Object(), new Object());
+        Log.warnv(new NoStackTraceTestException(), "foobar", new Object(), new Object(), new Object());
+    }
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java
new file mode 100644
index 00000000000000..d137a47414e51f
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingBean.java
@@ -0,0 +1,41 @@
+package io.quarkus.logging;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Singleton;
+
+@Singleton
+public class LoggingBean {
+    // not final to prevent constant inlining
+    private static String msg = "Heya!";
+
+    static {
+        Log.info(msg);
+    }
+
+    @PostConstruct
+    public void setup() {
+        Log.tracef("%s created", LoggingBean.class.getSimpleName());
+    }
+
+    public void doSomething() {
+        if (Log.isDebugEnabled()) {
+            Log.debug("starting massive computation");
+        }
+
+        Log.debugf("one: %d", 42);
+        Log.tracef("two: %d | %d", 42, 13);
+        Log.debugf("three: %d | %d | %d", 42, 13, 1);
+
+        Log.debugv("one: {0}", "foo");
+        Log.infov("two: {0} | {1}", "foo", "bar");
+        Log.warnv("three: {0} | {1} | {2}", "foo", "bar", "baz");
+        Log.errorv("four: {0} | {1} | {2} | {3}", "foo", "bar", "baz", "quux");
+
+        Exception error = new NoStackTraceTestException();
+
+        Log.warnv(error, "{0} | {1} | {2} | {3}", "foo", "bar", "baz", "quux");
+
+        Log.error("Hello Error", error);
+    }
+
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java
new file mode 100644
index 00000000000000..8fe56a9d405dca
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingEndpoint.java
@@ -0,0 +1,13 @@
+package io.quarkus.logging;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/logging")
+public class LoggingEndpoint {
+    @GET
+    public String hello() {
+        Log.info("hello");
+        return "hello";
+    }
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java
new file mode 100644
index 00000000000000..c382c1c259d288
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheDevModeTest.java
@@ -0,0 +1,47 @@
+package io.quarkus.logging;
+
+import static io.restassured.RestAssured.when;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+import java.util.logging.Formatter;
+import java.util.stream.Collectors;
+
+import org.jboss.logmanager.formatters.PatternFormatter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+
+public class LoggingWithPanacheDevModeTest {
+    @RegisterExtension
+    static final QuarkusDevModeTest TEST = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(LoggingEndpoint.class))
+            .setLogRecordPredicate(record -> "io.quarkus.logging.LoggingEndpoint".equals(record.getLoggerName()));
+
+    @Test
+    public void testRepositoryIsReloaded() {
+        Formatter formatter = new PatternFormatter("[%p] %m");
+
+        {
+            when().get("/logging").then().body(is("hello"));
+
+            List lines = TEST.getLogRecords().stream().map(formatter::format).collect(Collectors.toList());
+            assertThat(lines).containsExactly("[INFO] hello");
+            TEST.clearLogRecords();
+        }
+
+        TEST.modifySourceFile("LoggingEndpoint.java", s -> s.replace("hello", "hi"));
+
+        {
+            when().get("/logging").then().body(is("hi"));
+
+            List lines = TEST.getLogRecords().stream().map(formatter::format).collect(Collectors.toList());
+            assertThat(lines).containsExactly("[INFO] hi");
+            TEST.clearLogRecords();
+        }
+    }
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java
new file mode 100644
index 00000000000000..044257cf5fabcc
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheGeneratedTest.java
@@ -0,0 +1,24 @@
+package io.quarkus.logging;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LoggingWithPanacheGeneratedTest {
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(GeneratedBean.class, NoStackTraceTestException.class))
+            .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".min-level", "TRACE")
+            .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".level", "TRACE");
+
+    @Test
+    public void test() {
+        new GeneratedBean().testLogging();
+        // no asserts, this test only verifies that all Log methods can be successfully invoked
+        // (in other words, that the bytecode transformation isn't horribly broken)
+    }
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java
new file mode 100644
index 00000000000000..52b8d433aa00c9
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/LoggingWithPanacheTest.java
@@ -0,0 +1,53 @@
+package io.quarkus.logging;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+import java.util.logging.Formatter;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.jboss.logmanager.formatters.PatternFormatter;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class LoggingWithPanacheTest {
+    @RegisterExtension
+    static final QuarkusUnitTest test = new QuarkusUnitTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(LoggingBean.class, NoStackTraceTestException.class))
+            .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".min-level", "TRACE")
+            .overrideConfigKey("quarkus.log.category.\"io.quarkus.logging\".level", "TRACE")
+            .setLogRecordPredicate(record -> "io.quarkus.logging.LoggingBean".equals(record.getLoggerName()))
+            .assertLogRecords(records -> {
+                Formatter formatter = new PatternFormatter("[%p] %m");
+                List lines = records.stream().map(formatter::format).map(String::trim).collect(Collectors.toList());
+
+                assertThat(lines).containsExactly(
+                        "[INFO] Heya!",
+                        "[TRACE] LoggingBean created",
+                        "[DEBUG] starting massive computation",
+                        "[DEBUG] one: 42",
+                        "[TRACE] two: 42 | 13",
+                        "[DEBUG] three: 42 | 13 | 1",
+                        "[DEBUG] one: foo",
+                        "[INFO] two: foo | bar",
+                        "[WARN] three: foo | bar | baz",
+                        "[ERROR] four: foo | bar | baz | quux",
+                        "[WARN] foo | bar | baz | quux: io.quarkus.logging.NoStackTraceTestException",
+                        "[ERROR] Hello Error: io.quarkus.logging.NoStackTraceTestException");
+            });
+
+    @Inject
+    LoggingBean bean;
+
+    @Test
+    public void test() {
+        bean.doSomething();
+    }
+}
diff --git a/integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java
new file mode 100644
index 00000000000000..9a3cf887ea1e9d
--- /dev/null
+++ b/integration-tests/logging-panache/src/test/java/io/quarkus/logging/NoStackTraceTestException.java
@@ -0,0 +1,8 @@
+package io.quarkus.logging;
+
+public class NoStackTraceTestException extends RuntimeException {
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+        return this;
+    }
+}
diff --git a/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java
new file mode 100644
index 00000000000000..93dd2b62228804
--- /dev/null
+++ b/integration-tests/main/src/main/java/io/quarkus/it/websocket/AddWebSocketHandler.java
@@ -0,0 +1,41 @@
+package io.quarkus.it.websocket;
+
+import javax.enterprise.inject.spi.DeploymentException;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+import javax.websocket.Endpoint;
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
+import javax.websocket.server.ServerContainer;
+import javax.websocket.server.ServerEndpointConfig;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@WebListener
+public class AddWebSocketHandler implements ServletContextListener {
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+    }
+
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        try {
+            ((ServerContainer) sce.getServletContext().getAttribute(ServerContainer.class.getName()))
+                    .addEndpoint(ServerEndpointConfig.Builder.create(WebSocketEndpoint.class, "/added-dynamic").build());
+
+        } catch (DeploymentException | javax.websocket.DeploymentException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @RegisterForReflection
+    public static class WebSocketEndpoint extends Endpoint {
+
+        @Override
+        public void onOpen(Session session, EndpointConfig config) {
+            session.getAsyncRemote().sendText("DYNAMIC");
+        }
+
+    }
+}
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java
index 62110d4baeb4ad..8c32cf33add5ce 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/JaxbTestCase.java
@@ -2,11 +2,6 @@
 
 import static org.hamcrest.Matchers.contains;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusTest;
@@ -15,27 +10,9 @@
 @QuarkusTest
 public class JaxbTestCase {
 
-    private static final AtomicInteger count = new AtomicInteger(0);
-
-    @BeforeEach
-    public void beforeInEnclosing() {
-        count.incrementAndGet();
+    @Test
+    public void testNews() {
+        RestAssured.when().get("/test/jaxb/getnews").then()
+                .body("author", contains("Emmanuel Bernard"));
     }
-
-    @Nested
-    class SomeClass {
-
-        @BeforeEach
-        public void beforeInTest() {
-            count.incrementAndGet();
-        }
-
-        @Test
-        public void testNews() {
-            RestAssured.when().get("/test/jaxb/getnews").then()
-                    .body("author", contains("Emmanuel Bernard"));
-            Assertions.assertEquals(2, count.get());
-        }
-    }
-
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
index 404630cb8cec56..80983c0f53bc08 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestCallbacksTestCase.java
@@ -3,11 +3,19 @@
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+import java.lang.reflect.Method;
 
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
@@ -22,11 +30,46 @@
 @QuarkusTest
 public class QuarkusTestCallbacksTestCase {
 
+    @BeforeAll
+    static void beforeAllWithTestInfo(TestInfo testInfo) {
+        checkBeforeOrAfterAllTestInfo(testInfo);
+    }
+
+    @AfterAll
+    static void afterAllWithTestInfo(TestInfo testInfo) {
+        checkBeforeOrAfterAllTestInfo(testInfo);
+    }
+
+    private static void checkBeforeOrAfterAllTestInfo(TestInfo testInfo) {
+        assertNotNull(testInfo);
+        assertEquals(QuarkusTestCallbacksTestCase.class, testInfo.getTestClass().get());
+        assertFalse(testInfo.getTestMethod().isPresent());
+    }
+
+    @BeforeEach
+    void beforeEachWithTestInfo(TestInfo testInfo) throws NoSuchMethodException {
+        checkBeforeOrAfterEachTestInfo(testInfo, "beforeEachWithTestInfo");
+    }
+
+    @AfterEach
+    void afterEachWithTestInfo(TestInfo testInfo) throws NoSuchMethodException {
+        checkBeforeOrAfterEachTestInfo(testInfo, "afterEachWithTestInfo");
+    }
+
+    private void checkBeforeOrAfterEachTestInfo(TestInfo testInfo, String unexpectedMethodName) throws NoSuchMethodException {
+        assertNotNull(testInfo);
+        String testMethodName = testInfo.getTestMethod().get().getName();
+        assertNotEquals(testMethodName,
+                QuarkusTestCallbacksTestCase.class.getDeclaredMethod(unexpectedMethodName, TestInfo.class));
+        assertTrue(testMethodName.startsWith("test"));
+        assertEquals(QuarkusTestCallbacksTestCase.class, testInfo.getTestClass().get());
+    }
+
     @Test
     @TestAnnotation
     @Order(1)
     public void testTestMethodHasAnnotation() {
-
+        assertTrue(SimpleAnnotationCheckerBeforeEachCallback.testAnnotationChecked);
     }
 
     @Test
@@ -36,11 +79,14 @@ public void testBeforeClass() {
     }
 
     @Test
+    @TestAnnotation
     @Order(3)
     public void testInfoTestCase(TestInfo testInfo) throws NoSuchMethodException {
-        Assertions.assertEquals(testInfo.getTestClass().get(), QuarkusTestCallbacksTestCase.class);
-        Assertions.assertEquals(testInfo.getTestMethod().get(),
-                QuarkusTestCallbacksTestCase.class.getDeclaredMethod("testInfoTestCase", TestInfo.class));
+        assertEquals(testInfo.getTestClass().get(), QuarkusTestCallbacksTestCase.class);
+        Method testMethod = testInfo.getTestMethod().get();
+        assertEquals(testMethod, QuarkusTestCallbacksTestCase.class.getDeclaredMethod("testInfoTestCase", TestInfo.class));
+        assertEquals(1, testMethod.getAnnotationsByType(TestAnnotation.class).length);
+        assertEquals(QuarkusTestCallbacksTestCase.class, testInfo.getTestClass().get());
     }
 
     @Target({ METHOD })
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java
new file mode 100644
index 00000000000000..30bb5e2fc1430e
--- /dev/null
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/QuarkusTestNestedTestCase.java
@@ -0,0 +1,127 @@
+package io.quarkus.it.main;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+/**
+ * Tests {@link Nested} support of {@link QuarkusTest}. Notes:
+ * 
      
+ * 
    • to avoid unexpected execution order, don't use surefire's {@code -Dtest=...}, use {@code -Dgroups=nested} instead
      • 
+ * 
    • order of nested test classes is reversed by JUnit (and there's no way to enforce a specific order)
      • 
+ * 
    
+ */
+@QuarkusTest
+@Tag("nested")
+public class QuarkusTestNestedTestCase {
+
+    private static final AtomicInteger COUNT_BEFORE_ALL = new AtomicInteger(0);
+    private static final AtomicInteger COUNT_BEFORE_EACH = new AtomicInteger(0);
+    private static final AtomicInteger COUNT_TEST = new AtomicInteger(0);
+    private static final AtomicInteger COUNT_AFTER_EACH = new AtomicInteger(0);
+    private static final AtomicInteger COUNT_AFTER_ALL = new AtomicInteger(0);
+
+    @BeforeAll
+    static void beforeAll() {
+        COUNT_BEFORE_ALL.incrementAndGet();
+    }
+
+    @BeforeEach
+    void beforeEach() {
+        COUNT_BEFORE_EACH.incrementAndGet();
+    }
+
+    @Test
+    void test() {
+        assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
+        assertEquals(1, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+        assertEquals(0, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+        assertEquals(0, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+        assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
+    }
+
+    @Nested
+    @TestMethodOrder(OrderAnnotation.class)
+    class FirstNested {
+
+        @BeforeEach
+        void beforeEach() {
+            COUNT_BEFORE_EACH.incrementAndGet();
+        }
+
+        @Test
+        @Order(1)
+        void testOne() {
+            assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
+            assertEquals(5, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(2, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(3, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
+        }
+
+        @Test
+        @Order(2)
+        void testTwo() {
+            assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
+            assertEquals(7, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(3, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(5, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
+        }
+
+        @AfterEach
+        void afterEach() {
+            COUNT_AFTER_EACH.incrementAndGet();
+        }
+    }
+
+    @Nested
+    class SecondNested {
+
+        @BeforeEach
+        void beforeEach() {
+            COUNT_BEFORE_EACH.incrementAndGet();
+        }
+
+        @Test
+        void testOne() {
+            assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
+            assertEquals(3, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+            assertEquals(1, COUNT_TEST.getAndIncrement(), "COUNT_TEST");
+            assertEquals(1, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+            assertEquals(0, COUNT_AFTER_ALL.get(), "COUNT_AFTER_ALL");
+        }
+
+        @AfterEach
+        void afterEach() {
+            COUNT_AFTER_EACH.incrementAndGet();
+        }
+    }
+
+    @AfterEach
+    void afterEach() {
+        COUNT_AFTER_EACH.incrementAndGet();
+    }
+
+    @AfterAll
+    static void afterAll() {
+        assertEquals(1, COUNT_BEFORE_ALL.get(), "COUNT_BEFORE_ALL");
+        assertEquals(7, COUNT_BEFORE_EACH.get(), "COUNT_BEFORE_EACH");
+        assertEquals(4, COUNT_TEST.get(), "COUNT_TEST");
+        assertEquals(7, COUNT_AFTER_EACH.get(), "COUNT_AFTER_EACH");
+        assertEquals(0, COUNT_AFTER_ALL.getAndIncrement(), "COUNT_AFTER_ALL");
+    }
+}
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java b/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java
index 85927763f10852..8e9447609046b7 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/SimpleAnnotationCheckerBeforeEachCallback.java
@@ -7,6 +7,8 @@
 
 public class SimpleAnnotationCheckerBeforeEachCallback implements QuarkusTestBeforeEachCallback {
 
+    static boolean testAnnotationChecked;
+
     @Override
     public void beforeEach(QuarkusTestMethodContext context) {
         // make sure that this comes into play only for the test we care about
@@ -26,5 +28,6 @@ public void beforeEach(QuarkusTestMethodContext context) {
             throw new IllegalStateException(
                     "Expected to find annotation @TestAnnotation on method test method testTestMethodHasAnnotation");
         }
+        testAnnotationChecked = true;
     }
 }
diff --git a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java
index 2fcf61f794671c..e92668b8eb883a 100644
--- a/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java
+++ b/integration-tests/main/src/test/java/io/quarkus/it/main/WebsocketTestCase.java
@@ -32,6 +32,8 @@ public class WebsocketTestCase {
 
     @TestHTTPResource("wsopen")
     URI openURI;
+    @TestHTTPResource("added-dynamic")
+    URI added;
 
     @Test
     public void websocketTest() throws Exception {
@@ -57,6 +59,29 @@ public void onMessage(String s) {
         }
     }
 
+    @Test
+    public void addedWebSocketTest() throws Exception {
+
+        LinkedBlockingDeque message = new LinkedBlockingDeque<>();
+        Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() {
+            @Override
+            public void onOpen(Session session, EndpointConfig endpointConfig) {
+                session.addMessageHandler(new MessageHandler.Whole() {
+                    @Override
+                    public void onMessage(String s) {
+                        message.add(s);
+                    }
+                });
+            }
+        }, ClientEndpointConfig.Builder.create().build(), added);
+
+        try {
+            Assertions.assertEquals("DYNAMIC", message.poll(20, TimeUnit.SECONDS));
+        } finally {
+            session.close();
+        }
+    }
+
     @Test
     public void websocketServerEncodingAndDecodingTest() throws Exception {
         LinkedBlockingDeque message = new LinkedBlockingDeque<>();
diff --git a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
index 22e5190d88f323..012b5d4a15cda9 100644
--- a/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
+++ b/integration-tests/maven/src/test/java/io/quarkus/maven/it/DevMojoIT.java
@@ -141,7 +141,7 @@ public void testCommandModeAppSystemPropArguments() throws MavenInvocationExcept
         run(false, "-Dquarkus.args='1 2'");
 
         // Wait until this file exists
-        final File done = new File(testDir, "target/done.txt");
+        final File done = new File(testDir, "done.txt");
         await()
                 .pollDelay(1, TimeUnit.SECONDS)
                 .atMost(20, TimeUnit.MINUTES).until(() -> done.exists());
@@ -159,7 +159,7 @@ public void testCommandModeAppPomConfigArguments() throws MavenInvocationExcepti
         run(false);
 
         // Wait until this file exists
-        final File done = new File(testDir, "target/done.txt");
+        final File done = new File(testDir, "done.txt");
         await()
                 .pollDelay(1, TimeUnit.SECONDS)
                 .atMost(20, TimeUnit.MINUTES).until(() -> done.exists());
@@ -817,7 +817,7 @@ public void testThatAddingConfigFileWorksCorrectly() throws MavenInvocationExcep
     @Test
     public void testThatExternalConfigOverridesConfigInJar() throws MavenInvocationException, IOException {
         testDir = initProject("projects/classic", "projects/project-classic-external-config");
-        File configurationFile = new File(testDir, "target/config/application.properties");
+        File configurationFile = new File(testDir, "config/application.properties");
         assertThat(configurationFile).doesNotExist();
 
         String uuid = UUID.randomUUID().toString();
diff --git a/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java
new file mode 100644
index 00000000000000..721e384a04300b
--- /dev/null
+++ b/integration-tests/micrometer-prometheus/src/main/java/io/quarkus/it/micrometer/prometheus/PathTemplateResource.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.micrometer.prometheus;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("template/path/{value}")
+public class PathTemplateResource {
+    @GET
+    public String get(@PathParam("value") String value) {
+        return "Received: " + value;
+    }
+}
diff --git a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java
index 595ed7ed54bfa7..2a76940f1e80d6 100644
--- a/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java
+++ b/integration-tests/micrometer-prometheus/src/test/java/io/quarkus/it/micrometer/prometheus/PrometheusMetricsRegistryTest.java
@@ -77,6 +77,13 @@ void testAllTheThings() {
                 .body(containsString("OK"));
     }
 
+    @Test
+    @Order(9)
+    void testTemplatedPathOnClass() {
+        when().get("/template/path/anything").then().statusCode(200)
+                .body(containsString("Received: anything"));
+    }
+
     @Test
     @Order(10)
     void testPrometheusScrapeEndpoint() {
@@ -103,6 +110,9 @@ void testPrometheusScrapeEndpoint() {
                 .body(containsString("uri=\"/message/match/{id}/{sub}\""))
                 .body(containsString("uri=\"/message/match/{other}\""))
 
+                .body(containsString(
+                        "http_server_requests_seconds_count{env=\"test\",method=\"GET\",outcome=\"SUCCESS\",registry=\"prometheus\",status=\"200\",uri=\"/template/path/{value}\""))
+
                 // Verify Hibernate Metrics
                 .body(containsString(
                         "hibernate_sessions_open_total{entityManagerFactory=\"\",env=\"test\",registry=\"prometheus\",} 2.0"))
diff --git a/integration-tests/mongodb-rest-data-panache/pom.xml b/integration-tests/mongodb-rest-data-panache/pom.xml
index 089a5ffe772bd8..b116d479fa6a60 100644
--- a/integration-tests/mongodb-rest-data-panache/pom.xml
+++ b/integration-tests/mongodb-rest-data-panache/pom.xml
@@ -19,7 +19,7 @@
             
         
             io.quarkus
-            quarkus-resteasy-jackson
+            quarkus-resteasy-reactive-jackson
         
         
         
@@ -63,7 +63,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jackson-deployment
+            quarkus-resteasy-reactive-jackson-deployment
             ${project.version}
             pom
             test
diff --git a/integration-tests/oidc-token-propagation/src/main/resources/application.properties b/integration-tests/oidc-token-propagation/src/main/resources/application.properties
index c2e276a45a68b0..13ecaa4fad55ed 100644
--- a/integration-tests/oidc-token-propagation/src/main/resources/application.properties
+++ b/integration-tests/oidc-token-propagation/src/main/resources/application.properties
@@ -3,6 +3,7 @@ quarkus.oidc.client-id=quarkus-app
 quarkus.oidc.credentials.secret=secret
 
 quarkus.keycloak.devservices.java-opts=-Dkeycloak.profile.feature.token_exchange=enabled -Dkeycloak.profile=preview
+quarkus.keycloak.devservices.create-realm=false
 
 quarkus.oidc-client.auth-server-url=${quarkus.oidc.auth-server-url}
 quarkus.oidc-client.client-id=${quarkus.oidc.client-id}
diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
index 02d1fd7c861ab5..26d39e7a99ac95 100644
--- a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
+++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/KeycloakRealmResourceManager.java
@@ -1,31 +1,26 @@
 package io.quarkus.it.keycloak;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.keycloak.representations.AccessTokenResponse;
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.RoleRepresentation;
 import org.keycloak.representations.idm.RolesRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.util.JsonSerialization;
 
 import io.quarkus.test.common.DevServicesContext;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-import io.restassured.RestAssured;
+import io.quarkus.test.keycloak.client.KeycloakTestClient;
 
 public class KeycloakRealmResourceManager implements QuarkusTestResourceLifecycleManager, DevServicesContext.ContextAware {
 
     private static final String KEYCLOAK_REALM = "quarkus";
-    String authServerUrl;
+    final KeycloakTestClient client = new KeycloakTestClient();
 
     @Override
     public Map start() {
@@ -40,41 +35,10 @@ public Map start() {
         realm.getUsers().add(createUser("alice", "user"));
         realm.getUsers().add(createUser("bob", "user"));
 
-        try {
-            //dev services sets up a realm for us, we delete it because we want different settings
-            RestAssured
-                    .given()
-                    .auth().oauth2(getAdminAccessToken())
-                    .contentType("application/json")
-                    .when()
-                    .delete(authServerUrl + "/admin/realms/quarkus").then()
-                    .statusCode(204);
-            RestAssured
-                    .given()
-                    .auth().oauth2(getAdminAccessToken())
-                    .contentType("application/json")
-                    .body(JsonSerialization.writeValueAsBytes(realm))
-                    .when()
-                    .post(authServerUrl + "/admin/realms").then()
-                    .statusCode(201);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        client.createRealm(realm);
         return Collections.emptyMap();
     }
 
-    private String getAdminAccessToken() {
-        return RestAssured
-                .given()
-                .param("grant_type", "password")
-                .param("username", "admin")
-                .param("password", "admin")
-                .param("client_id", "admin-cli")
-                .when()
-                .post(authServerUrl + "/realms/master/protocol/openid-connect/token")
-                .as(AccessTokenResponse.class).getToken();
-    }
-
     private RealmRepresentation createRealm(String name) {
         RealmRepresentation realm = new RealmRepresentation();
 
@@ -131,22 +95,11 @@ private UserRepresentation createUser(String username, String... realmRoles) {
 
     @Override
     public void stop() {
-
-        RestAssured
-                .given()
-                .auth().oauth2(getAdminAccessToken())
-                .when()
-                .delete(authServerUrl + "/admin/realms/" + KEYCLOAK_REALM).then().statusCode(204);
+        client.deleteRealm(KEYCLOAK_REALM);
     }
 
     @Override
     public void setIntegrationTestContext(DevServicesContext context) {
-        try {
-            var uri = new URI(context.devServicesProperties().get("quarkus.oidc.auth-server-url"));
-            authServerUrl = new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), "/auth", null, null)
-                    .toString();
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
+        client.setIntegrationTestContext(context);
     }
 }
diff --git a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
index 758e65299401cc..1f025d7793c838 100644
--- a/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
+++ b/integration-tests/oidc-token-propagation/src/test/java/io/quarkus/it/keycloak/OidcTokenPropagationTest.java
@@ -7,7 +7,7 @@
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.keycloak.server.KeycloakTestClient;
+import io.quarkus.test.keycloak.client.KeycloakTestClient;
 import io.restassured.RestAssured;
 
 @QuarkusTest
diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResource.java
new file mode 100644
index 00000000000000..d5157221fb035e
--- /dev/null
+++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResource.java
@@ -0,0 +1,4 @@
+package io.quarkus.it.keycloak;
+
+public class HelloResource extends HelloResourceBase implements IHelloResource {
+}
diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java
new file mode 100644
index 00000000000000..aa7859e257b273
--- /dev/null
+++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/HelloResourceBase.java
@@ -0,0 +1,11 @@
+package io.quarkus.it.keycloak;
+
+import javax.annotation.security.RolesAllowed;
+
+@RolesAllowed("user")
+public class HelloResourceBase {
+
+    public String hello() {
+        return "hello";
+    }
+}
diff --git a/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java
new file mode 100644
index 00000000000000..93b11ca35c0dee
--- /dev/null
+++ b/integration-tests/oidc/src/main/java/io/quarkus/it/keycloak/IHelloResource.java
@@ -0,0 +1,14 @@
+package io.quarkus.it.keycloak;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/hello")
+public interface IHelloResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    String hello();
+}
diff --git a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceIT.java b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceIT.java
new file mode 100644
index 00000000000000..ed022787b266ed
--- /dev/null
+++ b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceIT.java
@@ -0,0 +1,7 @@
+package io.quarkus.it.keycloak;
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class HelloResourceIT extends HelloResourceTest {
+}
diff --git a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceTest.java b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceTest.java
new file mode 100644
index 00000000000000..da5aec4380acf3
--- /dev/null
+++ b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/HelloResourceTest.java
@@ -0,0 +1,18 @@
+package io.quarkus.it.keycloak;
+
+import static io.restassured.RestAssured.when;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class HelloResourceTest {
+
+    @Test
+    public void testHelloEndpoint() {
+        when().get("/hello")
+                .then()
+                .statusCode(401);
+    }
+}
diff --git a/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java
new file mode 100644
index 00000000000000..323cd0119a6838
--- /dev/null
+++ b/integration-tests/opentelemetry/src/main/java/io/quarkus/it/opentelemetry/PathTemplateResource.java
@@ -0,0 +1,13 @@
+package io.quarkus.it.opentelemetry;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+
+@Path("template/path/{value}")
+public class PathTemplateResource {
+    @GET
+    public String get(@PathParam("value") String value) {
+        return "Received: " + value;
+    }
+}
diff --git a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java
index 70f3ccfdd51621..9d203cf3c13f37 100644
--- a/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java
+++ b/integration-tests/opentelemetry/src/test/java/io/quarkus/it/opentelemetry/OpenTelemetryTestCase.java
@@ -708,6 +708,43 @@ void testAsyncClientTracing() {
         Assertions.assertTrue(clientServerFound);
     }
 
+    @Test
+    void testTemplatedPathOnClass() {
+        resetExporter();
+
+        given()
+                .contentType("application/json")
+                .when().get("/template/path/something")
+                .then()
+                .statusCode(200)
+                .body(containsString("Received: something"));
+
+        Awaitility.await().atMost(Duration.ofMinutes(2)).until(() -> getSpans().size() == 1);
+        Map spanData = getSpans().get(0);
+        Assertions.assertNotNull(spanData);
+        Assertions.assertNotNull(spanData.get("spanId"));
+
+        verifyResource(spanData);
+
+        Assertions.assertEquals("template/path/{value}", spanData.get("name"));
+        Assertions.assertEquals(SpanKind.SERVER.toString(), spanData.get("kind"));
+        Assertions.assertTrue((Boolean) spanData.get("ended"));
+
+        Assertions.assertEquals(SpanId.getInvalid(), spanData.get("parent_spanId"));
+        Assertions.assertEquals(TraceId.getInvalid(), spanData.get("parent_traceId"));
+        Assertions.assertFalse((Boolean) spanData.get("parent_valid"));
+        Assertions.assertFalse((Boolean) spanData.get("parent_remote"));
+
+        Assertions.assertEquals("GET", spanData.get("attr_http.method"));
+        Assertions.assertEquals("1.1", spanData.get("attr_http.flavor"));
+        Assertions.assertEquals("/template/path/something", spanData.get("attr_http.target"));
+        Assertions.assertEquals(directUrl.getAuthority(), spanData.get("attr_http.host"));
+        Assertions.assertEquals("http", spanData.get("attr_http.scheme"));
+        Assertions.assertEquals("200", spanData.get("attr_http.status_code"));
+        Assertions.assertNotNull(spanData.get("attr_http.client_ip"));
+        Assertions.assertNotNull(spanData.get("attr_http.user_agent"));
+    }
+
     private void verifyResource(Map spanData) {
         Assertions.assertEquals("opentelemetry-integration-test", spanData.get("resource_service.name"));
         Assertions.assertEquals("999-SNAPSHOT", spanData.get("resource_service.version"));
diff --git a/integration-tests/picocli-native/pom.xml b/integration-tests/picocli-native/pom.xml
index 6c6edd06efa854..0b92365a2fb868 100644
--- a/integration-tests/picocli-native/pom.xml
+++ b/integration-tests/picocli-native/pom.xml
@@ -13,10 +13,6 @@
     Quarkus - Integration Tests - Picocli Native
     Module that contains Picocli test with native test
     
-        
-            io.quarkus
-            quarkus-resteasy
-        
         
             io.quarkus
             quarkus-picocli
@@ -32,11 +28,6 @@
             quarkus-junit5
             test
         
-        
-            io.rest-assured
-            rest-assured
-            test
-        
 
         
         
@@ -52,19 +43,6 @@
                 
             
         
-        
-            io.quarkus
-            quarkus-resteasy-deployment
-            ${project.version}
-            pom
-            test
-            
-                
-                    *
-                    *
-                
-            
-        
     
 
     
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java
index c3e435dcf87605..574c0d3140c30b 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/ChildOfParentCommand.java
@@ -1,7 +1,5 @@
 package io.quarkus.it.picocli;
 
-import org.assertj.core.api.Assertions;
-
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "child")
@@ -12,6 +10,6 @@ public class ChildOfParentCommand implements Runnable {
 
     @Override
     public void run() {
-        Assertions.assertThat(parent.parentValue).isEqualTo("testValue");
+        System.out.println(parent.parentValue);
     }
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java
index 61e22bc493d8a8..72170aef4c9d50 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CommandUsedAsParent.java
@@ -2,7 +2,7 @@
 
 import picocli.CommandLine;
 
-@CommandLine.Command(subcommands = ChildOfParentCommand.class)
+@CommandLine.Command(subcommands = ChildOfParentCommand.class, name = "command-used-as-parent")
 public class CommandUsedAsParent {
 
     @CommandLine.Option(names = "-p", description = "Value read by child command.")
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java
index 8d3cb97820bfb9..5e256680c1c5e8 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CompletionReflectionCommand.java
@@ -23,4 +23,4 @@ public Iterator iterator() {
             return Arrays.asList("one", "two").iterator();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java
index eff3cceedcff20..58fcb2dd5191af 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/CustomDefaultValueProvider.java
@@ -7,6 +7,6 @@ public class CustomDefaultValueProvider implements IDefaultValueProvider {
 
     @Override
     public String defaultValue(ArgSpec argSpec) throws Exception {
-        return "false";
+        return "default-value";
     }
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java
index 5b22fce355b87a..5906b6de8872f2 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DefaultValueProviderCommand.java
@@ -2,11 +2,15 @@
 
 import picocli.CommandLine;
 
-@CommandLine.Command(name = "defaultvalueprovider", mixinStandardHelpOptions = true, defaultValueProvider = CustomDefaultValueProvider.class)
+@CommandLine.Command(name = "default-value-provider", mixinStandardHelpOptions = false, defaultValueProvider = CustomDefaultValueProvider.class)
 public class DefaultValueProviderCommand implements Runnable {
 
+    @CommandLine.Option(names = "--defaulted")
+    String defaulted;
+
     @Override
     public void run() {
+        System.out.println("default:" + defaulted);
     }
 
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java
new file mode 100644
index 00000000000000..7fda7767a654e6
--- /dev/null
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicProxyInvokerCommand.java
@@ -0,0 +1,19 @@
+package io.quarkus.it.picocli;
+
+import javax.inject.Inject;
+
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "dynamic-proxy")
+public class DynamicProxyInvokerCommand implements Runnable {
+    @Inject
+    CommandLine.IFactory factory;
+
+    @Override
+    public void run() {
+        CommandLine cmd = new CommandLine(DynamicProxyCommand.class, factory);
+        cmd.parseArgs("-t", "2007-12-03T10:15:30");
+        DynamicProxyCommand parsedCommand = cmd.getCommand();
+        System.out.println(parsedCommand.time());
+    }
+}
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java
index c008b2dc3ff6cd..63269d32b55143 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/DynamicVersionProviderCommand.java
@@ -1,6 +1,6 @@
 package io.quarkus.it.picocli;
 
-import org.assertj.core.api.Assertions;
+import java.util.Arrays;
 
 import picocli.CommandLine;
 
@@ -12,6 +12,6 @@ public class DynamicVersionProviderCommand implements Runnable {
 
     @Override
     public void run() {
-        Assertions.assertThat(commandSpec.version()).containsExactly("quarkus version 1.0");
+        System.out.println(Arrays.toString(commandSpec.version()));
     }
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java
index fdb7429ad80379..6e7e1785e091ed 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandOne.java
@@ -2,8 +2,9 @@
 
 import picocli.CommandLine;
 
-@CommandLine.Command(resourceBundle = "i18s.LocalizedCommandOne")
+@CommandLine.Command(name = "localized-command-one", mixinStandardHelpOptions = true, resourceBundle = "i18s.LocalizedCommandOne")
 public class LocalizedCommandOne {
     @CommandLine.Option(names = "--first")
     String firstOption;
+
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java
index 71f3da76c870f2..66be63ed7914f6 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/LocalizedCommandTwo.java
@@ -2,7 +2,7 @@
 
 import picocli.CommandLine;
 
-@CommandLine.Command(resourceBundle = "i18s.LocalizedCommandTwo")
+@CommandLine.Command(name = "localized-command-two", mixinStandardHelpOptions = true, resourceBundle = "i18s.LocalizedCommandTwo")
 public class LocalizedCommandTwo {
     @CommandLine.Option(names = "--first")
     String firstOption;
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java
deleted file mode 100644
index 2602f186ad12d6..00000000000000
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/Main.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.quarkus.it.picocli;
-
-import io.quarkus.runtime.Quarkus;
-import io.quarkus.runtime.QuarkusApplication;
-import io.quarkus.runtime.annotations.QuarkusMain;
-
-@QuarkusMain
-public class Main implements QuarkusApplication {
-    @Override
-    public int run(String... args) throws Exception {
-        // just wait for test execution to finish.
-        Quarkus.waitForExit();
-        return 0;
-    }
-}
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java
index ab6399bce7959d..ce983d4e00229e 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/MutuallyExclusiveOptionsCommand.java
@@ -3,11 +3,18 @@
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "exclusivedemo")
-public class MutuallyExclusiveOptionsCommand {
+public class MutuallyExclusiveOptionsCommand implements Runnable {
 
     @CommandLine.ArgGroup(exclusive = true, multiplicity = "1")
     Exclusive exclusive;
 
+    @Override
+    public void run() {
+        System.out.println("-a:" + exclusive.a);
+        System.out.println("-b:" + exclusive.b);
+        System.out.println("-c:" + exclusive.c);
+    }
+
     static class Exclusive {
         @CommandLine.Option(names = "-a", required = true)
         int a;
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java
index 71c188c2420b7d..9ad798ff02d1ee 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestCommand.java
@@ -2,12 +2,14 @@
 
 import java.net.InetAddress;
 import java.net.Proxy;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 import picocli.CommandLine;
 
-@CommandLine.Command(description = "Basic Tests for reflection.")
-public class TestCommand extends BaseTestCommand {
+@CommandLine.Command(name = "test-command", description = "Basic Tests for reflection.")
+public class TestCommand extends BaseTestCommand implements Callable {
 
     @CommandLine.Option(names = { "-p", "--private" }, description = "Test private field access.")
     private String privateEntry;
@@ -24,4 +26,13 @@ public class TestCommand extends BaseTestCommand {
     public String getPrivateEntry() {
         return privateEntry;
     }
+
+    @Override
+    public Integer call() throws Exception {
+        System.out.println("-p:" + privateEntry);
+        System.out.println("-s:" + status);
+        System.out.println("-h:" + proxies);
+        System.out.println("positional:" + Arrays.toString(positional));
+        return 0;
+    }
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java
deleted file mode 100644
index 6c6f9d7d0f8615..00000000000000
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TestResource.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package io.quarkus.it.picocli;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.Proxy;
-import java.net.UnknownHostException;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import org.assertj.core.api.Assertions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import picocli.CommandLine;
-
-@Path("/picocli/test")
-public class TestResource {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestResource.class);
-
-    private final CommandLine.IFactory factory;
-
-    @Inject
-    public TestResource(CommandLine.IFactory factory) {
-        this.factory = factory;
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_PLAIN)
-    public String getTestResults() throws UnknownHostException {
-        testBasicReflection();
-        testMethodSubCommand();
-        testParentCommand();
-        testCommandWithArgGroup();
-        testDynamicProxy();
-        testDynamicVersionProvider();
-        testUnmatched();
-        testI18s();
-        testCompletionReflection();
-        testDefaultValueProvider();
-        return "OK";
-    }
-
-    private void testBasicReflection() throws UnknownHostException {
-        CommandLine cmd = new CommandLine(TestCommand.class, factory);
-        CommandLine.ParseResult parseResult = cmd.parseArgs("-f", "test.txt", "-f", "test2.txt", "-f", "test3.txt", "-s",
-                "ERROR", "-h", "SOCKS=5.5.5.5", "-p", "privateValue", "pos1", "pos2");
-        TestCommand parsedCommand = cmd.getCommand();
-        Assertions.assertThat(parsedCommand.status).isEqualTo(Status.ERROR);
-        Assertions.assertThat(parsedCommand.proxies)
-                .containsOnly(Assertions.entry(Proxy.Type.SOCKS, InetAddress.getByAddress(new byte[] { 5, 5, 5, 5 })));
-        Assertions.assertThat(parsedCommand.getFiles())
-                .containsExactly(new File("test.txt"), new File("test2.txt"), new File("test3.txt"));
-        Assertions.assertThat(parseResult.matchedOption("s").description()).containsExactly("Test enum with ERROR, SUCCESS");
-        Assertions.assertThat(parsedCommand.getPrivateEntry()).isEqualTo("privateValue");
-        Assertions.assertThat(parsedCommand.positional).containsExactly("pos1", "pos2");
-    }
-
-    private void testMethodSubCommand() {
-        CommandLine helloCmd = new CommandLine(WithMethodSubCommand.class, factory);
-        Assertions.assertThat(helloCmd.execute("hello", "-n", "World!")).isZero();
-        CommandLine goodByeCmd = new CommandLine(WithMethodSubCommand.class, factory);
-        Assertions.assertThat(goodByeCmd.execute("goodBye", "-n", "Test?")).isZero();
-    }
-
-    private void testParentCommand() {
-        CommandLine parentCommand = new CommandLine(CommandUsedAsParent.class, factory);
-        Assertions.assertThat(parentCommand.execute("-p", "testValue", "child")).isZero();
-    }
-
-    private void testCommandWithArgGroup() {
-        CommandLine argGroupCommand = new CommandLine(MutuallyExclusiveOptionsCommand.class, factory);
-        argGroupCommand.parseArgs("-b", "150");
-        MutuallyExclusiveOptionsCommand parsedCommand = argGroupCommand.getCommand();
-        Assertions.assertThat(parsedCommand.exclusive.a).isZero();
-        Assertions.assertThat(parsedCommand.exclusive.b).isEqualTo(150);
-        Assertions.assertThat(parsedCommand.exclusive.c).isZero();
-    }
-
-    private void testDynamicProxy() {
-        CommandLine cmd = new CommandLine(DynamicProxyCommand.class, factory);
-        cmd.parseArgs("-t", "2007-12-03T10:15:30");
-        DynamicProxyCommand parsedCommand = cmd.getCommand();
-        Assertions.assertThat(parsedCommand.time()).isEqualTo("2007-12-03T10:15:30");
-    }
-
-    private void testDynamicVersionProvider() {
-        CommandLine cmd = new CommandLine(DynamicVersionProviderCommand.class, factory);
-        Assertions.assertThat(cmd.execute()).isZero();
-
-    }
-
-    private void testUnmatched() {
-        CommandLine cmd = new CommandLine(UnmatchedCommand.class, factory);
-        cmd.parseArgs("-x", "-a", "AAA", "More");
-        UnmatchedCommand parsedCommand = cmd.getCommand();
-        Assertions.assertThat(parsedCommand.alpha).isEqualTo("AAA");
-        Assertions.assertThat(parsedCommand.beta).isNull();
-        Assertions.assertThat(parsedCommand.remainder).containsExactly("More");
-        Assertions.assertThat(parsedCommand.unmatched).containsExactly("-x");
-    }
-
-    private void testI18s() {
-        CommandLine cmdOne = new CommandLine(LocalizedCommandOne.class, factory);
-        Assertions.assertThat(cmdOne.getCommandSpec().findOption("first").description()).containsExactly("First in CommandOne");
-
-        CommandLine cmdTwo = new CommandLine(LocalizedCommandTwo.class, factory);
-        Assertions.assertThat(cmdTwo.getCommandSpec().findOption("first").description()).containsExactly("First in CommandTwo");
-    }
-
-    private void testCompletionReflection() {
-        CommandLine completionReflectionCommand = new CommandLine(CompletionReflectionCommand.class, factory);
-        completionReflectionCommand.execute("one");
-    }
-
-    private void testDefaultValueProvider() {
-        CommandLine cmd = new CommandLine(DefaultValueProviderCommand.class, factory);
-        Assertions.assertThat(cmd.execute()).isZero();
-    }
-}
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java
new file mode 100644
index 00000000000000..d97ba1b3c65678
--- /dev/null
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/TopTestCommand.java
@@ -0,0 +1,21 @@
+package io.quarkus.it.picocli;
+
+import io.quarkus.picocli.runtime.annotations.TopCommand;
+import picocli.CommandLine;
+
+@TopCommand
+@CommandLine.Command(name = "test", mixinStandardHelpOptions = true, commandListHeading = "%nCommands:%n", synopsisHeading = "%nUsage: ", optionListHeading = "%nOptions:%n", subcommands = {
+        CommandUsedAsParent.class,
+        CompletionReflectionCommand.class,
+        DefaultValueProviderCommand.class,
+        DynamicVersionProviderCommand.class,
+        LocalizedCommandOne.class,
+        LocalizedCommandTwo.class,
+        MutuallyExclusiveOptionsCommand.class,
+        TestCommand.class,
+        UnmatchedCommand.class,
+        DynamicProxyInvokerCommand.class,
+        WithMethodSubCommand.class })
+public class TopTestCommand {
+
+}
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java
index 04042ef4da7f50..e7e647dd93b44d 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/UnmatchedCommand.java
@@ -1,10 +1,12 @@
 package io.quarkus.it.picocli;
 
+import java.util.Arrays;
 import java.util.List;
 
 import picocli.CommandLine;
 
-public class UnmatchedCommand {
+@CommandLine.Command(name = "unmatched")
+public class UnmatchedCommand implements Runnable {
     @CommandLine.Option(names = "-a")
     String alpha;
     @CommandLine.Option(names = "-b")
@@ -13,4 +15,12 @@ public class UnmatchedCommand {
     String[] remainder;
     @CommandLine.Unmatched
     List unmatched;
+
+    @Override
+    public void run() {
+        System.out.println("-a:" + alpha);
+        System.out.println("-b:" + beta);
+        System.out.println("remainder:" + Arrays.toString(remainder));
+        System.out.println("unmatched" + unmatched);
+    }
 }
diff --git a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java
index 8f9e643d4097b4..2582e1ce121071 100644
--- a/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java
+++ b/integration-tests/picocli-native/src/main/java/io/quarkus/it/picocli/WithMethodSubCommand.java
@@ -1,19 +1,17 @@
 package io.quarkus.it.picocli;
 
-import org.assertj.core.api.Assertions;
-
 import picocli.CommandLine;
 
-@CommandLine.Command
+@CommandLine.Command(name = "with-method-sub-command")
 public class WithMethodSubCommand {
 
     @CommandLine.Command
     void hello(@CommandLine.Option(names = { "-n", "--names" }, description = "Parameter option") String name) {
-        Assertions.assertThat(name).isEqualTo("World!");
+        System.out.println("Hello " + name);
     }
 
     @CommandLine.Command
     void goodBye(@CommandLine.Mixin NameMixin mixin) {
-        Assertions.assertThat(mixin.name).isEqualTo("Test?");
+        System.out.println("Goodbye " + mixin.name);
     }
 }
diff --git a/integration-tests/picocli-native/src/main/resources/application.properties b/integration-tests/picocli-native/src/main/resources/application.properties
new file mode 100644
index 00000000000000..e7d912c48073b8
--- /dev/null
+++ b/integration-tests/picocli-native/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+quarkus.log.level=WARN
+quarkus.banner.enabled=false
\ No newline at end of file
diff --git a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java
index 8473b42d491a05..45e389c036dea3 100644
--- a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java
+++ b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliIT.java
@@ -1,7 +1,7 @@
 package io.quarkus.it.picocli;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.main.QuarkusMainIntegrationTest;
 
-@NativeImageTest
+@QuarkusMainIntegrationTest
 public class PicocliIT extends PicocliTest {
 }
diff --git a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java
index 36f699d65aa1f4..43a97fc52c6a20 100644
--- a/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java
+++ b/integration-tests/picocli-native/src/test/java/io/quarkus/it/picocli/PicocliTest.java
@@ -1,18 +1,96 @@
 package io.quarkus.it.picocli;
 
-import static org.hamcrest.Matchers.is;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.UnknownHostException;
 
 import org.junit.jupiter.api.Test;
 
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
+import io.quarkus.test.junit.main.Launch;
+import io.quarkus.test.junit.main.LaunchResult;
+import io.quarkus.test.junit.main.QuarkusMainLauncher;
+import io.quarkus.test.junit.main.QuarkusMainTest;
 
-@QuarkusTest
+@QuarkusMainTest
 public class PicocliTest {
 
     @Test
-    public void testCommands() {
-        RestAssured.when().get("/picocli/test").then().body(is("OK"));
+    @Launch({ "test-command", "-f", "test.txt", "-f", "test2.txt", "-f", "test3.txt", "-s", "ERROR", "-h", "SOCKS=5.5.5.5",
+            "-p", "privateValue", "pos1", "pos2" })
+    public void testBasicReflection(LaunchResult result) throws UnknownHostException {
+        assertThat(result.getOutput())
+                .contains("-s", "ERROR")
+                .contains("-p:privateValue")
+                .contains("-p:privateValue")
+                .contains("positional:[pos1, pos2]");
+    }
+
+    @Test
+    public void testMethodSubCommand(QuarkusMainLauncher launcher) {
+        LaunchResult result = launcher.launch("with-method-sub-command", "hello", "-n", "World!");
+        assertThat(result.exitCode()).isZero();
+        assertThat(result.getOutput()).isEqualTo("Hello World!");
+        result = launcher.launch("with-method-sub-command", "goodBye", "-n", "Test?");
+        assertThat(result.exitCode()).isZero();
+        assertThat(result.getOutput()).isEqualTo("Goodbye Test?");
+    }
+
+    @Test
+    @Launch({ "command-used-as-parent", "-p", "testValue", "child" })
+    public void testParentCommand(LaunchResult result) {
+        assertThat(result.getOutput()).isEqualTo("testValue");
+    }
+
+    @Test
+    @Launch({ "exclusivedemo", "-b", "150" })
+    public void testCommandWithArgGroup(LaunchResult result) {
+        assertThat(result.getOutput())
+                .contains("-a:0")
+                .contains("-b:150")
+                .contains("-c:0");
+    }
+
+    @Test
+    @Launch({ "dynamic-proxy" })
+    public void testDynamicProxy(LaunchResult result) {
+        assertThat(result.getOutput()).isEqualTo("2007-12-03T10:15:30");
+    }
+
+    @Test
+    @Launch("quarkus")
+    public void testDynamicVersionProvider(LaunchResult launchResult) {
+        assertThat(launchResult.getOutput()).contains("quarkus version 1.0");
+    }
+
+    @Test
+    @Launch({ "unmatched", "-x", "-a", "AAA", "More" })
+    public void testUnmatched(LaunchResult launchResult) {
+        assertThat(launchResult.getOutput())
+                .contains("-a:AAA")
+                .contains("-b:null")
+                .contains("remainder:[More]")
+                .contains("unmatched[-x]");
+    }
+
+    @Test
+    public void testI18s(QuarkusMainLauncher launcher) {
+        LaunchResult result = launcher.launch("localized-command-one", "--help");
+        assertThat(result.getOutput())
+                .contains("First in CommandOne");
+        result = launcher.launch("localized-command-two", "--help");
+        assertThat(result.getOutput())
+                .contains("First in CommandTwo");
     }
 
+    @Test
+    @Launch({ "completion-reflection", "test" })
+    public void testCompletionReflection() {
+
+    }
+
+    @Test
+    @Launch("default-value-provider")
+    public void testDefaultValueProvider(LaunchResult result) {
+        assertThat(result.getOutput()).isEqualTo("default:default-value");
+    }
 }
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2ebcdd33f733f9..483c3ab6777fff 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -123,6 +123,7 @@
                 class-transformer
                 shared-library
                 hibernate-validator
+                hibernate-validator-resteasy-reactive
                 common-jpa-entities
                 infinispan-client
                 devtools
@@ -153,6 +154,7 @@
                 jpa-oracle
                 hibernate-orm-panache
                 hibernate-orm-rest-data-panache
+                hibernate-orm-graphql-panache
                 hibernate-orm-panache-kotlin
                 hibernate-reactive-db2
                 hibernate-reactive-mysql
@@ -180,6 +182,7 @@
                 elytron-undertow
                 flyway
                 liquibase
+                liquibase-mongodb
                 oidc
                 oidc-client
                 oidc-client-reactive
@@ -273,6 +276,7 @@
                 native-config-profile
                 logging-min-level-unset
                 logging-min-level-set
+                logging-panache
                 redis-devservices
 
                 
diff --git a/integration-tests/resteasy-reactive-rest-client/pom.xml b/integration-tests/resteasy-reactive-rest-client/pom.xml
index 2d8b52256bea0a..00b80a5053e236 100644
--- a/integration-tests/resteasy-reactive-rest-client/pom.xml
+++ b/integration-tests/resteasy-reactive-rest-client/pom.xml
@@ -31,6 +31,11 @@
             io.quarkus
             quarkus-opentelemetry
         
+        
+        
+            io.quarkus
+            quarkus-opentelemetry-exporter-otlp
+        
 
         
         
@@ -99,6 +104,19 @@
                 
             
         
+        
+            io.quarkus
+            quarkus-opentelemetry-exporter-otlp-deployment
+            ${project.version}
+            pom
+            test
+            
+                
+                    *
+                    *
+                
+            
+        
     
 
     
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java
index 8a1e5132fd9937..ff1f0f1125489a 100644
--- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java
+++ b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java
@@ -13,15 +13,13 @@ public class ConfigurableExceptionMapper
     @Inject
     @ConfigProperty(name = "exception.message")
     String message;
-    @Inject
-    ExceptionConfig exceptionConfig;
+
+    public ConfigurableExceptionMapper() {
+        System.out.println("ConfigurableExceptionMapper.ConfigurableExceptionMapper");
+    }
 
     @Override
     public Response toResponse(final ConfigurableExceptionMapperException exception) {
-        if (!message.equals(exceptionConfig.message())) {
-            return Response.serverError().build();
-        }
-
         return Response.ok().entity(message).build();
     }
 
diff --git a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java b/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java
deleted file mode 100644
index 669464b2504c97..00000000000000
--- a/integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ExceptionConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.quarkus.it.smallrye.config;
-
-import io.smallrye.config.ConfigMapping;
-
-@ConfigMapping(prefix = "exception")
-public interface ExceptionConfig {
-    String message();
-}
diff --git a/integration-tests/spring-data-rest/pom.xml b/integration-tests/spring-data-rest/pom.xml
index 918a7937951ba8..92aeab84a27624 100644
--- a/integration-tests/spring-data-rest/pom.xml
+++ b/integration-tests/spring-data-rest/pom.xml
@@ -23,7 +23,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jackson
+            quarkus-resteasy-reactive-jackson
         
         
             io.quarkus
@@ -79,7 +79,7 @@
         
         
             io.quarkus
-            quarkus-resteasy-jackson-deployment
+            quarkus-resteasy-reactive-jackson-deployment
             ${project.version}
             pom
             test
diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
index 0a5325c28e8a7c..09820bae7a5f12 100644
--- a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
+++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
@@ -172,8 +172,8 @@ void shouldNotCreateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().post("/books")
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("add.arg0.title"))
-                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+                .and().body("violations[0].field", equalTo("add.arg0.title"))
+                .and().body("violations[0].message", equalTo("must not be blank"));
     }
 
     @Test
@@ -242,7 +242,7 @@ void shouldNotUpdateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().put("/books/" + CRIME_AND_PUNISHMENT_ID)
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("update.arg1.title"))
-                .and().body("parameterViolations[0].message", equalTo("must not be blank"));
+                .and().body("violations[0].field", equalTo("update.arg1.title"))
+                .and().body("violations[0].message", equalTo("must not be blank"));
     }
 }
diff --git a/pom.xml b/pom.xml
index b5d22660f27966..73c52d788391e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
             
                 io.quarkus.bot
                 build-reporting-maven-extension
-                1.0.3
+                1.0.4
             
         
     
diff --git a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java
index e2c0e21be8d4e6..f02da622f45545 100644
--- a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java
+++ b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaClient.java
@@ -8,6 +8,8 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.jboss.logging.Logger;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -15,7 +17,9 @@
 import io.quarkus.arc.ArcContainer;
 import io.quarkus.arc.InstanceHandle;
 
+@Deprecated
 public class LambdaClient {
+    protected static final Logger log = Logger.getLogger(LambdaClient.class);
 
     private static final AtomicInteger REQUEST_ID_GENERATOR = new AtomicInteger();
     public static final ConcurrentHashMap> REQUESTS;
@@ -47,7 +51,10 @@ public class LambdaClient {
 
     }
 
+    @Deprecated
     public static void invoke(InputStream inputStream, OutputStream outputStream) {
+        log.warn(
+                "LambdaClient has been deprecated and will be removed in future Quarkus versions.  You can now invoke using a built in test http server.  See docs for more details");
         if (problem != null) {
             throw new RuntimeException(problem);
         }
@@ -99,10 +106,12 @@ public String setValue(String value) {
      * @param 
      * @return
      */
+    @Deprecated
     public static  T invoke(Class returnType, Object input) {
         return invoke(returnType, input, Duration.ofNanos(Long.MAX_VALUE));
     }
 
+    @Deprecated
     public static  T invoke(Class returnType, Object input, Duration timeout) {
         try {
             return invokeAsync(returnType, input).get(timeout.toMillis(), TimeUnit.MILLISECONDS);
@@ -117,7 +126,10 @@ public static  T invoke(Class returnType, Object input, Duration timeout)
         }
     }
 
+    @Deprecated
     public static  CompletableFuture invokeAsync(Class returnType, Object input) {
+        log.warn(
+                "LambdaClient has been deprecated and will be removed in future Quarkus versions.  You can now invoke using a built in test http server.  See docs for more details");
         if (problem != null) {
             CompletableFuture failed = new CompletableFuture<>();
             failed.completeExceptionally(problem);
@@ -151,7 +163,10 @@ public static  CompletableFuture invokeAsync(Class returnType, Object i
      * @param 
      * @return
      */
+    @Deprecated
     public static  T invokeJson(Class returnType, String json) {
+        log.warn(
+                "LambdaClient has been deprecated and will be removed in future Quarkus versions.  You can now invoke using a built in test http server.  See docs for more details");
         if (problem != null) {
             throw new RuntimeException(problem);
         }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java
index 2b897e1dc1c586..580a24bffcad31 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/ArtifactLauncher.java
@@ -12,6 +12,8 @@ public interface ArtifactLauncher extend
 
     void start() throws IOException;
 
+    LaunchResult runToCompletion(String[] args);
+
     void includeAsSysProps(Map systemProps);
 
     boolean listensOnSsl();
@@ -30,11 +32,37 @@ interface InitContext {
 
         ArtifactLauncher.InitContext.DevServicesLaunchResult getDevServicesLaunchResult();
 
-        interface DevServicesLaunchResult {
+        interface DevServicesLaunchResult extends AutoCloseable {
 
             Map properties();
 
             String networkId();
+
+            void close();
+        }
+    }
+
+    class LaunchResult {
+        final int statusCode;
+        final byte[] output;
+        final byte[] stderror;
+
+        public LaunchResult(int statusCode, byte[] output, byte[] stderror) {
+            this.statusCode = statusCode;
+            this.output = output;
+            this.stderror = stderror;
+        }
+
+        public int getStatusCode() {
+            return statusCode;
+        }
+
+        public byte[] getOutput() {
+            return output;
+        }
+
+        public byte[] getStderror() {
+            return stderror;
         }
     }
 }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java
index 2fa691ad88a106..bd118a8e900892 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultDockerContainerLauncher.java
@@ -47,6 +47,12 @@ public void init(DockerContainerArtifactLauncher.DockerInitContext initContext)
         this.pullRequired = initContext.pullRequired();
     }
 
+    @Override
+    public LaunchResult runToCompletion(String[] args) {
+        throw new UnsupportedOperationException("not implemented for docker yet");
+    }
+
+    @Override
     public void start() throws IOException {
 
         if (pullRequired) {
@@ -86,11 +92,14 @@ public void start() throws IOException {
         if (devServicesLaunchResult.networkId() != null) {
             args.add("--net=" + devServicesLaunchResult.networkId());
         }
-        args.addAll(toEnvVar("quarkus.http.port", "" + httpPort));
-        args.addAll(toEnvVar("quarkus.http.ssl-port", "" + httpsPort));
-        // this won't be correct when using the random port but it's really only used by us for the rest client tests
-        // in the main module, since those tests hit the application itself
-        args.addAll(toEnvVar("test.url", TestHTTPResourceManager.getUri()));
+
+        if (DefaultJarLauncher.HTTP_PRESENT) {
+            args.addAll(toEnvVar("quarkus.http.port", "" + httpPort));
+            args.addAll(toEnvVar("quarkus.http.ssl-port", "" + httpsPort));
+            // this won't be correct when using the random port but it's really only used by us for the rest client tests
+            // in the main module, since those tests hit the application itself
+            args.addAll(toEnvVar("test.url", TestHTTPResourceManager.getUri()));
+        }
         if (testProfile != null) {
             args.addAll(toEnvVar("quarkus.profile", testProfile));
         }
@@ -104,7 +113,7 @@ public void start() throws IOException {
         Files.deleteIfExists(logFile);
         Files.createDirectories(logFile.getParent());
 
-        System.out.println("Executing " + args);
+        System.out.println("Executing \"" + String.join(" ", args) + "\"");
 
         Function startedFunction = createStartedFunction();
 
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java
index a90a4d30b44288..92074dcc385be5 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultJarLauncher.java
@@ -9,6 +9,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +19,19 @@
 
 public class DefaultJarLauncher implements JarArtifactLauncher {
 
+    private static final String VERTX_HTTP_RECORDER = "io.quarkus.vertx.http.runtime.VertxHttpRecorder";
+    static boolean HTTP_PRESENT;
+
+    static {
+        boolean http = true;
+        try {
+            Class.forName(VERTX_HTTP_RECORDER);
+        } catch (ClassNotFoundException e) {
+            http = false;
+        }
+        HTTP_PRESENT = http;
+    }
+
     private int httpPort;
     private int httpsPort;
     private long waitTimeSeconds;
@@ -41,6 +55,39 @@ public void init(JarArtifactLauncher.JarInitContext initContext) {
     }
 
     public void start() throws IOException {
+        start(new String[0], true);
+        Function startedFunction = createStartedFunction();
+        var logFile = PropertyTestUtil.getLogFilePath();
+        if (startedFunction != null) {
+            IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess,
+                    waitTimeSeconds, logFile);
+            isSsl = result.isSsl();
+        } else {
+            ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds);
+            updateConfigForPort(result.getPort());
+            isSsl = result.isSsl();
+        }
+    }
+
+    @Override
+    public LaunchResult runToCompletion(String[] args) {
+        try {
+            start(args, false);
+            ProcessReader error = new ProcessReader(quarkusProcess.getErrorStream());
+            ProcessReader stdout = new ProcessReader(quarkusProcess.getInputStream());
+            Thread t = new Thread(error, "Error stream reader");
+            t.start();
+            t = new Thread(stdout, "Stdout stream reader");
+            t.start();
+            byte[] s = stdout.get();
+            byte[] e = error.get();
+            return new LaunchResult(quarkusProcess.waitFor(), s, e);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void start(String[] programArgs, boolean handleIo) throws IOException {
 
         System.setProperty("test.url", TestHTTPResourceManager.getUri());
 
@@ -49,11 +96,13 @@ public void start() throws IOException {
         if (!argLine.isEmpty()) {
             args.addAll(argLine);
         }
-        args.add("-Dquarkus.http.port=" + httpPort);
-        args.add("-Dquarkus.http.ssl-port=" + httpsPort);
-        // this won't be correct when using the random port but it's really only used by us for the rest client tests
-        // in the main module, since those tests hit the application itself
-        args.add("-Dtest.url=" + TestHTTPResourceManager.getUri());
+        if (HTTP_PRESENT) {
+            args.add("-Dquarkus.http.port=" + httpPort);
+            args.add("-Dquarkus.http.ssl-port=" + httpsPort);
+            // this won't be correct when using the random port but it's really only used by us for the rest client tests
+            // in the main module, since those tests hit the application itself
+            args.add("-Dtest.url=" + TestHTTPResourceManager.getUri());
+        }
         Path logFile = PropertyTestUtil.getLogFilePath();
         args.add("-Dquarkus.log.file.path=" + logFile.toAbsolutePath().toString());
         args.add("-Dquarkus.log.file.enable=true");
@@ -65,23 +114,17 @@ public void start() throws IOException {
         }
         args.add("-jar");
         args.add(jarPath.toAbsolutePath().toString());
+        args.addAll(Arrays.asList(programArgs));
 
-        System.out.println("Executing " + args);
+        System.out.println("Executing \"" + String.join(" ", args) + "\"");
 
         Files.deleteIfExists(logFile);
         Files.createDirectories(logFile.getParent());
 
-        Function startedFunction = createStartedFunction();
-
-        quarkusProcess = LauncherUtil.launchProcess(args);
-        if (startedFunction != null) {
-            IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess,
-                    waitTimeSeconds, logFile);
-            isSsl = result.isSsl();
+        if (handleIo) {
+            quarkusProcess = LauncherUtil.launchProcess(args);
         } else {
-            ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds);
-            updateConfigForPort(result.getPort());
-            isSsl = result.isSsl();
+            quarkusProcess = Runtime.getRuntime().exec(args.toArray(new String[0]));
         }
 
     }
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java
index 584d8f9ca73cc7..68dcd2df242add 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/DefaultNativeImageLauncher.java
@@ -14,6 +14,7 @@
 import java.nio.file.Path;
 import java.security.CodeSource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -70,7 +71,46 @@ private Supplier createStartedSupplier() {
         return null;
     }
 
+    @Override
+    public LaunchResult runToCompletion(String[] args) {
+        try {
+            start(args, false);
+            ProcessReader error = new ProcessReader(quarkusProcess.getErrorStream());
+            ProcessReader stdout = new ProcessReader(quarkusProcess.getInputStream());
+            Thread t1 = new Thread(error, "Error stream reader");
+            t1.start();
+            Thread t2 = new Thread(stdout, "Stdout stream reader");
+            t2.start();
+            t1.join();
+            t2.join();
+            byte[] s = stdout.get();
+            byte[] e = error.get();
+            return new LaunchResult(quarkusProcess.waitFor(), s, e);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public void start() throws IOException {
+        start(new String[0], true);
+
+        Path logFile = PropertyTestUtil.getLogFilePath();
+        Supplier startedSupplier = createStartedSupplier(); // keep the legacy SPI handling
+        Function startedFunction = createStartedFunction();
+        if (startedSupplier != null) {
+            waitForStartedSupplier(startedSupplier, quarkusProcess, waitTimeSeconds);
+        } else if (startedFunction != null) {
+            IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess,
+                    waitTimeSeconds, logFile);
+            isSsl = result.isSsl();
+        } else {
+            ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds);
+            updateConfigForPort(result.getPort());
+            isSsl = result.isSsl();
+        }
+    }
+
+    public void start(String[] programArgs, boolean handleIo) throws IOException {
         System.setProperty("test.url", TestHTTPResourceManager.getUri());
 
         if (nativeImagePath == null) {
@@ -81,11 +121,13 @@ public void start() throws IOException {
         if (!argLine.isEmpty()) {
             args.addAll(argLine);
         }
-        args.add("-Dquarkus.http.port=" + httpPort);
-        args.add("-Dquarkus.http.ssl-port=" + httpsPort);
-        // this won't be correct when using the random port but it's really only used by us for the rest client tests
-        // in the main module, since those tests hit the application itself
-        args.add("-Dtest.url=" + TestHTTPResourceManager.getUri());
+        if (DefaultJarLauncher.HTTP_PRESENT) {
+            args.add("-Dquarkus.http.port=" + httpPort);
+            args.add("-Dquarkus.http.ssl-port=" + httpsPort);
+            // this won't be correct when using the random port but it's really only used by us for the rest client tests
+            // in the main module, since those tests hit the application itself
+            args.add("-Dtest.url=" + TestHTTPResourceManager.getUri());
+        }
         Path logFile = PropertyTestUtil.getLogFilePath();
         args.add("-Dquarkus.log.file.path=" + logFile.toAbsolutePath().toString());
         args.add("-Dquarkus.log.file.enable=true");
@@ -95,28 +137,17 @@ public void start() throws IOException {
         for (Map.Entry e : systemProps.entrySet()) {
             args.add("-D" + e.getKey() + "=" + e.getValue());
         }
-
-        System.out.println("Executing " + args);
+        args.addAll(Arrays.asList(programArgs));
+        System.out.println("Executing \"" + String.join(" ", args) + "\"");
 
         Files.deleteIfExists(logFile);
         Files.createDirectories(logFile.getParent());
-
-        Supplier startedSupplier = createStartedSupplier(); // keep the legacy SPI handling
-        Function startedFunction = createStartedFunction();
-
-        quarkusProcess = launchProcess(args);
-
-        if (startedSupplier != null) {
-            waitForStartedSupplier(startedSupplier, quarkusProcess, waitTimeSeconds);
-        } else if (startedFunction != null) {
-            IntegrationTestStartedNotifier.Result result = waitForStartedFunction(startedFunction, quarkusProcess,
-                    waitTimeSeconds, logFile);
-            isSsl = result.isSsl();
+        if (handleIo) {
+            quarkusProcess = LauncherUtil.launchProcess(args);
         } else {
-            ListeningAddress result = waitForCapturedListeningData(quarkusProcess, logFile, waitTimeSeconds);
-            updateConfigForPort(result.getPort());
-            isSsl = result.isSsl();
+            quarkusProcess = Runtime.getRuntime().exec(args.toArray(new String[0]));
         }
+
     }
 
     private void waitForStartedSupplier(Supplier startedSupplier, Process quarkusProcess, long waitTime) {
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java b/test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java
new file mode 100644
index 00000000000000..504d25f12e5aa0
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/ProcessReader.java
@@ -0,0 +1,38 @@
+package io.quarkus.test.common;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.concurrent.CompletableFuture;
+
+class ProcessReader implements Runnable {
+
+    private final InputStream inputStream;
+    private final ByteArrayOutputStream output = new ByteArrayOutputStream();
+    private final CompletableFuture result = new CompletableFuture<>();
+
+    ProcessReader(InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
+
+    @Override
+    public void run() {
+        byte[] b = new byte[100];
+        int i;
+        try {
+            while ((i = inputStream.read(b)) > 0) {
+                output.write(b, 0, i);
+            }
+            result.complete(output.toByteArray());
+        } catch (Throwable e) {
+            result.completeExceptionally(e);
+        }
+    }
+
+    byte[] get() {
+        try {
+            return result.get();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java b/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java
index 5750bcbb81fdf1..5ddebf1d371b9b 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/RestAssuredURLManager.java
@@ -89,8 +89,13 @@ private RestAssuredURLManager() {
 
     }
 
-    private static int getPortFromConfig(String key, int defaultValue) {
-        return ConfigProvider.getConfig().getOptionalValue(key, Integer.class).orElse(defaultValue);
+    private static int getPortFromConfig(int defaultValue, String... keys) {
+        for (String key : keys) {
+            Optional port = ConfigProvider.getConfig().getOptionalValue(key, Integer.class);
+            if (port.isPresent())
+                return port.get();
+        }
+        return defaultValue;
     }
 
     public static void setURL(boolean useSecureConnection) {
@@ -110,8 +115,9 @@ public static void setURL(boolean useSecureConnection, Integer port, String addi
             try {
                 oldPort = (Integer) portField.get(null);
                 if (port == null) {
-                    port = useSecureConnection ? getPortFromConfig("quarkus.https.test-port", DEFAULT_HTTPS_PORT)
-                            : getPortFromConfig("quarkus.http.test-port", DEFAULT_HTTP_PORT);
+                    port = useSecureConnection ? getPortFromConfig(DEFAULT_HTTPS_PORT, "quarkus.https.test-port")
+                            : getPortFromConfig(DEFAULT_HTTP_PORT, "quarkus.http.test-port",
+                                    "quarkus.lambda.mock-event-server.test-port");
                 }
                 portField.set(null, port);
             } catch (IllegalAccessException e) {
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java b/test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java
new file mode 100644
index 00000000000000..34ee3996a49dff
--- /dev/null
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/RestorableSystemProperties.java
@@ -0,0 +1,40 @@
+package io.quarkus.test.common;
+
+import java.io.Closeable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class RestorableSystemProperties implements Closeable {
+    final Map sysPropRestore;
+
+    RestorableSystemProperties(Map sysPropRestore) {
+        this.sysPropRestore = sysPropRestore;
+    }
+
+    public static RestorableSystemProperties setProperties(Map props, String... additionalKeysToSave) {
+        Map sysPropRestore = new HashMap<>();
+        for (var i : additionalKeysToSave) {
+            sysPropRestore.put(i, System.getProperty(i));
+        }
+        for (Map.Entry i : props.entrySet()) {
+            sysPropRestore.put(i.getKey(), System.getProperty(i.getKey()));
+        }
+        for (Map.Entry i : props.entrySet()) {
+            System.setProperty(i.getKey(), i.getValue());
+        }
+        return new RestorableSystemProperties(sysPropRestore);
+    }
+
+    @Override
+    public void close() {
+
+        for (Map.Entry entry : sysPropRestore.entrySet()) {
+            String val = entry.getValue();
+            if (val == null) {
+                System.clearProperty(entry.getKey());
+            } else {
+                System.setProperty(entry.getKey(), val);
+            }
+        }
+    }
+}
diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java b/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java
index c0f39e31a29a71..c278c35f2ff727 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/TestClassIndexer.java
@@ -20,6 +20,7 @@
 import org.jboss.jandex.IndexReader;
 import org.jboss.jandex.IndexWriter;
 import org.jboss.jandex.Indexer;
+import org.jboss.jandex.UnsupportedVersion;
 
 public final class TestClassIndexer {
 
@@ -60,6 +61,8 @@ public static Index readIndex(Class testClass) {
         if (path.toFile().exists()) {
             try (FileInputStream fis = new FileInputStream(path.toFile())) {
                 return new IndexReader(fis).read();
+            } catch (UnsupportedVersion e) {
+                throw new UnsupportedVersion("Can't read Jandex index from " + path + ": " + e.getMessage());
             } catch (IOException e) {
                 // be lenient since the error is recoverable
                 return indexTestClasses(testClass);
diff --git a/test-framework/junit5-internal/pom.xml b/test-framework/junit5-internal/pom.xml
index 85c157b718a990..5e3194031627f8 100644
--- a/test-framework/junit5-internal/pom.xml
+++ b/test-framework/junit5-internal/pom.xml
@@ -55,6 +55,10 @@
             io.quarkus
             quarkus-devtools-utilities
         
+        
+            org.awaitility
+            awaitility
+        
     
 
 
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java
new file mode 100644
index 00000000000000..36197e7d129974
--- /dev/null
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/ContinuousTestingTestUtils.java
@@ -0,0 +1,186 @@
+package io.quarkus.test;
+
+import java.util.Arrays;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionTimeoutException;
+
+import io.quarkus.dev.testing.ContinuousTestingSharedStateManager;
+
+/**
+ * Utilities for testing the test runner itself
+ */
+public class ContinuousTestingTestUtils {
+
+    long runToWaitFor = 1;
+
+    public TestStatus waitForNextCompletion() {
+        try {
+            Awaitility.waitAtMost(1, TimeUnit.MINUTES).pollInterval(50, TimeUnit.MILLISECONDS).until(new Callable() {
+                @Override
+                public Boolean call() throws Exception {
+                    ContinuousTestingSharedStateManager.State ts = ContinuousTestingSharedStateManager.getLastState();
+                    if (ts.lastRun > runToWaitFor) {
+                        //sometimes we can run spuriously, because of the way file systems work
+                        //we just roll with it, and take the updated results
+                        runToWaitFor = ts.lastRun;
+                    }
+                    boolean runComplete = ts.lastRun == runToWaitFor;
+                    if (runComplete && ts.inProgress) {
+                        //there is a small chance of a race, where changes are picked up twice, due to how filesystems work
+                        //this works around it by waiting for the next run
+                        runToWaitFor = ts.lastRun + 1;
+                        return false;
+                    } else if (runComplete) {
+                        runToWaitFor++;
+                    }
+                    return runComplete;
+                }
+            });
+        } catch (Exception e) {
+            ContinuousTestingSharedStateManager.State ts = ContinuousTestingSharedStateManager.getLastState();
+            throw new ConditionTimeoutException("Failed to wait for test run " + runToWaitFor + " " + ts, e);
+        }
+        var s = ContinuousTestingSharedStateManager.getLastState();
+        return new TestStatus(s.lastRun, s.running ? s.lastRun + 1 : -1, s.run, s.currentPassed, s.currentFailed,
+                s.currentSkipped, s.passed, s.failed, s.skipped);
+    }
+
+    public static String appProperties(String... props) {
+        return "quarkus.test.continuous-testing=enabled\nquarkus.test.display-test-output=true\nquarkus.test.basic-console=true\nquarkus.test.disable-console-input=true\n"
+                + String.join("\n", Arrays.asList(props));
+    }
+
+    public static class TestStatus {
+
+        private long lastRun;
+
+        private long running;
+
+        private long testsRun = -1;
+
+        private long testsPassed = -1;
+
+        private long testsFailed = -1;
+
+        private long testsSkipped = -1;
+
+        private long totalTestsPassed = -1;
+
+        private long totalTestsFailed = -1;
+
+        private long totalTestsSkipped = -1;
+
+        public TestStatus() {
+        }
+
+        public TestStatus(long lastRun, long running, long testsRun, long testsPassed, long testsFailed, long testsSkipped,
+                long totalTestsPassed, long totalTestsFailed, long totalTestsSkipped) {
+            this.lastRun = lastRun;
+            this.running = running;
+            this.testsRun = testsRun;
+            this.testsPassed = testsPassed;
+            this.testsFailed = testsFailed;
+            this.testsSkipped = testsSkipped;
+            this.totalTestsPassed = totalTestsPassed;
+            this.totalTestsFailed = totalTestsFailed;
+            this.totalTestsSkipped = totalTestsSkipped;
+
+        }
+
+        public long getLastRun() {
+            return lastRun;
+        }
+
+        public TestStatus setLastRun(long lastRun) {
+            this.lastRun = lastRun;
+            return this;
+        }
+
+        public long getRunning() {
+            return running;
+        }
+
+        public TestStatus setRunning(long running) {
+            this.running = running;
+            return this;
+        }
+
+        public long getTestsRun() {
+            return testsRun;
+        }
+
+        public TestStatus setTestsRun(long testsRun) {
+            this.testsRun = testsRun;
+            return this;
+        }
+
+        public long getTestsPassed() {
+            return testsPassed;
+        }
+
+        public TestStatus setTestsPassed(long testsPassed) {
+            this.testsPassed = testsPassed;
+            return this;
+        }
+
+        public long getTestsFailed() {
+            return testsFailed;
+        }
+
+        public TestStatus setTestsFailed(long testsFailed) {
+            this.testsFailed = testsFailed;
+            return this;
+        }
+
+        public long getTestsSkipped() {
+            return testsSkipped;
+        }
+
+        public TestStatus setTestsSkipped(long testsSkipped) {
+            this.testsSkipped = testsSkipped;
+            return this;
+        }
+
+        public long getTotalTestsPassed() {
+            return totalTestsPassed;
+        }
+
+        public TestStatus setTotalTestsPassed(long totalTestsPassed) {
+            this.totalTestsPassed = totalTestsPassed;
+            return this;
+        }
+
+        public long getTotalTestsFailed() {
+            return totalTestsFailed;
+        }
+
+        public TestStatus setTotalTestsFailed(long totalTestsFailed) {
+            this.totalTestsFailed = totalTestsFailed;
+            return this;
+        }
+
+        public long getTotalTestsSkipped() {
+            return totalTestsSkipped;
+        }
+
+        public TestStatus setTotalTestsSkipped(long totalTestsSkipped) {
+            this.totalTestsSkipped = totalTestsSkipped;
+            return this;
+        }
+
+        @Override
+        public String toString() {
+            return "TestStatus{" +
+                    "lastRun=" + lastRun +
+                    ", running=" + running +
+                    ", testsRun=" + testsRun +
+                    ", testsPassed=" + testsPassed +
+                    ", testsFailed=" + testsFailed +
+                    ", testsSkipped=" + testsSkipped +
+                    '}';
+        }
+    }
+}
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
index d7c8ddabf9f882..b038d6f9b9c1cd 100644
--- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusDevModeTest.java
@@ -159,6 +159,10 @@ public List getLogRecords() {
         return inMemoryLogHandler.records;
     }
 
+    public void clearLogRecords() {
+        inMemoryLogHandler.clearRecords();
+    }
+
     public QuarkusDevModeTest setBuildSystemProperty(String name, String value) {
         buildSystemProperties.put(name, value);
         return this;
diff --git a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
index 8d28ccae9e6d3f..463cc04bb00c6c 100644
--- a/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
+++ b/test-framework/junit5-internal/src/main/java/io/quarkus/test/QuarkusUnitTest.java
@@ -572,8 +572,9 @@ private Throwable unwrapException(Throwable cause) {
     public void afterAll(ExtensionContext extensionContext) throws Exception {
         actualTestClass = null;
         actualTestInstance = null;
+        List records = null;
         if (assertLogRecords != null) {
-            assertLogRecords.accept(inMemoryLogHandler.records);
+            records = new ArrayList<>(inMemoryLogHandler.records);
         }
         rootLogger.setHandlers(originalHandlers);
         inMemoryLogHandler.clearRecords();
@@ -606,9 +607,12 @@ public void afterAll(ExtensionContext extensionContext) throws Exception {
             if (afterAllCustomizer != null) {
                 afterAllCustomizer.run();
             }
+            ClearCache.clearAnnotationCache();
+            GroovyCacheCleaner.clearGroovyCache();
+        }
+        if (records != null) {
+            assertLogRecords.accept(records);
         }
-        ClearCache.clearAnnotationCache();
-        GroovyCacheCleaner.clearGroovyCache();
     }
 
     @Override
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
new file mode 100644
index 00000000000000..20d39eaa8f52e8
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/AbstractJvmQuarkusTestExtension.java
@@ -0,0 +1,198 @@
+package io.quarkus.test.junit;
+
+import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation;
+import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.enterprise.inject.Alternative;
+
+import org.jboss.jandex.Index;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+import io.quarkus.bootstrap.BootstrapConstants;
+import io.quarkus.bootstrap.app.AugmentAction;
+import io.quarkus.bootstrap.app.CuratedApplication;
+import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.bootstrap.model.PathsCollection;
+import io.quarkus.bootstrap.model.gradle.QuarkusModel;
+import io.quarkus.bootstrap.runner.Timing;
+import io.quarkus.bootstrap.util.PathsUtils;
+import io.quarkus.bootstrap.utils.BuildToolHelper;
+import io.quarkus.deployment.dev.testing.CurrentTestApplication;
+import io.quarkus.runtime.configuration.ProfileManager;
+import io.quarkus.test.common.PathTestHelper;
+import io.quarkus.test.common.RestorableSystemProperties;
+import io.quarkus.test.common.TestClassIndexer;
+
+public class AbstractJvmQuarkusTestExtension {
+
+    protected static final String TEST_LOCATION = "test-location";
+    protected static final String TEST_CLASS = "test-class";
+
+    protected ClassLoader originalCl;
+
+    protected static Class quarkusTestProfile;
+
+    //needed for @Nested
+    protected static final Deque> currentTestClassStack = new ArrayDeque<>();
+
+    protected PrepareResult createAugmentor(ExtensionContext context, Class profile,
+            Collection shutdownTasks) throws Exception {
+
+        Class requiredTestClass = context.getRequiredTestClass();
+        Path testClassLocation = getTestClassesLocation(requiredTestClass);
+        final Path appClassLocation = getAppClassLocationForTestLocation(testClassLocation.toString());
+
+        PathsCollection.Builder rootBuilder = PathsCollection.builder();
+
+        if (!appClassLocation.equals(testClassLocation)) {
+            rootBuilder.add(testClassLocation);
+            // if test classes is a dir, we should also check whether test resources dir exists as a separate dir (gradle)
+            // TODO: this whole app/test path resolution logic is pretty dumb, it needs be re-worked using proper workspace discovery
+            final Path testResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(testClassLocation, "test");
+            if (testResourcesLocation != null) {
+                rootBuilder.add(testResourcesLocation);
+            }
+        }
+
+        originalCl = Thread.currentThread().getContextClassLoader();
+        Map sysPropRestore = new HashMap<>();
+        sysPropRestore.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP,
+                System.getProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP));
+
+        // clear the test.url system property as the value leaks into the run when using different profiles
+        System.clearProperty("test.url");
+        Map additional = new HashMap<>();
+
+        QuarkusTestProfile profileInstance = null;
+        if (profile != null) {
+            profileInstance = profile.getConstructor().newInstance();
+            additional.putAll(profileInstance.getConfigOverrides());
+            if (!profileInstance.getEnabledAlternatives().isEmpty()) {
+                additional.put("quarkus.arc.selected-alternatives", profileInstance.getEnabledAlternatives().stream()
+                        .peek((c) -> {
+                            if (!c.isAnnotationPresent(Alternative.class)) {
+                                throw new RuntimeException(
+                                        "Enabled alternative " + c + " is not annotated with @Alternative");
+                            }
+                        })
+                        .map(Class::getName).collect(Collectors.joining(",")));
+            }
+            if (profileInstance.disableApplicationLifecycleObservers()) {
+                additional.put("quarkus.arc.test.disable-application-lifecycle-observers", "true");
+            }
+            if (profileInstance.getConfigProfile() != null) {
+                additional.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profileInstance.getConfigProfile());
+            }
+            //we just use system properties for now
+            //its a lot simpler
+            shutdownTasks.add(RestorableSystemProperties.setProperties(additional)::close);
+        }
+
+        final Path projectRoot = Paths.get("").normalize().toAbsolutePath();
+        Path outputDir;
+        try {
+            // this should work for both maven and gradle
+            outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0));
+        } catch (Exception e) {
+            // this shouldn't happen since testClassLocation is usually found under the project dir
+            outputDir = projectRoot;
+        }
+
+        rootBuilder.add(appClassLocation);
+        final Path appResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(appClassLocation, "main");
+        if (appResourcesLocation != null) {
+            rootBuilder.add(appResourcesLocation);
+        }
+
+        // If gradle project running directly with IDE
+        if (System.getProperty(BootstrapConstants.SERIALIZED_TEST_APP_MODEL) == null) {
+            QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(projectRoot);
+            if (model != null) {
+                final PathsCollection classDirectories = PathsUtils
+                        .toPathsCollection(model.getWorkspace().getMainModule().getSourceSet()
+                                .getSourceDirectories());
+                for (Path classes : classDirectories) {
+                    if (Files.exists(classes) && !rootBuilder.contains(classes)) {
+                        rootBuilder.add(classes);
+                    }
+                }
+            }
+        } else if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) {
+            final String[] sourceDirectories = System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR).split(",");
+            for (String sourceDirectory : sourceDirectories) {
+                final Path directory = Paths.get(sourceDirectory);
+                if (Files.exists(directory) && !rootBuilder.contains(directory)) {
+                    rootBuilder.add(directory);
+                }
+            }
+        }
+        CuratedApplication curatedApplication;
+        if (CurrentTestApplication.curatedApplication != null) {
+            curatedApplication = CurrentTestApplication.curatedApplication;
+        } else {
+            final QuarkusBootstrap.Builder runnerBuilder = QuarkusBootstrap.builder()
+                    .setIsolateDeployment(true)
+                    .setMode(QuarkusBootstrap.Mode.TEST);
+            runnerBuilder.setTargetDirectory(outputDir);
+            runnerBuilder.setProjectRoot(projectRoot);
+            runnerBuilder.setApplicationRoot(rootBuilder.build());
+
+            curatedApplication = runnerBuilder
+                    .setTest(true)
+                    .build()
+                    .bootstrap();
+            shutdownTasks.add(curatedApplication::close);
+        }
+
+        if (curatedApplication.getAppModel().getUserDependencies().isEmpty()) {
+            throw new RuntimeException(
+                    "The tests were run against a directory that does not contain a Quarkus project. Please ensure that the test is configured to use the proper working directory.");
+        }
+
+        Index testClassesIndex = TestClassIndexer.indexTestClasses(requiredTestClass);
+        // we need to write the Index to make it reusable from other parts of the testing infrastructure that run in different ClassLoaders
+        TestClassIndexer.writeIndex(testClassesIndex, requiredTestClass);
+
+        Timing.staticInitStarted(curatedApplication.getBaseRuntimeClassLoader(),
+                curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication());
+        final Map props = new HashMap<>();
+        props.put(TEST_LOCATION, testClassLocation);
+        props.put(TEST_CLASS, requiredTestClass);
+        quarkusTestProfile = profile;
+        return new PrepareResult(curatedApplication
+                .createAugmentor(QuarkusTestExtension.TestBuildChainFunction.class.getName(), props), profileInstance,
+                curatedApplication);
+    }
+
+    protected Class getQuarkusTestProfile(ExtensionContext extensionContext) {
+        TestProfile annotation = extensionContext.getRequiredTestClass().getAnnotation(TestProfile.class);
+        Class selectedProfile = null;
+        if (annotation != null) {
+            selectedProfile = annotation.value();
+        }
+        return selectedProfile;
+    }
+
+    protected static class PrepareResult {
+        protected final AugmentAction augmentAction;
+        protected final QuarkusTestProfile profileInstance;
+        protected final CuratedApplication curatedApplication;
+
+        public PrepareResult(AugmentAction augmentAction, QuarkusTestProfile profileInstance,
+                CuratedApplication curatedApplication) {
+            this.augmentAction = augmentAction;
+            this.profileInstance = profileInstance;
+            this.curatedApplication = curatedApplication;
+        }
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
index 824d643121e02d..bd01ad32cd1d90 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/DisabledOnIntegrationTestCondition.java
@@ -12,6 +12,8 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.platform.commons.util.StringUtils;
 
+import io.quarkus.test.junit.main.QuarkusMainIntegrationTest;
+
 public class DisabledOnIntegrationTestCondition implements ExecutionCondition {
 
     private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult
@@ -43,7 +45,8 @@ private  ConditionEvaluationResult check(ExtensionContext
         Optional disabled = findAnnotation(element, annotationClass);
         if (disabled.isPresent()) {
             // Cannot use ExtensionState here because this condition needs to be evaluated before QuarkusTestExtension
-            boolean it = findAnnotation(context.getTestClass(), QuarkusIntegrationTest.class).isPresent();
+            boolean it = findAnnotation(context.getTestClass(), QuarkusIntegrationTest.class).isPresent()
+                    || findAnnotation(context.getTestClass(), QuarkusMainIntegrationTest.class).isPresent();
             if (it) {
                 String reason = disabled.map(valueExtractor)
                         .filter(StringUtils::isNotBlank)
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
index 49faa8cffa5fe3..33c9cb3d4a18d4 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/IntegrationTestUtil.java
@@ -293,16 +293,19 @@ public void accept(String s, String s2) {
             }
         }
 
-        return new DefaultDevServicesLaunchResult(propertyMap, networkId);
+        return new DefaultDevServicesLaunchResult(propertyMap, networkId, curatedApplication);
     }
 
     static class DefaultDevServicesLaunchResult implements ArtifactLauncher.InitContext.DevServicesLaunchResult {
         private final Map properties;
         private final String networkId;
+        private final CuratedApplication curatedApplication;
 
-        DefaultDevServicesLaunchResult(Map properties, String networkId) {
+        DefaultDevServicesLaunchResult(Map properties, String networkId,
+                CuratedApplication curatedApplication) {
             this.properties = properties;
             this.networkId = networkId;
+            this.curatedApplication = curatedApplication;
         }
 
         public Map properties() {
@@ -312,6 +315,11 @@ public Map properties() {
         public String networkId() {
             return networkId;
         }
+
+        @Override
+        public void close() {
+            curatedApplication.close();
+        }
     }
 
     static Properties readQuarkusArtifactProperties(ExtensionContext context) {
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java
index 3c9ffa9e5881c6..6906a0141f63e0 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/NativeTestExtension.java
@@ -198,6 +198,11 @@ public Map properties() {
                     public String networkId() {
                         return null;
                     }
+
+                    @Override
+                    public void close() {
+
+                    }
                 },
                 System.getProperty("native.image.path"),
                 requiredTestClass));
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
new file mode 100644
index 00000000000000..0b0460685efb3f
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
@@ -0,0 +1,234 @@
+package io.quarkus.test.junit;
+
+import static io.quarkus.test.junit.IntegrationTestUtil.determineBuildOutputDirectory;
+import static io.quarkus.test.junit.IntegrationTestUtil.determineTestProfileAndProperties;
+import static io.quarkus.test.junit.IntegrationTestUtil.getSysPropsToRestore;
+import static io.quarkus.test.junit.IntegrationTestUtil.handleDevServices;
+import static io.quarkus.test.junit.IntegrationTestUtil.readQuarkusArtifactProperties;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+
+import io.quarkus.test.common.ArtifactLauncher;
+import io.quarkus.test.common.TestResourceManager;
+import io.quarkus.test.junit.launcher.ArtifactLauncherProvider;
+import io.quarkus.test.junit.main.Launch;
+import io.quarkus.test.junit.main.LaunchResult;
+import io.quarkus.test.junit.main.QuarkusMainLauncher;
+import io.quarkus.test.junit.util.CloseAdaptor;
+
+public class QuarkusMainIntegrationTestExtension implements BeforeEachCallback, AfterEachCallback, ParameterResolver {
+
+    public static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace
+            .create("io.quarkus.test.main.integration");
+
+    private static Map devServicesProps;
+
+    ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult;
+    Properties quarkusArtifactProperties;
+
+    LaunchResult result;
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        var launch = context.getRequiredTestMethod().getAnnotation(Launch.class);
+        if (launch != null) {
+            String[] arguments = launch.value();
+            LaunchResult r = doLaunch(context, arguments);
+            Assertions.assertEquals(launch.exitCode(), r.exitCode(), "Exit code did not match");
+            this.result = r;
+        }
+    }
+
+    private LaunchResult doLaunch(ExtensionContext context, String[] arguments) throws Exception {
+        if (quarkusArtifactProperties == null) {
+            prepare(context);
+        }
+        var result = doProcessStart(context, arguments);
+        List out = Arrays.asList(new String(result.getOutput(), StandardCharsets.UTF_8).split("\n"));
+        List err = Arrays.asList(new String(result.getStderror(), StandardCharsets.UTF_8).split("\n"));
+        return new LaunchResult() {
+            @Override
+            public List getOutputStream() {
+                return out;
+            }
+
+            @Override
+            public List getErrorStream() {
+                return err;
+            }
+
+            @Override
+            public int exitCode() {
+                return result.getStatusCode();
+            }
+        };
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        result = null;
+    }
+
+    private void prepare(ExtensionContext extensionContext) throws Exception {
+        quarkusArtifactProperties = readQuarkusArtifactProperties(extensionContext);
+        String artifactType = quarkusArtifactProperties.getProperty("type");
+        if (artifactType == null) {
+            throw new IllegalStateException("Unable to determine the type of artifact created by the Quarkus build");
+        }
+        boolean isDockerLaunch = "jar-container".equals(artifactType) || "native-container".equals(artifactType);
+
+        ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult = handleDevServices(extensionContext,
+                isDockerLaunch);
+        devServicesProps = devServicesLaunchResult.properties();
+
+        ExtensionContext root = extensionContext.getRoot();
+        root.getStore(NAMESPACE).put("devServicesLaunchResult", new CloseAdaptor(devServicesLaunchResult));
+    }
+
+    private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, String[] args) {
+        try {
+            Class profile = IntegrationTestUtil.findProfile(context.getRequiredTestClass());
+            TestResourceManager testResourceManager = null;
+            Map old = new HashMap<>();
+            String artifactType = quarkusArtifactProperties.getProperty("type");
+            try {
+                Class requiredTestClass = context.getRequiredTestClass();
+
+                Map sysPropRestore = getSysPropsToRestore();
+                TestProfileAndProperties testProfileAndProperties = determineTestProfileAndProperties(profile, sysPropRestore);
+
+                testResourceManager = new TestResourceManager(requiredTestClass, profile,
+                        Collections.emptyList(), testProfileAndProperties.testProfile != null
+                                && testProfileAndProperties.testProfile.disableGlobalTestResources());
+                testResourceManager.init();
+                Map additionalProperties = new HashMap<>(testProfileAndProperties.properties);
+                additionalProperties.putAll(QuarkusMainIntegrationTestExtension.devServicesProps);
+                Map resourceManagerProps = testResourceManager.start();
+                for (Map.Entry i : resourceManagerProps.entrySet()) {
+                    old.put(i.getKey(), System.getProperty(i.getKey()));
+                    if (i.getValue() == null) {
+                        System.clearProperty(i.getKey());
+                    } else {
+                        System.setProperty(i.getKey(), i.getValue());
+                    }
+                }
+                additionalProperties.putAll(resourceManagerProps);
+
+                ArtifactLauncher launcher = null;
+                ServiceLoader loader = ServiceLoader.load(ArtifactLauncherProvider.class);
+                for (ArtifactLauncherProvider launcherProvider : loader) {
+                    if (launcherProvider.supportsArtifactType(artifactType)) {
+                        launcher = launcherProvider.create(
+                                new DefaultArtifactLauncherCreateContext(quarkusArtifactProperties, context, requiredTestClass,
+                                        devServicesLaunchResult));
+                        break;
+                    }
+                }
+                if (launcher == null) {
+                    throw new IllegalStateException(
+                            "Artifact type + '" + artifactType + "' is not supported by @QuarkusMainIntegrationTest");
+                }
+
+                launcher.includeAsSysProps(additionalProperties);
+                return launcher.runToCompletion(args);
+
+            } finally {
+
+                for (Map.Entry i : old.entrySet()) {
+                    old.put(i.getKey(), System.getProperty(i.getKey()));
+                    if (i.getValue() == null) {
+                        System.clearProperty(i.getKey());
+                    } else {
+                        System.setProperty(i.getKey(), i.getValue());
+                    }
+                }
+                if (testResourceManager != null) {
+                    testResourceManager.close();
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+            throws ParameterResolutionException {
+        Class type = parameterContext.getParameter().getType();
+        return type == LaunchResult.class || type == QuarkusMainLauncher.class;
+    }
+
+    @Override
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+            throws ParameterResolutionException {
+        Class type = parameterContext.getParameter().getType();
+        if (type == LaunchResult.class) {
+            return result;
+        } else if (type == QuarkusMainLauncher.class) {
+            return new QuarkusMainLauncher() {
+                @Override
+                public LaunchResult launch(String... args) {
+                    try {
+                        return doLaunch(extensionContext, args);
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            };
+        } else {
+            throw new RuntimeException("Parameter type not supported");
+        }
+    }
+
+    private static class DefaultArtifactLauncherCreateContext implements ArtifactLauncherProvider.CreateContext {
+        private final Properties quarkusArtifactProperties;
+        private final ExtensionContext context;
+        private final Class requiredTestClass;
+        private final ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult;
+
+        DefaultArtifactLauncherCreateContext(Properties quarkusArtifactProperties, ExtensionContext context,
+                Class requiredTestClass, ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult) {
+            this.quarkusArtifactProperties = quarkusArtifactProperties;
+            this.context = context;
+            this.requiredTestClass = requiredTestClass;
+            this.devServicesLaunchResult = devServicesLaunchResult;
+        }
+
+        @Override
+        public Properties quarkusArtifactProperties() {
+            return quarkusArtifactProperties;
+        }
+
+        @Override
+        public Path buildOutputDirectory() {
+            return determineBuildOutputDirectory(context);
+        }
+
+        @Override
+        public Class testClass() {
+            return requiredTestClass;
+        }
+
+        @Override
+        public ArtifactLauncher.InitContext.DevServicesLaunchResult devServicesLaunchResult() {
+            return devServicesLaunchResult;
+        }
+    }
+
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
new file mode 100644
index 00000000000000..59d4bef6e7900b
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainTestExtension.java
@@ -0,0 +1,188 @@
+package io.quarkus.test.junit;
+
+import java.io.Closeable;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingDeque;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+
+import io.quarkus.bootstrap.app.StartupAction;
+import io.quarkus.deployment.dev.testing.LogCapturingOutputFilter;
+import io.quarkus.dev.console.QuarkusConsole;
+import io.quarkus.dev.testing.TracingHandler;
+import io.quarkus.test.junit.main.Launch;
+import io.quarkus.test.junit.main.LaunchResult;
+import io.quarkus.test.junit.main.QuarkusMainIntegrationTest;
+import io.quarkus.test.junit.main.QuarkusMainLauncher;
+
+public class QuarkusMainTestExtension extends AbstractJvmQuarkusTestExtension
+        implements BeforeEachCallback, AfterEachCallback, ParameterResolver, BeforeAllCallback, AfterAllCallback {
+
+    public static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace
+            .create("io.quarkus.test.main.jvm");
+
+    private static Map devServicesProps;
+
+    PrepareResult prepareResult;
+
+    /**
+     * The result from an {@link Launch} test
+     */
+    LaunchResult result;
+
+    @Override
+    public void beforeEach(ExtensionContext context) throws Exception {
+        if (isIntegrationTest(context.getRequiredTestClass())) {
+            return;
+        }
+
+        ensurePrepared(context);
+        var launch = context.getRequiredTestMethod().getAnnotation(Launch.class);
+        if (launch != null) {
+            String[] arguments = launch.value();
+            LaunchResult r = doLaunch(context, arguments);
+            Assertions.assertEquals(launch.exitCode(), r.exitCode(),
+                    "Exit code did not match, output: " + r.getOutput() + " " + r.getErrorOutput());
+            this.result = r;
+        }
+    }
+
+    private void ensurePrepared(ExtensionContext context) throws Exception {
+        Class profile = getQuarkusTestProfile(context);
+        if (prepareResult == null) {
+            final LinkedBlockingDeque shutdownTasks = new LinkedBlockingDeque<>();
+            PrepareResult result = createAugmentor(context, profile, shutdownTasks);
+            prepareResult = result;
+        }
+    }
+
+    private LaunchResult doLaunch(ExtensionContext context, String[] arguments) throws Exception {
+        ensurePrepared(context);
+        QuarkusConsole.installRedirects();
+        LogCapturingOutputFilter filter = new LogCapturingOutputFilter(prepareResult.curatedApplication, false, false,
+                () -> true);
+        QuarkusConsole.addOutputFilter(filter);
+        try {
+            var result = doJavaStart(context, arguments);
+            //merge all the output into one, strip ansi, then split into lines
+            List out = Arrays
+                    .asList(String.join("", filter.captureOutput()).replaceAll("\\u001B\\[(.*?)[a-zA-Z]", "").split("\n"));
+            List err = Arrays
+                    .asList(String.join("", filter.captureErrorOutput()).replaceAll("\\u001B\\[(.*?)[a-zA-Z]", "").split("\n"));
+            return new LaunchResult() {
+                @Override
+                public List getOutputStream() {
+                    return out;
+                }
+
+                @Override
+                public List getErrorStream() {
+                    return err;
+                }
+
+                @Override
+                public int exitCode() {
+                    return result;
+                }
+            };
+        } finally {
+            QuarkusConsole.removeOutputFilter(filter);
+            Thread.currentThread().setContextClassLoader(originalCl);
+        }
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) throws Exception {
+        result = null;
+    }
+
+    private int doJavaStart(ExtensionContext context, String[] arguments) throws Exception {
+        TracingHandler.quarkusStarting();
+        Closeable testResourceManager = null;
+        try {
+            StartupAction startupAction = prepareResult.augmentAction.createInitialRuntimeApplication();
+            Thread.currentThread().setContextClassLoader(startupAction.getClassLoader());
+            return startupAction.runMainClassBlocking(arguments);
+        } catch (Throwable e) {
+
+            try {
+                if (testResourceManager != null) {
+                    testResourceManager.close();
+                }
+            } catch (Exception ex) {
+                e.addSuppressed(ex);
+            }
+            throw e;
+        } finally {
+            if (originalCl != null) {
+                Thread.currentThread().setContextClassLoader(originalCl);
+            }
+        }
+    }
+
+    @Override
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+            throws ParameterResolutionException {
+        if (isIntegrationTest(extensionContext.getRequiredTestClass())) {
+            return false;
+        }
+        Class type = parameterContext.getParameter().getType();
+        return type == LaunchResult.class || type == QuarkusMainLauncher.class;
+    }
+
+    @Override
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+            throws ParameterResolutionException {
+        Class type = parameterContext.getParameter().getType();
+        if (type == LaunchResult.class) {
+            return result;
+        } else if (type == QuarkusMainLauncher.class) {
+            return new QuarkusMainLauncher() {
+                @Override
+                public LaunchResult launch(String... args) {
+                    try {
+                        return doLaunch(extensionContext, args);
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            };
+        } else {
+            throw new RuntimeException("Parameter type not supported");
+        }
+    }
+
+    private boolean isIntegrationTest(Class clazz) {
+        for (Class i : currentTestClassStack) {
+            if (i.isAnnotationPresent(QuarkusMainIntegrationTest.class)) {
+                return true;
+            }
+        }
+        if (clazz.isAnnotationPresent(QuarkusMainIntegrationTest.class)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void afterAll(ExtensionContext context) throws Exception {
+        currentTestClassStack.pop();
+    }
+
+    @Override
+    public void beforeAll(ExtensionContext context) throws Exception {
+        QuarkusConsole.installRedirects();
+        currentTestClassStack.push(context.getRequiredTestClass());
+
+    }
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
index 6a4574d813a6da..de9eeac14d8079 100644
--- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusTestExtension.java
@@ -1,7 +1,5 @@
 package io.quarkus.test.junit;
 
-import static io.quarkus.test.common.PathTestHelper.getAppClassLocationForTestLocation;
-import static io.quarkus.test.common.PathTestHelper.getTestClassesLocation;
 import static io.quarkus.test.junit.IntegrationTestUtil.getAdditionalTestResources;
 
 import java.io.Closeable;
@@ -12,16 +10,11 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.AbstractMap;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Deque;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -42,9 +35,6 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import javax.enterprise.inject.Alternative;
 
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
 import org.jboss.jandex.AnnotationInstance;
@@ -71,19 +61,11 @@
 import org.junit.jupiter.api.extension.TestInstantiationException;
 import org.opentest4j.TestAbortedException;
 
-import io.quarkus.bootstrap.BootstrapConstants;
 import io.quarkus.bootstrap.app.AugmentAction;
-import io.quarkus.bootstrap.app.CuratedApplication;
-import io.quarkus.bootstrap.app.QuarkusBootstrap;
 import io.quarkus.bootstrap.app.RunningQuarkusApplication;
 import io.quarkus.bootstrap.app.StartupAction;
 import io.quarkus.bootstrap.classloading.ClassPathElement;
 import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
-import io.quarkus.bootstrap.model.PathsCollection;
-import io.quarkus.bootstrap.model.gradle.QuarkusModel;
-import io.quarkus.bootstrap.runner.Timing;
-import io.quarkus.bootstrap.util.PathsUtils;
-import io.quarkus.bootstrap.utils.BuildToolHelper;
 import io.quarkus.builder.BuildChainBuilder;
 import io.quarkus.builder.BuildContext;
 import io.quarkus.builder.BuildStep;
@@ -91,7 +73,6 @@
 import io.quarkus.deployment.builditem.TestAnnotationBuildItem;
 import io.quarkus.deployment.builditem.TestClassBeanBuildItem;
 import io.quarkus.deployment.builditem.TestClassPredicateBuildItem;
-import io.quarkus.deployment.dev.testing.CurrentTestApplication;
 import io.quarkus.dev.testing.TracingHandler;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.DurationConverter;
@@ -118,14 +99,12 @@
 import io.quarkus.test.junit.internal.DeepClone;
 import io.quarkus.test.junit.internal.SerializationWithXStreamFallbackDeepClone;
 
-public class QuarkusTestExtension
+public class QuarkusTestExtension extends AbstractJvmQuarkusTestExtension
         implements BeforeEachCallback, AfterEachCallback, BeforeAllCallback, InvocationInterceptor, AfterAllCallback,
         ParameterResolver, ExecutionCondition {
 
     private static final Logger log = Logger.getLogger(QuarkusTestExtension.class);
 
-    protected static final String TEST_LOCATION = "test-location";
-    protected static final String TEST_CLASS = "test-class";
     public static final String QUARKUS_TEST_HANG_DETECTION_TIMEOUT = "quarkus.test.hang-detection-timeout";
     public static final String IO_QUARKUS_TESTING_TYPE = "io.quarkus.testing.type";
 
@@ -135,7 +114,6 @@ public class QuarkusTestExtension
     private static Object actualTestInstance;
     // needed for @Nested
     private static Object outerInstance;
-    private static ClassLoader originalCl;
     private static RunningQuarkusApplication runningQuarkusApplication;
     private static Pattern clonePattern;
     private static Throwable firstException; //if this is set then it will be thrown from the very first test that is run, the rest are aborted
@@ -146,7 +124,6 @@ public class QuarkusTestExtension
     private static List afterEachCallbacks;
     private static List afterAllCallbacks;
     private static Class quarkusTestMethodContextClass;
-    private static Class quarkusTestProfile;
     private static boolean hasPerTestResources;
     private static Class currentJUnitTestClass;
     private static List, String>> testHttpEndpointProviders;
@@ -154,8 +131,6 @@ public class QuarkusTestExtension
     private static List testMethodInvokers;
 
     private static DeepClone deepClone;
-    //needed for @Nested
-    private static final Deque> currentTestClassStack = new ArrayDeque<>();
     private static volatile ScheduledExecutorService hangDetectionExecutor;
     private static volatile Duration hangTimeout;
     private static volatile ScheduledFuture hangTaskKey;
@@ -231,137 +206,15 @@ public Thread newThread(Runnable r) {
         hangTaskKey = hangDetectionExecutor.schedule(hangDetectionTask, hangTimeout.toMillis(), TimeUnit.MILLISECONDS);
 
         quarkusTestProfile = profile;
-        currentJUnitTestClass = context.getRequiredTestClass();
+        Class requiredTestClass = context.getRequiredTestClass();
+        currentJUnitTestClass = requiredTestClass;
         Closeable testResourceManager = null;
         try {
             final LinkedBlockingDeque shutdownTasks = new LinkedBlockingDeque<>();
+            PrepareResult result = createAugmentor(context, profile, shutdownTasks);
+            AugmentAction augmentAction = result.augmentAction;
+            QuarkusTestProfile profileInstance = result.profileInstance;
 
-            Class requiredTestClass = context.getRequiredTestClass();
-            Path testClassLocation = getTestClassesLocation(requiredTestClass);
-            final Path appClassLocation = getAppClassLocationForTestLocation(testClassLocation.toString());
-
-            PathsCollection.Builder rootBuilder = PathsCollection.builder();
-
-            if (!appClassLocation.equals(testClassLocation)) {
-                rootBuilder.add(testClassLocation);
-                // if test classes is a dir, we should also check whether test resources dir exists as a separate dir (gradle)
-                // TODO: this whole app/test path resolution logic is pretty dumb, it needs be re-worked using proper workspace discovery
-                final Path testResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(testClassLocation, "test");
-                if (testResourcesLocation != null) {
-                    rootBuilder.add(testResourcesLocation);
-                }
-            }
-
-            originalCl = Thread.currentThread().getContextClassLoader();
-            Map sysPropRestore = new HashMap<>();
-            sysPropRestore.put(ProfileManager.QUARKUS_TEST_PROFILE_PROP,
-                    System.getProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP));
-
-            // clear the test.url system property as the value leaks into the run when using different profiles
-            System.clearProperty("test.url");
-
-            QuarkusTestProfile profileInstance = null;
-            if (profile != null) {
-                profileInstance = profile.getConstructor().newInstance();
-                Map additional = new HashMap<>(profileInstance.getConfigOverrides());
-                if (!profileInstance.getEnabledAlternatives().isEmpty()) {
-                    additional.put("quarkus.arc.selected-alternatives", profileInstance.getEnabledAlternatives().stream()
-                            .peek((c) -> {
-                                if (!c.isAnnotationPresent(Alternative.class)) {
-                                    throw new RuntimeException(
-                                            "Enabled alternative " + c + " is not annotated with @Alternative");
-                                }
-                            })
-                            .map(Class::getName).collect(Collectors.joining(",")));
-                }
-                if (profileInstance.disableApplicationLifecycleObservers()) {
-                    additional.put("quarkus.arc.test.disable-application-lifecycle-observers", "true");
-                }
-                if (profileInstance.getConfigProfile() != null) {
-                    System.setProperty(ProfileManager.QUARKUS_TEST_PROFILE_PROP, profileInstance.getConfigProfile());
-                }
-                //we just use system properties for now
-                //its a lot simpler
-                for (Map.Entry i : additional.entrySet()) {
-                    sysPropRestore.put(i.getKey(), System.getProperty(i.getKey()));
-                }
-                for (Map.Entry i : additional.entrySet()) {
-                    System.setProperty(i.getKey(), i.getValue());
-                }
-            }
-
-            final Path projectRoot = Paths.get("").normalize().toAbsolutePath();
-            Path outputDir;
-            try {
-                // this should work for both maven and gradle
-                outputDir = projectRoot.resolve(projectRoot.relativize(testClassLocation).getName(0));
-            } catch (Exception e) {
-                // this shouldn't happen since testClassLocation is usually found under the project dir
-                outputDir = projectRoot;
-            }
-
-            rootBuilder.add(appClassLocation);
-            final Path appResourcesLocation = PathTestHelper.getResourcesForClassesDirOrNull(appClassLocation, "main");
-            if (appResourcesLocation != null) {
-                rootBuilder.add(appResourcesLocation);
-            }
-
-            // If gradle project running directly with IDE
-            if (System.getProperty(BootstrapConstants.SERIALIZED_TEST_APP_MODEL) == null) {
-                QuarkusModel model = BuildToolHelper.enableGradleAppModelForTest(projectRoot);
-                if (model != null) {
-                    final PathsCollection classDirectories = PathsUtils
-                            .toPathsCollection(model.getWorkspace().getMainModule().getSourceSet()
-                                    .getSourceDirectories());
-                    for (Path classes : classDirectories) {
-                        if (Files.exists(classes) && !rootBuilder.contains(classes)) {
-                            rootBuilder.add(classes);
-                        }
-                    }
-                }
-            } else if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) {
-                final String[] sourceDirectories = System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR).split(",");
-                for (String sourceDirectory : sourceDirectories) {
-                    final Path directory = Paths.get(sourceDirectory);
-                    if (Files.exists(directory) && !rootBuilder.contains(directory)) {
-                        rootBuilder.add(directory);
-                    }
-                }
-            }
-            CuratedApplication curatedApplication;
-            if (CurrentTestApplication.curatedApplication != null) {
-                curatedApplication = CurrentTestApplication.curatedApplication;
-            } else {
-                final QuarkusBootstrap.Builder runnerBuilder = QuarkusBootstrap.builder()
-                        .setIsolateDeployment(true)
-                        .setMode(QuarkusBootstrap.Mode.TEST);
-                runnerBuilder.setTargetDirectory(outputDir);
-                runnerBuilder.setProjectRoot(projectRoot);
-                runnerBuilder.setApplicationRoot(rootBuilder.build());
-
-                curatedApplication = runnerBuilder
-                        .setTest(true)
-                        .build()
-                        .bootstrap();
-                shutdownTasks.add(curatedApplication::close);
-            }
-
-            if (curatedApplication.getAppModel().getUserDependencies().isEmpty()) {
-                throw new RuntimeException(
-                        "The tests were run against a directory that does not contain a Quarkus project. Please ensure that the test is configured to use the proper working directory.");
-            }
-
-            Index testClassesIndex = TestClassIndexer.indexTestClasses(requiredTestClass);
-            // we need to write the Index to make it reusable from other parts of the testing infrastructure that run in different ClassLoaders
-            TestClassIndexer.writeIndex(testClassesIndex, requiredTestClass);
-
-            Timing.staticInitStarted(curatedApplication.getBaseRuntimeClassLoader(),
-                    curatedApplication.getQuarkusBootstrap().isAuxiliaryApplication());
-            final Map props = new HashMap<>();
-            props.put(TEST_LOCATION, testClassLocation);
-            props.put(TEST_CLASS, requiredTestClass);
-            AugmentAction augmentAction = curatedApplication
-                    .createAugmentor(TestBuildChainFunction.class.getName(), props);
             testHttpEndpointProviders = TestHttpEndpointProvider.load();
             StartupAction startupAction = augmentAction.createInitialRuntimeApplication();
             Thread.currentThread().setContextClassLoader(startupAction.getClassLoader());
@@ -420,26 +273,10 @@ public void close() throws IOException {
                             }
                         } finally {
                             try {
-                                for (Map.Entry entry : sysPropRestore.entrySet()) {
-                                    String val = entry.getValue();
-                                    if (val == null) {
-                                        System.clearProperty(entry.getKey());
-                                    } else {
-                                        System.setProperty(entry.getKey(), val);
-                                    }
-                                }
                                 tm.close();
                             } finally {
                                 GroovyCacheCleaner.clearGroovyCache();
-                                if (hangTaskKey != null) {
-                                    hangTaskKey.cancel(true);
-                                    hangTaskKey = null;
-                                }
-                                var h = hangDetectionExecutor;
-                                if (h != null) {
-                                    h.shutdownNow();
-                                    hangDetectionExecutor = null;
-                                }
+                                shutdownHangDetection();
                             }
                         }
                         try {
@@ -468,6 +305,18 @@ public void close() throws IOException {
         }
     }
 
+    private void shutdownHangDetection() {
+        if (hangTaskKey != null) {
+            hangTaskKey.cancel(true);
+            hangTaskKey = null;
+        }
+        var h = hangDetectionExecutor;
+        if (h != null) {
+            h.shutdownNow();
+            hangDetectionExecutor = null;
+        }
+    }
+
     private void populateDeepCloneField(StartupAction startupAction) {
         deepClone = new SerializationWithXStreamFallbackDeepClone(startupAction.getClassLoader());
     }
@@ -711,15 +560,6 @@ private ExtensionState ensureStarted(ExtensionContext extensionContext) {
         return state;
     }
 
-    private Class getQuarkusTestProfile(ExtensionContext extensionContext) {
-        TestProfile annotation = extensionContext.getRequiredTestClass().getAnnotation(TestProfile.class);
-        Class selectedProfile = null;
-        if (annotation != null) {
-            selectedProfile = annotation.value();
-        }
-        return selectedProfile;
-    }
-
     private static ClassLoader setCCL(ClassLoader cl) {
         final Thread thread = Thread.currentThread();
         final ClassLoader original = thread.getContextClassLoader();
@@ -858,7 +698,6 @@ public  T interceptTestClassConstructor(Invocation invocation,
 
     private void initTestState(ExtensionContext extensionContext, ExtensionState state) {
         try {
-            Class previousActualTestClass = actualTestClass;
             actualTestClass = Class.forName(extensionContext.getRequiredTestClass().getName(), true,
                     Thread.currentThread().getContextClassLoader());
             outerInstance = null;
@@ -988,13 +827,13 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation
         try {
             Class testClassFromTCCL = Class.forName(extensionContext.getRequiredTestClass().getName(), true,
                     Thread.currentThread().getContextClassLoader());
-            Method newMethod = determineTCCLExtensionMethod(invocationContext, testClassFromTCCL);
+            Method newMethod = determineTCCLExtensionMethod(invocationContext.getExecutable(), testClassFromTCCL);
             boolean methodFromEnclosing = false;
             // this is needed to support before*** and after*** methods that are part of class that encloses the test class
             // (the test class is in this case a @Nested test)
             if ((newMethod == null) && (testClassFromTCCL.getEnclosingClass() != null)) {
                 testClassFromTCCL = testClassFromTCCL.getEnclosingClass();
-                newMethod = determineTCCLExtensionMethod(invocationContext, testClassFromTCCL);
+                newMethod = determineTCCLExtensionMethod(invocationContext.getExecutable(), testClassFromTCCL);
                 methodFromEnclosing = true;
             }
             if (newMethod == null) {
@@ -1035,8 +874,11 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation
                         cloneRequired = false;
                     } else if (TestInfo.class.isAssignableFrom(theclass)) {
                         TestInfo info = (TestInfo) arg;
+                        Method newTestMethod = info.getTestMethod().isPresent()
+                                ? determineTCCLExtensionMethod(info.getTestMethod().get(), testClassFromTCCL)
+                                : null;
                         replacement = new TestInfoImpl(info.getDisplayName(), info.getTags(), Optional.of(testClassFromTCCL),
-                                Optional.of(newMethod));
+                                Optional.ofNullable(newTestMethod));
                     } else if (clonePattern.matcher(className).matches()) {
                         cloneRequired = true;
                     } else {
@@ -1089,13 +931,14 @@ private Object runExtensionMethod(ReflectiveInvocationContext invocation
         }
     }
 
-    private Method determineTCCLExtensionMethod(ReflectiveInvocationContext invocationContext, Class c)
+    private Method determineTCCLExtensionMethod(Method originalMethod, Class c)
             throws ClassNotFoundException {
+
         Method newMethod = null;
         while (c != Object.class) {
-            if (c.getName().equals(invocationContext.getExecutable().getDeclaringClass().getName())) {
+            if (c.getName().equals(originalMethod.getDeclaringClass().getName())) {
                 try {
-                    Class[] originalParameterTypes = invocationContext.getExecutable().getParameterTypes();
+                    Class[] originalParameterTypes = originalMethod.getParameterTypes();
                     List> parameterTypesFromTccl = new ArrayList<>(originalParameterTypes.length);
                     for (Class type : originalParameterTypes) {
                         if (type.isPrimitive()) {
@@ -1106,7 +949,7 @@ private Method determineTCCLExtensionMethod(ReflectiveInvocationContext
                                             Thread.currentThread().getContextClassLoader()));
                         }
                     }
-                    newMethod = c.getDeclaredMethod(invocationContext.getExecutable().getName(),
+                    newMethod = c.getDeclaredMethod(originalMethod.getName(),
                             parameterTypesFromTccl.toArray(new Class[0]));
                     break;
                 } catch (NoSuchMethodException ignored) {
@@ -1322,6 +1165,7 @@ class FailedCleanup implements ExtensionContext.Store.CloseableResource {
 
         @Override
         public void close() {
+            shutdownHangDetection();
             firstException = null;
             failedBoot = false;
             ConfigProviderResolver.setInstance(null);
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java
new file mode 100644
index 00000000000000..ec373bf40b970f
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/Launch.java
@@ -0,0 +1,24 @@
+package io.quarkus.test.junit.main;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for {@link QuarkusMainTest} and {@link QuarkusMainIntegrationTest} used to
+ *
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Launch {
+    /**
+     * The program arguments to launch with
+     */
+    String[] value();
+
+    /**
+     * Expected return code
+     */
+    int exitCode() default 0;
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java
new file mode 100644
index 00000000000000..71c62ba23186ea
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/LaunchResult.java
@@ -0,0 +1,25 @@
+package io.quarkus.test.junit.main;
+
+import java.util.List;
+
+public interface LaunchResult {
+
+    default String getOutput() {
+        return String.join("\n", getOutputStream());
+    }
+
+    default String getErrorOutput() {
+        return String.join("\n", getErrorStream());
+    }
+
+    default void echoSystemOut() {
+        System.out.println(getOutput());
+        System.out.println();
+    }
+
+    List getOutputStream();
+
+    List getErrorStream();
+
+    int exitCode();
+}
\ No newline at end of file
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java
new file mode 100644
index 00000000000000..cd6746e191e207
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainIntegrationTest.java
@@ -0,0 +1,32 @@
+package io.quarkus.test.junit.main;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.quarkus.test.junit.QuarkusMainIntegrationTestExtension;
+
+/**
+ * Annotation that indicates that this test should be run on the result of the Quarkus build.
+ * That means that if a jar was created, that jar is launched using {@code java -jar ...}
+ * (and thus runs in a separate JVM than the test).
+ * If instead a native image was created, the that image is launched.
+ * Finally, if a container image was created during the build, then a new container is created and run.
+ *
+ * The standard usage pattern is expected to be a base test class that runs the
+ * tests using the JVM version of Quarkus, with a subclass that extends the base
+ * test and is annotated with this annotation to perform the same checks against
+ * the native image.
+ *
+ * Injection of beans into a test class using {@code @Inject} is not supported
+ * in {@code QuarkusMainIntegrationTest}.
+ */
+@Target(ElementType.TYPE)
+@ExtendWith({ QuarkusMainIntegrationTestExtension.class })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface QuarkusMainIntegrationTest {
+
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java
new file mode 100644
index 00000000000000..5a2167e1492f82
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainLauncher.java
@@ -0,0 +1,7 @@
+package io.quarkus.test.junit.main;
+
+public interface QuarkusMainLauncher {
+
+    LaunchResult launch(String... args);
+
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java
new file mode 100644
index 00000000000000..62129185deb862
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/main/QuarkusMainTest.java
@@ -0,0 +1,29 @@
+package io.quarkus.test.junit.main;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import io.quarkus.test.junit.QuarkusMainTestExtension;
+
+/**
+ * Annotation that indicates that this test should run the Quarkus main method
+ * inside the current JVM. A new in-memory quarkus application will be generated,
+ * and will be run to completion.
+ *
+ * Injection of beans into a test class using {@code @Inject} is not supported
+ * in {@code QuarkusMainTest}.
+ *
+ * Note that this can be used in conjunction with other {@link io.quarkus.test.junit.QuarkusTest}
+ * based tests. {@code QuarkusMainTest} is used to check a complete execution, while {@code QuarkusTest} can be
+ * used to inject components and perform more fine-grained checks.
+ */
+@Target(ElementType.TYPE)
+@ExtendWith({ QuarkusMainTestExtension.class })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface QuarkusMainTest {
+
+}
diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java
new file mode 100644
index 00000000000000..5875b535ae6aae
--- /dev/null
+++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/util/CloseAdaptor.java
@@ -0,0 +1,17 @@
+package io.quarkus.test.junit.util;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class CloseAdaptor implements ExtensionContext.Store.CloseableResource {
+
+    final AutoCloseable closeable;
+
+    public CloseAdaptor(AutoCloseable closeable) {
+        this.closeable = closeable;
+    }
+
+    @Override
+    public void close() throws Throwable {
+        closeable.close();
+    }
+}
diff --git a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java
new file mode 100644
index 00000000000000..60cac1983278ad
--- /dev/null
+++ b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/client/KeycloakTestClient.java
@@ -0,0 +1,163 @@
+package io.quarkus.test.keycloak.client;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.microprofile.config.ConfigProvider;
+import org.keycloak.representations.AccessTokenResponse;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.util.JsonSerialization;
+
+import io.quarkus.runtime.configuration.ConfigurationException;
+import io.quarkus.test.common.DevServicesContext;
+import io.restassured.RestAssured;
+import io.restassured.specification.RequestSpecification;
+
+public class KeycloakTestClient implements DevServicesContext.ContextAware {
+
+    private final static String AUTH_SERVER_URL_PROP = "quarkus.oidc.auth-server-url";
+    private final static String CLIENT_ID_PROP = "quarkus.oidc.client-id";
+    private final static String CLIENT_SECRET_PROP = "quarkus.oidc.credentials.secret";
+
+    static {
+        RestAssured.useRelaxedHTTPSValidation();
+    }
+
+    private DevServicesContext testContext;
+
+    public KeycloakTestClient() {
+
+    }
+
+    /**
+     * Get an access token using a password grant with a provided user name.
+     * User secret will be the same as the user name, client id will be set to 'quarkus-app' and client secret to 'secret'.
+     */
+    public String getAccessToken(String userName) {
+        return getAccessToken(userName, getClientId());
+    }
+
+    /**
+     * Get an access token using a password grant with the provided user name and client id.
+     * User secret will be the same as the user name, client secret will be set to 'secret'.
+     */
+    public String getAccessToken(String userName, String clientId) {
+        return getAccessToken(userName, userName, clientId);
+    }
+
+    /**
+     * Get an access token using a password grant with the provided user name, user secret and client id.
+     * Client secret will be set to 'secret'.
+     */
+    public String getAccessToken(String userName, String userSecret, String clientId) {
+        return getAccessToken(userName, userSecret, clientId, getClientSecret());
+    }
+
+    /**
+     * Get an access token using a password grant with the provided user name, user secret, client id and secret.
+     * Set the client secret to an empty string or null if it is not required.
+     */
+    public String getAccessToken(String userName, String userSecret, String clientId, String clientSecret) {
+        return getAccessTokenInternal(userName, userSecret, clientId, clientSecret, getAuthServerUrl());
+    }
+
+    private String getAccessTokenInternal(String userName, String userSecret, String clientId, String clientSecret,
+            String authServerUrl) {
+        RequestSpecification requestSpec = RestAssured.given().param("grant_type", "password")
+                .param("username", userName)
+                .param("password", userSecret)
+                .param("client_id", clientId);
+        if (clientSecret != null && !clientSecret.isBlank()) {
+            requestSpec = requestSpec.param("client_secret", clientSecret);
+        }
+        return requestSpec.when().post(authServerUrl + "/protocol/openid-connect/token")
+                .as(AccessTokenResponse.class).getToken();
+    }
+
+    private String getClientId() {
+        return getPropertyValue(CLIENT_ID_PROP, "quarkus-app");
+    }
+
+    private String getClientSecret() {
+        return getPropertyValue(CLIENT_SECRET_PROP, "secret");
+    }
+
+    /**
+     * Get an admin access token which can be used to create Keycloak realms and perform other Keycloak administration tasks.
+     */
+    public String getAdminAccessToken() {
+        return getAccessTokenInternal("admin", "admin", "admin-cli", null, getAuthServerBaseUrl() + "/realms/master");
+    }
+
+    /**
+     * Return URL string pointing to a Keycloak base endpoint.
+     * For example: 'http://localhost:8081/auth'.
+     */
+    public String getAuthServerBaseUrl() {
+        try {
+            var uri = new URI(getAuthServerUrl());
+            return new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), "/auth", null, null)
+                    .toString();
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Return URL string pointing to a Keycloak authentication endpoint configured with a 'quarkus.oidc.auth-server'
+     * property.
+     * For example: 'http://localhost:8081/auth/realms/quarkus'.
+     */
+    public String getAuthServerUrl() {
+        String authServerUrl = getPropertyValue(AUTH_SERVER_URL_PROP, null);
+        if (authServerUrl == null) {
+            throw new ConfigurationException(AUTH_SERVER_URL_PROP + " is not configured");
+        }
+        return authServerUrl;
+    }
+
+    /**
+     * Create a realm.
+     */
+    public void createRealm(RealmRepresentation realm) {
+        try {
+            RestAssured
+                    .given()
+                    .auth().oauth2(getAdminAccessToken())
+                    .contentType("application/json")
+                    .body(JsonSerialization.writeValueAsBytes(realm))
+                    .when()
+                    .post(getAuthServerBaseUrl() + "/admin/realms").then()
+                    .statusCode(201);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Delete a realm
+     */
+    public void deleteRealm(String realm) {
+        RestAssured
+                .given()
+                .auth().oauth2(getAdminAccessToken())
+                .when()
+                .delete(getAuthServerBaseUrl() + "/admin/realms/" + realm).then().statusCode(204);
+    }
+
+    private String getPropertyValue(String prop, String defaultValue) {
+        return ConfigProvider.getConfig().getOptionalValue(prop, String.class)
+                .orElseGet(() -> getDevProperty(prop, defaultValue));
+    }
+
+    private String getDevProperty(String prop, String defaultValue) {
+        String value = testContext == null ? null : testContext.devServicesProperties().get(prop);
+        return value == null ? defaultValue : value;
+    }
+
+    @Override
+    public void setIntegrationTestContext(DevServicesContext context) {
+        this.testContext = context;
+    }
+}
diff --git a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestClient.java b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestClient.java
deleted file mode 100644
index f1120c07776b86..00000000000000
--- a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestClient.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package io.quarkus.test.keycloak.server;
-
-import org.eclipse.microprofile.config.ConfigProvider;
-import org.keycloak.representations.AccessTokenResponse;
-
-import io.quarkus.runtime.configuration.ConfigurationException;
-import io.quarkus.test.common.DevServicesContext;
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-import io.restassured.RestAssured;
-
-public class KeycloakTestClient implements DevServicesContext.ContextAware {
-
-    private final static String AUTH_SERVER_URL_PROP = "quarkus.oidc.auth-server-url";
-    private final static String CLIENT_ID_PROP = "quarkus.oidc.client-id";
-    private final static String CLIENT_SECRET_PROP = "quarkus.oidc.credentials.secret";
-
-    static {
-        RestAssured.useRelaxedHTTPSValidation();
-    }
-
-    private DevServicesContext testContext;
-
-    public KeycloakTestClient() {
-
-    }
-
-    public KeycloakTestClient(QuarkusIntegrationTest.Context testContext) {
-        this.testContext = testContext;
-    }
-
-    public String getAccessToken(String userName) {
-        return getAccessToken(userName, getClientId());
-    }
-
-    public String getAccessToken(String userName, String clientId) {
-        return getAccessToken(userName, userName, clientId);
-    }
-
-    public String getAccessToken(String userName, String userSecret, String clientId) {
-        return getAccessToken(userName, userSecret, clientId, getClientSecret());
-    }
-
-    public String getAccessToken(String userName, String userSecret, String clientId, String clientSecret) {
-        return RestAssured.given().param("grant_type", "password")
-                .param("username", userName)
-                .param("password", userSecret)
-                .param("client_id", clientId)
-                .param("client_secret", clientSecret)
-                .when()
-                .post(getAuthServerUrl() + "/protocol/openid-connect/token")
-                .as(AccessTokenResponse.class).getToken();
-    }
-
-    private String getClientId() {
-        return getPropertyValue(CLIENT_ID_PROP, "quarkus-app");
-    }
-
-    private String getClientSecret() {
-        return getPropertyValue(CLIENT_SECRET_PROP, "secret");
-    }
-
-    public String getAuthServerUrl() {
-        String authServerUrl = getPropertyValue(AUTH_SERVER_URL_PROP, null);
-        if (authServerUrl == null) {
-            throw new ConfigurationException(AUTH_SERVER_URL_PROP + " is not configured");
-        }
-        return authServerUrl;
-    }
-
-    private String getPropertyValue(String prop, String defaultValue) {
-        return ConfigProvider.getConfig().getOptionalValue(prop, String.class)
-                .orElseGet(() -> getDevProperty(prop, defaultValue));
-    }
-
-    private String getDevProperty(String prop, String defaultValue) {
-        String value = testContext == null ? null : testContext.devServicesProperties().get(prop);
-        return value == null ? defaultValue : value;
-    }
-
-    @Override
-    public void setIntegrationTestContext(DevServicesContext context) {
-        this.testContext = context;
-    }
-}
diff --git a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java
index f64f8cfac0c3b1..dd8c8eb963c436 100644
--- a/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java
+++ b/test-framework/keycloak-server/src/main/java/io/quarkus/test/keycloak/server/KeycloakTestResourceLifecycleManager.java
@@ -95,6 +95,7 @@ public Map start() {
 
         Map conf = new HashMap<>();
         conf.put("keycloak.url", KEYCLOAK_SERVER_URL);
+        conf.put("quarkus.oidc.auth-server-url", KEYCLOAK_SERVER_URL + "/realms/" + KEYCLOAK_REALM);
 
         return conf;
     }