diff --git a/app-metadata/deployment/src/main/java/io/quarkus/ts/openshift/app/metadata/AppMetadataCollector.java b/app-metadata/deployment/src/main/java/io/quarkus/ts/openshift/app/metadata/AppMetadataCollector.java
index 12f24aa6..f4136ce8 100644
--- a/app-metadata/deployment/src/main/java/io/quarkus/ts/openshift/app/metadata/AppMetadataCollector.java
+++ b/app-metadata/deployment/src/main/java/io/quarkus/ts/openshift/app/metadata/AppMetadataCollector.java
@@ -33,7 +33,7 @@ public void collectAppMetadata(ContainerImageInfoBuildItem containerImage,
} else if (liveness.isPresent()) {
knownEndpoint = liveness.get().getPath();
} else {
- knownEndpoint = httpRoot.adjustPath("/"); // TODO ?
+ knownEndpoint = httpRoot.resolvePath("/"); // TODO ?
}
String deploymentTarget = ConfigProvider.getConfig()
diff --git a/common/pom.xml b/common/pom.xml
index e3a70214..9bdb9d98 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -55,12 +55,10 @@
io.quarkus
quarkus-junit5
- provided
org.testcontainers
testcontainers
- provided
diff --git a/common/src/main/java/io/quarkus/ts/openshift/common/OpenShiftTestExtension.java b/common/src/main/java/io/quarkus/ts/openshift/common/OpenShiftTestExtension.java
index 0e8482d0..906d45bf 100644
--- a/common/src/main/java/io/quarkus/ts/openshift/common/OpenShiftTestExtension.java
+++ b/common/src/main/java/io/quarkus/ts/openshift/common/OpenShiftTestExtension.java
@@ -262,7 +262,7 @@ private void setUpRestAssured(ExtensionContext context) throws Exception {
Route route = oc.routes().withName(metadata.appName).get();
if (route == null) {
throw new OpenShiftTestException(
- "Missing route " + metadata.appName + ", did you set quarkus.openshift.expose=true?");
+ "Missing route " + metadata.appName + ", did you set quarkus.openshift.route.expose=true?");
}
if (route.getSpec().getTls() != null) {
RestAssured.useRelaxedHTTPSValidation();
diff --git a/config-secret/api-server/src/main/resources/application.properties b/config-secret/api-server/src/main/resources/application.properties
index f681c5ab..ab5acd9e 100644
--- a/config-secret/api-server/src/main/resources/application.properties
+++ b/config-secret/api-server/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.kubernetes-config.enabled=true
quarkus.kubernetes-config.secrets.enabled=true
quarkus.kubernetes-config.secrets=app-config
diff --git a/config-secret/file-system/src/main/resources/application.properties b/config-secret/file-system/src/main/resources/application.properties
index 897bbcdd..bc66272b 100644
--- a/config-secret/file-system/src/main/resources/application.properties
+++ b/config-secret/file-system/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.app-secret=app-config
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
diff --git a/configmap/api-server/src/main/resources/application.properties b/configmap/api-server/src/main/resources/application.properties
index f2c00637..b6391d48 100644
--- a/configmap/api-server/src/main/resources/application.properties
+++ b/configmap/api-server/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.kubernetes-config.enabled=true
quarkus.kubernetes-config.config-maps=app-config
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
diff --git a/configmap/file-system/src/main/resources/application.properties b/configmap/file-system/src/main/resources/application.properties
index 347e8abe..61d7291f 100644
--- a/configmap/file-system/src/main/resources/application.properties
+++ b/configmap/file-system/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.app-config-map=app-config
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
diff --git a/deployment-strategies/quarkus/src/main/resources/application.properties b/deployment-strategies/quarkus/src/main/resources/application.properties
index e86e95b0..8f8d43d5 100644
--- a/deployment-strategies/quarkus/src/main/resources/application.properties
+++ b/deployment-strategies/quarkus/src/main/resources/application.properties
@@ -1,4 +1,4 @@
quarkus.application.name=deployment-strategy-quarkus
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
diff --git a/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/HeroesOpenShiftIT.java b/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/HeroesOpenShiftIT.java
index e3090ede..20c6f037 100644
--- a/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/HeroesOpenShiftIT.java
+++ b/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/HeroesOpenShiftIT.java
@@ -67,7 +67,7 @@ public void testHello() {
public void testOpenApi() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/openapi")
+ .when().get(url + "/q/openapi")
.then()
.statusCode(OK.getStatusCode());
}
@@ -76,7 +76,7 @@ public void testOpenApi() {
public void testLiveness() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/health/live")
+ .when().get(url + "/q/health/live")
.then()
.statusCode(OK.getStatusCode());
}
@@ -85,7 +85,7 @@ public void testLiveness() {
public void testReadiness() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/health/ready")
+ .when().get(url + "/q/health/ready")
.then()
.statusCode(OK.getStatusCode());
}
@@ -94,7 +94,7 @@ public void testReadiness() {
public void testMetrics() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/metrics/application")
+ .when().get(url + "/q/metrics/application")
.then()
.statusCode(OK.getStatusCode());
}
@@ -179,7 +179,7 @@ public void testDeleteHero() {
public void testCalledOperationMetrics() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/metrics/application")
+ .when().get(url + "/q/metrics/application")
.then()
.statusCode(OK.getStatusCode())
.body("'io.quarkus.workshop.superheroes.hero.HeroResource.countCreateHero'", is(1))
diff --git a/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/VillainsOpenShiftIT.java b/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/VillainsOpenShiftIT.java
index e935ee05..cd948d82 100644
--- a/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/VillainsOpenShiftIT.java
+++ b/external-applications/quarkus-workshop-super-heroes/src/test/java/io/quarkus/ts/openshift/heroes/workshop/VillainsOpenShiftIT.java
@@ -68,7 +68,7 @@ public void testHello() {
public void testOpenApi() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/openapi")
+ .when().get(url + "/q/openapi")
.then()
.statusCode(OK.getStatusCode());
}
@@ -77,7 +77,7 @@ public void testOpenApi() {
public void testLiveness() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/health/live")
+ .when().get(url + "/q/health/live")
.then()
.statusCode(OK.getStatusCode());
}
@@ -86,7 +86,7 @@ public void testLiveness() {
public void testReadiness() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/health/ready")
+ .when().get(url + "/q/health/ready")
.then()
.statusCode(OK.getStatusCode());
}
@@ -95,7 +95,7 @@ public void testReadiness() {
public void testMetrics() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/metrics/application")
+ .when().get(url + "/q/metrics/application")
.then()
.statusCode(OK.getStatusCode());
}
@@ -180,7 +180,7 @@ public void testDeleteVillain() {
public void testCalledOperationMetrics() {
given()
.header(ACCEPT, APPLICATION_JSON)
- .when().get(url + "/metrics/application")
+ .when().get(url + "/q/metrics/application")
.then()
.statusCode(OK.getStatusCode())
.body("'io.quarkus.workshop.superheroes.villain.VillainResource.countCreateVillain'", is(1))
diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcService.java b/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/CustomGrpcService.java
similarity index 81%
rename from http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcService.java
rename to http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/CustomGrpcService.java
index 9ddbdbf3..6623fc38 100644
--- a/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcService.java
+++ b/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/CustomGrpcService.java
@@ -1,14 +1,13 @@
package io.quarkus.ts.openshift.http;
-import javax.inject.Singleton;
-
import io.grpc.stub.StreamObserver;
import io.quarkus.example.GreeterGrpc;
import io.quarkus.example.HelloReply;
import io.quarkus.example.HelloRequest;
+import io.quarkus.grpc.GrpcService;
-@Singleton
-public class GrpcService extends GreeterGrpc.GreeterImplBase {
+@GrpcService
+public class CustomGrpcService extends GreeterGrpc.GreeterImplBase {
@Override
public void sayHello(HelloRequest request, StreamObserver responseObserver) {
diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcResource.java
index 4cfdfc15..1e58bab3 100644
--- a/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcResource.java
+++ b/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/GrpcResource.java
@@ -9,13 +9,13 @@
import io.quarkus.example.GreeterGrpc;
import io.quarkus.example.HelloRequest;
-import io.quarkus.grpc.runtime.annotations.GrpcService;
+import io.quarkus.grpc.GrpcClient;
@Path("/grpc")
public class GrpcResource {
@Inject
- @GrpcService("hello")
+ @GrpcClient("hello")
GreeterGrpc.GreeterBlockingStub client;
@GET
diff --git a/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/HttpClientVersionResource.java b/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/HttpClientVersionResource.java
index ee5addd6..6cc806a9 100644
--- a/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/HttpClientVersionResource.java
+++ b/http/http-advanced/src/main/java/io/quarkus/ts/openshift/http/HttpClientVersionResource.java
@@ -4,7 +4,6 @@
import javax.ws.rs.core.Response;
import io.quarkus.vertx.web.Route;
-import io.vertx.core.http.HttpMethod;
import io.vertx.ext.web.RoutingContext;
@ApplicationScoped
@@ -12,7 +11,7 @@ public class HttpClientVersionResource {
protected static final String HTTP_VERSION = "x-http-version";
- @Route(methods = HttpMethod.GET, path = "/httpVersion")
+ @Route(methods = Route.HttpMethod.GET, path = "/httpVersion")
public void clientHttpVersion(RoutingContext rc) {
String httpClientVersion = rc.request().version().name();
rc.response().headers().add(HTTP_VERSION, httpClientVersion);
diff --git a/http/http-advanced/src/main/resources/application.properties b/http/http-advanced/src/main/resources/application.properties
index 7fc085f2..e4a29a39 100644
--- a/http/http-advanced/src/main/resources/application.properties
+++ b/http/http-advanced/src/main/resources/application.properties
@@ -1,8 +1,6 @@
quarkus.application.name=test-http-advanced
quarkus.http.root-path=/api
-quarkus.http.non-application-root-path=/q
-quarkus.http.redirect-to-non-application-root-path=true
#quarkus.smallrye-metrics.path=/metricas
quarkus.http.port=8081
@@ -12,7 +10,7 @@ quarkus.swagger-ui.always-include=true
quarkus.health.openapi.included=true
quarkus.kubernetes.deployment-target=openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.http.http2=true
quarkus.http.ssl-port=8443
@@ -50,18 +48,6 @@ quarkus.keycloak.policy-enforcer.enable=true
quarkus.keycloak.policy-enforcer.paths.health-redirection.path=/api/q/*
quarkus.keycloak.policy-enforcer.paths.health-redirection.enforcement-mode=DISABLED
-quarkus.keycloak.policy-enforcer.paths.metrics.path=/api/metrics/*
-quarkus.keycloak.policy-enforcer.paths.metrics.enforcement-mode=DISABLED
-
-quarkus.keycloak.policy-enforcer.paths.openapi.path=/api/openapi/*
-quarkus.keycloak.policy-enforcer.paths.openapi.enforcement-mode=DISABLED
-
-quarkus.keycloak.policy-enforcer.paths.swagger-ui.path=/api/swagger-ui/*
-quarkus.keycloak.policy-enforcer.paths.swagger-ui.enforcement-mode=DISABLED
-
-quarkus.keycloak.policy-enforcer.paths.health.path=/api/health/*
-quarkus.keycloak.policy-enforcer.paths.health.enforcement-mode=DISABLED
-
quarkus.keycloak.policy-enforcer.paths.version.path=/api/httpVersion/*
quarkus.keycloak.policy-enforcer.paths.version.enforcement-mode=DISABLED
diff --git a/http/http-advanced/src/test/java/io/quarkus/ts/openshift/http/AbstractHttpTest.java b/http/http-advanced/src/test/java/io/quarkus/ts/openshift/http/AbstractHttpTest.java
index 63ed1ba8..fdffc769 100644
--- a/http/http-advanced/src/test/java/io/quarkus/ts/openshift/http/AbstractHttpTest.java
+++ b/http/http-advanced/src/test/java/io/quarkus/ts/openshift/http/AbstractHttpTest.java
@@ -4,7 +4,6 @@
import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.in;
import static org.hamcrest.Matchers.is;
@@ -130,17 +129,13 @@ public void http2ClientAsync() throws Exception {
@Test
@DisplayName("Non-application endpoint move to /q/")
- public void nonAppRedirections() {
+ public void nonAppEndpoints() {
List endpoints = Arrays.asList(
- "/openapi", "/swagger-ui", "/metrics/base", "/metrics/application",
- "/metrics/vendor", "/metrics", "/health/group", "/health/well", "/health/ready",
- "/health/live", "/health");
+ "q/openapi", "q/swagger-ui", "q/metrics/base", "q/metrics/application",
+ "q/metrics/vendor", "q/metrics", "q/health/group", "q/health/well", "q/health/ready",
+ "q/health/live", "q/health");
for (String endpoint : endpoints) {
- given().redirects().follow(false)
- .log().uri()
- .expect().statusCode(301).header("Location", containsString("/q" + endpoint)).when().get(endpoint);
-
given().expect().statusCode(in(Arrays.asList(200, 204))).when().get(endpoint);
}
}
@@ -161,7 +156,7 @@ public void microprofileHttpClientRedirection() throws Exception {
public void vertxHttpClientRedirection() throws InterruptedException, URISyntaxException {
CountDownLatch done = new CountDownLatch(1);
Uni statusCode = WebClient.create(Vertx.vertx(), defaultVertxHttpClientOptions())
- .getAbs(getAppEndpoint() + "health")
+ .getAbs(getAppEndpoint() + "q/health")
.send().map(HttpResponse::statusCode)
.ifNoItem().after(Duration.ofSeconds(TIMEOUT_SEC)).fail()
.onFailure().retry().atMost(RETRY);
diff --git a/http/http-minimum/src/main/resources/application.properties b/http/http-minimum/src/main/resources/application.properties
index 4a1804cd..8a58f651 100644
--- a/http/http-minimum/src/main/resources/application.properties
+++ b/http/http-minimum/src/main/resources/application.properties
@@ -1,7 +1,7 @@
quarkus.application.name=test-http
quarkus.http.root-path=/api
quarkus.kubernetes.deployment-target=openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.kubernetes.readiness-probe.period=5s
diff --git a/infinispan-client/src/main/resources/application.properties b/infinispan-client/src/main/resources/application.properties
index f3e027a3..3b4be353 100644
--- a/infinispan-client/src/main/resources/application.properties
+++ b/infinispan-client/src/main/resources/application.properties
@@ -17,7 +17,7 @@ quarkus.infinispan-client.trust-store-password=password
quarkus.infinispan-client.trust-store-type=JKS
# instructs quarkus to build and deploy to kubernetes/openshift, and to trust the Kubernetes API since we're using self-signed
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
# configmap settings
diff --git a/lifecycle-application/src/main/resources/application.properties b/lifecycle-application/src/main/resources/application.properties
index 1e8bb770..4091bfc5 100644
--- a/lifecycle-application/src/main/resources/application.properties
+++ b/lifecycle-application/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
# We can't append arguments to the Java commend
# Not sure if the quarkus.openshift.arguments will be the right property to do this or there will be a new one.
diff --git a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/openshift/messaging/amqp/PriceProducer.java b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/openshift/messaging/amqp/PriceProducer.java
index 2a32c3a8..b560e4ea 100644
--- a/messaging/amqp-reactive/src/main/java/io/quarkus/ts/openshift/messaging/amqp/PriceProducer.java
+++ b/messaging/amqp-reactive/src/main/java/io/quarkus/ts/openshift/messaging/amqp/PriceProducer.java
@@ -1,13 +1,13 @@
package io.quarkus.ts.openshift.messaging.amqp;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
import javax.enterprise.context.ApplicationScoped;
import org.eclipse.microprofile.reactive.messaging.Outgoing;
import org.jboss.logging.Logger;
-import io.reactivex.Flowable;
+import io.smallrye.mutiny.Multi;
@ApplicationScoped
public class PriceProducer {
@@ -15,10 +15,10 @@ public class PriceProducer {
private static final Logger LOG = Logger.getLogger(PriceProducer.class.getName());
@Outgoing("generated-price")
- public Flowable generate() {
+ public Multi generate() {
LOG.info("generate fired...");
- return Flowable.interval(1, TimeUnit.SECONDS)
- .onBackpressureDrop()
+ return Multi.createFrom().ticks().every(Duration.ofSeconds(1))
+ .onOverflow().drop()
.map(tick -> ((tick.intValue() * 10) % 100) + 10);
}
}
diff --git a/messaging/amqp-reactive/src/main/resources/application.properties b/messaging/amqp-reactive/src/main/resources/application.properties
index e555803c..5b8dd1ff 100644
--- a/messaging/amqp-reactive/src/main/resources/application.properties
+++ b/messaging/amqp-reactive/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
%test.amqp-host=localhost
diff --git a/messaging/artemis-jta/src/main/java/io/quarkus/ts/openshift/messaging/artemisjta/ConsumerService.java b/messaging/artemis-jta/src/main/java/io/quarkus/ts/openshift/messaging/artemisjta/ConsumerService.java
index 8693a168..cb6ff064 100644
--- a/messaging/artemis-jta/src/main/java/io/quarkus/ts/openshift/messaging/artemisjta/ConsumerService.java
+++ b/messaging/artemis-jta/src/main/java/io/quarkus/ts/openshift/messaging/artemisjta/ConsumerService.java
@@ -9,7 +9,6 @@
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.commons.lang3.StringUtils;
import org.jboss.logging.Logger;
@ApplicationScoped
@@ -41,7 +40,7 @@ public String receiveAndAck(boolean ackIt) throws JMSException {
}
private String receiveMessagesInQueue(String queueName) {
- String price = StringUtils.EMPTY;
+ String price = "";
try (JMSContext context = connectionFactory.createContext(Session.AUTO_ACKNOWLEDGE);
JMSConsumer consumer = context.createConsumer(context.createQueue(queueName))) {
Message message = consumer.receive(500);
diff --git a/messaging/artemis-jta/src/main/resources/application.properties b/messaging/artemis-jta/src/main/resources/application.properties
index 5c481e23..58498a3c 100644
--- a/messaging/artemis-jta/src/main/resources/application.properties
+++ b/messaging/artemis-jta/src/main/resources/application.properties
@@ -2,7 +2,7 @@ quarkus.artemis.url=tcp://amq-broker-tcp:61616
quarkus.artemis.username=quarkus
quarkus.artemis.password=quarkus
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
%test.quarkus.artemis.url=tcp://localhost:61616
diff --git a/messaging/artemis/src/main/resources/application.properties b/messaging/artemis/src/main/resources/application.properties
index 5d94e28f..69b435b1 100644
--- a/messaging/artemis/src/main/resources/application.properties
+++ b/messaging/artemis/src/main/resources/application.properties
@@ -2,7 +2,7 @@ quarkus.artemis.url=tcp://amq-broker-tcp:61616
quarkus.artemis.username=quarkus
quarkus.artemis.password=quarkus
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
%test.quarkus.artemis.url=tcp://localhost:61616
diff --git a/messaging/kafka-avro-reactive-messaging/pom.xml b/messaging/kafka-avro-reactive-messaging/pom.xml
index 5c3f9cfd..828774e0 100644
--- a/messaging/kafka-avro-reactive-messaging/pom.xml
+++ b/messaging/kafka-avro-reactive-messaging/pom.xml
@@ -83,6 +83,7 @@
build
+ generate-code
@@ -91,10 +92,6 @@
org.apache.maven.plugins
maven-failsafe-plugin
-
- org.apache.avro
- avro-maven-plugin
-
diff --git a/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties b/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties
index c17ca48e..4d244a6e 100644
--- a/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties
+++ b/messaging/kafka-avro-reactive-messaging/src/main/resources/application.properties
@@ -27,4 +27,4 @@ mp.messaging.incoming.channel-stock-price.auto.offset.reset=earliest
mp.messaging.incoming.channel-stock-price.enable.auto.commit=true
mp.messaging.incoming.channel-stock-price.apicurio.registry.avro-datum-provider=io.apicurio.registry.utils.serde.avro.ReflectAvroDatumProvider
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
diff --git a/messaging/kafka-avro-reactive-messaging/src/test/resources/application.properties b/messaging/kafka-avro-reactive-messaging/src/test/resources/application.properties
index b9bfce83..46918149 100644
--- a/messaging/kafka-avro-reactive-messaging/src/test/resources/application.properties
+++ b/messaging/kafka-avro-reactive-messaging/src/test/resources/application.properties
@@ -24,7 +24,7 @@ quarkus.log.console.enable=true
quarkus.log.console.level=INFO
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.kubernetes.readiness-probe.period=5s
quarkus.kubernetes.readiness-probe.initial-delay=0s
quarkus.kubernetes.readiness-probe.failure-threshold=5
\ No newline at end of file
diff --git a/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties b/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties
index df5fea49..07ebca31 100644
--- a/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties
+++ b/messaging/kafka-streams-reactive-messaging/src/main/resources/application.properties
@@ -40,4 +40,4 @@ kafka-streams.consumer.heartbeat.interval.ms=80
quarkus.log.console.enable=true
quarkus.log.console.level=INFO
-quarkus.openshift.expose=true
\ No newline at end of file
+quarkus.openshift.route.expose=true
\ No newline at end of file
diff --git a/messaging/kafka-streams-reactive-messaging/src/test/resources/application.properties b/messaging/kafka-streams-reactive-messaging/src/test/resources/application.properties
index f1d0f514..fad787d1 100644
--- a/messaging/kafka-streams-reactive-messaging/src/test/resources/application.properties
+++ b/messaging/kafka-streams-reactive-messaging/src/test/resources/application.properties
@@ -37,7 +37,7 @@ quarkus.log.console.enable=true
quarkus.log.console.level=INFO
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
\ No newline at end of file
diff --git a/messaging/qpid/src/main/resources/application.properties b/messaging/qpid/src/main/resources/application.properties
index 01ff1757..dd85a3db 100644
--- a/messaging/qpid/src/main/resources/application.properties
+++ b/messaging/qpid/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
# QPID
diff --git a/micrometer/prometheus-kafka/src/main/resources/application.properties b/micrometer/prometheus-kafka/src/main/resources/application.properties
index f44d56fd..13a90e04 100644
--- a/micrometer/prometheus-kafka/src/main/resources/application.properties
+++ b/micrometer/prometheus-kafka/src/main/resources/application.properties
@@ -13,7 +13,7 @@ mp.messaging.incoming.alerts-target.value.deserializer=org.apache.kafka.common.s
# Openshift
quarkus.openshift.labels.app-with-metrics=quarkus-app
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
diff --git a/micrometer/prometheus-kafka/src/test/resources/service-monitor.yaml b/micrometer/prometheus-kafka/src/test/resources/service-monitor.yaml
index 6899c3ee..8edd20cb 100644
--- a/micrometer/prometheus-kafka/src/test/resources/service-monitor.yaml
+++ b/micrometer/prometheus-kafka/src/test/resources/service-monitor.yaml
@@ -8,6 +8,7 @@ spec:
endpoints:
- interval: 30s
targetPort: 8080
+ path: /q/metrics
scheme: http
selector:
matchLabels:
diff --git a/micrometer/prometheus/src/main/resources/application.properties b/micrometer/prometheus/src/main/resources/application.properties
index 8abe1843..7d5432c7 100644
--- a/micrometer/prometheus/src/main/resources/application.properties
+++ b/micrometer/prometheus/src/main/resources/application.properties
@@ -1,5 +1,5 @@
quarkus.openshift.labels.app-with-metrics=quarkus-app
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
# Openshift
diff --git a/micrometer/prometheus/src/test/resources/service-monitor.yaml b/micrometer/prometheus/src/test/resources/service-monitor.yaml
index 6899c3ee..8edd20cb 100644
--- a/micrometer/prometheus/src/test/resources/service-monitor.yaml
+++ b/micrometer/prometheus/src/test/resources/service-monitor.yaml
@@ -8,6 +8,7 @@ spec:
endpoints:
- interval: 30s
targetPort: 8080
+ path: /q/metrics
scheme: http
selector:
matchLabels:
diff --git a/microprofile/src/main/java/io/quarkus/ts/openshift/microprofile/HelloClient.java b/microprofile/src/main/java/io/quarkus/ts/openshift/microprofile/HelloClient.java
index c743b16a..76d0e981 100644
--- a/microprofile/src/main/java/io/quarkus/ts/openshift/microprofile/HelloClient.java
+++ b/microprofile/src/main/java/io/quarkus/ts/openshift/microprofile/HelloClient.java
@@ -13,7 +13,7 @@
import org.eclipse.microprofile.faulttolerance.Fallback;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
-@RegisterRestClient(baseUri = "http://microprofile-test:8080/")
+@RegisterRestClient(baseUri = "http://microprofile-test/")
public interface HelloClient {
@GET
@Path("/hello")
diff --git a/microprofile/src/main/resources/application.properties b/microprofile/src/main/resources/application.properties
index 54f7b24c..b85a10c4 100644
--- a/microprofile/src/main/resources/application.properties
+++ b/microprofile/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.jaeger.sampler-param=1
quarkus.jaeger.endpoint=http://jaeger-collector:14268/api/traces
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
diff --git a/microprofile/src/test/java/io/quarkus/ts/openshift/microprofile/MicroProfileOpenShiftIT.java b/microprofile/src/test/java/io/quarkus/ts/openshift/microprofile/MicroProfileOpenShiftIT.java
index f33dbf06..20ba1fc9 100644
--- a/microprofile/src/test/java/io/quarkus/ts/openshift/microprofile/MicroProfileOpenShiftIT.java
+++ b/microprofile/src/test/java/io/quarkus/ts/openshift/microprofile/MicroProfileOpenShiftIT.java
@@ -67,14 +67,14 @@ public void verifyTracesInJaeger() {
hasItems(
"span.kind=client",
"component=jaxrs",
- "http.url=http://microprofile-test:8080/hello",
+ "http.url=http://microprofile-test/hello",
"http.method=GET",
"http.status_code=200"))
.body("data[0].spans.find { it.operationName == 'GET:io.quarkus.ts.openshift.microprofile.HelloResource.get' }.tags.collect { \"${it.key}=${it.value}\".toString() }",
hasItems(
"span.kind=server",
"component=jaxrs",
- "http.url=http://microprofile-test:8080/hello",
+ "http.url=http://microprofile-test/hello",
"http.method=GET",
"http.status_code=200"));
});
diff --git a/pom.xml b/pom.xml
index 273c7174..e200812d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,8 @@
true
- 1.8
- 1.8
+ 11
+ 11
UTF-8
UTF-8
quarkus-universe-bom
@@ -66,14 +66,16 @@
2.3.2
1.6.2
- 1.0.8
+ 1.1.0
0.11.2
+ 0.24.0
1.10.2
+ 2.40.0
1.5
3.8.1
3.2.0
2.22.2
- 1.13.4.Final
+ 2.0.2.Final
${version.quarkus}
1.15.3
2.9.0
@@ -168,6 +170,16 @@
retrofit
${version.com.squareup.retrofit2}
+
+ org.amqphub.quarkus
+ quarkus-qpid-jms
+ ${version.quarkus.qpid.jms}
+
+
+ net.sourceforge.htmlunit
+ htmlunit
+ ${version.htmlunit}
+
@@ -248,6 +260,7 @@
build
+ generate-code
@@ -302,24 +315,6 @@
jandex-maven-plugin
${version.jandex-maven-plugin}
-
- org.apache.avro
- avro-maven-plugin
- ${version.apache.avro}
-
-
- generate-sources
-
- schema
-
-
- src/main/avro
- ${project.build.directory}/generated-sources
- String
-
-
-
-
diff --git a/scaling/src/main/resources/application.properties b/scaling/src/main/resources/application.properties
index 4264e6eb..433133de 100644
--- a/scaling/src/main/resources/application.properties
+++ b/scaling/src/main/resources/application.properties
@@ -1,5 +1,5 @@
quarkus.application.name=test-scaling
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
# Openshift
diff --git a/security/basic/src/main/resources/application.properties b/security/basic/src/main/resources/application.properties
index b98f4451..beb40b6b 100644
--- a/security/basic/src/main/resources/application.properties
+++ b/security/basic/src/main/resources/application.properties
@@ -8,7 +8,7 @@ quarkus.security.users.embedded.roles.albert=admin,user
quarkus.security.users.embedded.roles.isaac=user
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/jwt-cookie/src/main/resources/application.properties b/security/jwt-cookie/src/main/resources/application.properties
index 96980afc..fdab031d 100644
--- a/security/jwt-cookie/src/main/resources/application.properties
+++ b/security/jwt-cookie/src/main/resources/application.properties
@@ -6,7 +6,7 @@ smallrye.jwt.token.cookie=MY_COOKIE_NAME
quarkus.security.deny-unannotated-members=true
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
# Openshift
diff --git a/security/jwt/src/main/resources/application.properties b/security/jwt/src/main/resources/application.properties
index 57ed3f14..bbcc515e 100644
--- a/security/jwt/src/main/resources/application.properties
+++ b/security/jwt/src/main/resources/application.properties
@@ -4,7 +4,7 @@ smallrye.jwt.expiration.grace=120
quarkus.security.deny-unannotated-members=true
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11:latest
# Openshift
diff --git a/security/keycloak-authz/src/main/resources/application.properties b/security/keycloak-authz/src/main/resources/application.properties
index f55b4719..229224d6 100644
--- a/security/keycloak-authz/src/main/resources/application.properties
+++ b/security/keycloak-authz/src/main/resources/application.properties
@@ -14,7 +14,7 @@ quarkus.keycloak.policy-enforcer.paths.resources.path=/*
quarkus.keycloak.policy-enforcer.paths.resources.enforcement-mode=ENFORCING
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/keycloak-jwt/src/main/resources/application.properties b/security/keycloak-jwt/src/main/resources/application.properties
index 37daf8ad..bcbf64fb 100644
--- a/security/keycloak-jwt/src/main/resources/application.properties
+++ b/security/keycloak-jwt/src/main/resources/application.properties
@@ -10,7 +10,7 @@ quarkus.oidc.application-type=web-app
quarkus.oidc.roles.source=accesstoken
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/keycloak-multitenant/src/main/resources/application.properties b/security/keycloak-multitenant/src/main/resources/application.properties
index 6ddbf80e..f003c5d6 100644
--- a/security/keycloak-multitenant/src/main/resources/application.properties
+++ b/security/keycloak-multitenant/src/main/resources/application.properties
@@ -25,7 +25,7 @@ quarkus.oidc.jwt-tenant.token.issuer=${quarkus.oidc.auth-server-url}
quarkus.oidc.jwt-tenant.roles.source=accesstoken
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/keycloak-oauth2/src/main/resources/application.properties b/security/keycloak-oauth2/src/main/resources/application.properties
index ae0e631d..a0a62f64 100644
--- a/security/keycloak-oauth2/src/main/resources/application.properties
+++ b/security/keycloak-oauth2/src/main/resources/application.properties
@@ -6,7 +6,7 @@ quarkus.oauth2.client-secret=test-application-client-secret
quarkus.oauth2.role-claim=roles
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/keycloak-oidc-client/src/main/resources/application.properties b/security/keycloak-oidc-client/src/main/resources/application.properties
index fdf51ceb..220082c2 100644
--- a/security/keycloak-oidc-client/src/main/resources/application.properties
+++ b/security/keycloak-oidc-client/src/main/resources/application.properties
@@ -33,7 +33,7 @@ quarkus.oidc-client.jwt-secret.client-id=test-application-client-jwt
quarkus.oidc-client.jwt-secret.credentials.jwt.secret=AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/keycloak-webapp/src/main/resources/application.properties b/security/keycloak-webapp/src/main/resources/application.properties
index d9f02ce2..1bf380e5 100644
--- a/security/keycloak-webapp/src/main/resources/application.properties
+++ b/security/keycloak-webapp/src/main/resources/application.properties
@@ -15,7 +15,7 @@ quarkus.http.auth.permission.authenticated.paths=/*
quarkus.http.auth.permission.authenticated.policy=authenticated
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/security/keycloak/src/main/resources/application.properties b/security/keycloak/src/main/resources/application.properties
index 66c18c63..b91f3516 100644
--- a/security/keycloak/src/main/resources/application.properties
+++ b/security/keycloak/src/main/resources/application.properties
@@ -8,7 +8,7 @@ quarkus.oidc.token.lifespan-grace=5
# Openshift
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.openshift.readiness-probe.period=5s
quarkus.openshift.readiness-probe.initial-delay=0s
quarkus.openshift.readiness-probe.failure-threshold=5
diff --git a/sql-db/mariadb/src/main/resources/application.properties b/sql-db/mariadb/src/main/resources/application.properties
index c69606ad..a50da3bd 100644
--- a/sql-db/mariadb/src/main/resources/application.properties
+++ b/sql-db/mariadb/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.env-vars.DB_DATABASE.secret=mariadb
diff --git a/sql-db/mssql/src/main/resources/application.properties b/sql-db/mssql/src/main/resources/application.properties
index 7df95893..5d3b19d1 100644
--- a/sql-db/mssql/src/main/resources/application.properties
+++ b/sql-db/mssql/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.env-vars.DB_DATABASE.secret=mssql
diff --git a/sql-db/multiple-pus/src/main/resources/application.properties b/sql-db/multiple-pus/src/main/resources/application.properties
index 7a1bb97d..560da42b 100644
--- a/sql-db/multiple-pus/src/main/resources/application.properties
+++ b/sql-db/multiple-pus/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.env-vars.MARIA_DB_DATABASE.secret=mariadb
diff --git a/sql-db/mysql/src/main/resources/application.properties b/sql-db/mysql/src/main/resources/application.properties
index e7bb58a6..679d323b 100644
--- a/sql-db/mysql/src/main/resources/application.properties
+++ b/sql-db/mysql/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.env-vars.DB_DATABASE.secret=mysql
diff --git a/sql-db/postgresql/src/main/resources/application.properties b/sql-db/postgresql/src/main/resources/application.properties
index 1bfb2f22..b8bdd36d 100644
--- a/sql-db/postgresql/src/main/resources/application.properties
+++ b/sql-db/postgresql/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-quarkus.openshift.expose=true
+quarkus.openshift.route.expose=true
quarkus.s2i.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-11
quarkus.openshift.env-vars.DB_DATABASE.secret=postgresql