This is an automated email from the ASF dual-hosted git repository.
tzimanyi pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 83aaf11927 [kie-issues#1908] Upgrade Quarkus to 3.20.x (#3935)
83aaf11927 is described below
commit 83aaf1192721c29fd530cd592a936134dcd98e8d
Author: Tibor Zimányi <[email protected]>
AuthorDate: Wed May 28 12:38:50 2025 +0200
[kie-issues#1908] Upgrade Quarkus to 3.20.x (#3935)
---
addons/common/kubernetes/pom.xml | 10 +-
.../org/kie/kogito/pmml/openapi/PMMLOASUtils.java | 23 ++-
.../pmml/openapi/impl/PMMLOASResultImpl.java | 17 +--
.../kie/kogito/pmml/openapi/PMMLOASUtilsTest.java | 14 +-
kogito-build/kogito-dependencies-bom/pom.xml | 163 +++++++++++++++------
.../kogito-codegen-decisions/pom.xml | 132 +++++++++--------
kogito-maven-plugin/pom.xml | 9 ++
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../kie/kogito/events/mongodb/MockMongoClient.java | 80 ++++++++++
.../runtime/pom.xml | 17 ++-
.../k8s/service/catalog/DeploymentUtilsTest.java | 8 +-
.../Fabric8KubernetesServiceCatalogTest.java | 8 +-
.../k8s/service/catalog/IngressUtilsTest.java | 8 +-
.../catalog/KnativeServiceDiscoveryTest.java | 8 +-
.../catalog/KubernetesResourceDiscoveryTest.java | 8 +-
.../catalog/OpenShiftServiceDiscoveryTest.java | 6 +-
.../fabric8/k8s/service/catalog/PodUtilsTest.java | 8 +-
.../k8s/service/catalog/StatefulSetUtilsTest.java | 8 +-
.../deployment/deployment-no-service.yaml | 8 +-
.../deployment/pod-deployment-no-service.yaml | 8 +-
.../deployment-config-no-service.yaml | 8 +-
.../pod-deployment-config-no-service.yaml | 8 +-
.../resources/knative/quarkus-greeting-https.yaml | 12 +-
.../knative/quarkus-greeting-kubernetes.yaml | 12 +-
.../knative/quarkus-greeting-openshift.yaml | 12 +-
.../test/resources/knative/quarkus-greeting.yaml | 12 +-
.../pod/pod-no-service-custom-port-name.yaml | 8 +-
.../src/test/resources/pod/pod-no-service.yaml | 8 +-
.../src/test/resources/route/route-tls.yaml | 2 +-
.../runtime/src/test/resources/route/route.yaml | 2 +-
.../statefulset/statefulset-pod-no-service.yaml | 8 +-
quarkus/addons/jobs/messaging/deployment/pom.xml | 2 +-
.../knative/serving/integration-tests/pom.xml | 9 +-
.../test/resources/knative/quarkus-greeting.yaml | 12 +-
quarkus/addons/knative/serving/runtime/pom.xml | 4 +-
.../resources/knative/quarkus-greeting-https.yaml | 12 +-
.../test/resources/knative/quarkus-greeting.yaml | 12 +-
.../test/resources/knative/quarkus-greeting.yaml | 12 +-
quarkus/addons/kubernetes/runtime/pom.xml | 4 +-
.../KubernetesServiceEndpointDiscoveryTest.java | 8 +-
.../KubeDiscoveryConfigCacheUpdaterTest.java | 8 +-
.../test/resources/knative/quarkus-greeting.yaml | 12 +-
quarkus/addons/kubernetes/test-utils/pom.xml | 10 +-
.../utils/KubernetesMockServerTestResource.java | 69 +++++++++
.../integration-tests/pom.xml | 4 +-
.../infinispan/health/InfinispanHealthCheckIT.java | 2 +
quarkus/bom/pom.xml | 5 +-
.../deployment/MissingRestCapabilityException.java | 2 +-
.../pom.xml | 2 +-
.../deployment/livereload/LiveReloadProcessor.java | 4 +-
.../workflow/parser/schema/JsonSchemaImpl.java | 31 +++-
.../parser/schema/OpenApiModelSchemaGenerator.java | 2 +-
.../pom.xml | 4 +-
.../livereload/LiveReloadProcessorTest.java | 2 +-
.../pom.xml | 6 +-
.../quarkus/workflows/ConversationFlowIT.java | 2 +
.../quarkus/workflows/EnumEchoServiceMock.java | 2 +-
.../pom.xml | 4 +-
.../kogito/it/InfinispanOptimisticLockingIT.java | 3 +
.../pom.xml | 8 +-
.../integration-tests-quarkus-processes/pom.xml | 4 +-
.../pom.xml | 4 +-
springboot/bom/pom.xml | 4 +-
.../pom.xml | 7 +
.../pom.xml | 4 +-
.../springboot/MonitoringTest.java | 20 +--
.../kogito/it/InfinispanOptimisticLockingIT.java | 2 +
68 files changed, 618 insertions(+), 327 deletions(-)
diff --git a/addons/common/kubernetes/pom.xml b/addons/common/kubernetes/pom.xml
index c4bfa10de1..98ca1a0e7e 100644
--- a/addons/common/kubernetes/pom.xml
+++ b/addons/common/kubernetes/pom.xml
@@ -42,6 +42,10 @@
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -56,13 +60,11 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
- <version>${version.io.fabric8.kubernetes-client}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>knative-client</artifactId>
- <version>${version.io.fabric8.kubernetes-client}</version>
<scope>provided</scope>
</dependency>
@@ -77,8 +79,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/PMMLOASUtils.java
b/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/PMMLOASUtils.java
index 406be58dcd..52aa21a65e 100644
---
a/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/PMMLOASUtils.java
+++
b/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/PMMLOASUtils.java
@@ -35,14 +35,13 @@ import com.fasterxml.jackson.databind.node.DecimalNode;
import com.fasterxml.jackson.databind.node.DoubleNode;
import com.fasterxml.jackson.databind.node.FloatNode;
import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.LongNode;
import com.fasterxml.jackson.databind.node.NumericNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ShortNode;
import com.fasterxml.jackson.databind.node.TextNode;
-import io.smallrye.openapi.runtime.io.JsonUtil;
-
import static org.kie.kogito.pmml.openapi.api.PMMLOASResult.BOOLEAN;
import static org.kie.kogito.pmml.openapi.api.PMMLOASResult.DOUBLE;
import static org.kie.kogito.pmml.openapi.api.PMMLOASResult.ENUM;
@@ -62,9 +61,19 @@ public class PMMLOASUtils {
public static final String INFINITY_SYMBOL = new
String(Character.toString('\u221E').getBytes(StandardCharsets.UTF_8),
StandardCharsets.UTF_8);
+ private static final JsonNodeFactory factory = JsonNodeFactory.instance;
+
private PMMLOASUtils() {
}
+ public static ObjectNode objectNode() {
+ return factory.objectNode();
+ }
+
+ public static ArrayNode arrayNode() {
+ return factory.arrayNode();
+ }
+
public static boolean isRequired(MiningField toVerify) {
if (FIELD_USAGE_TYPE.PREDICTED.equals(toVerify.getUsageType()) ||
FIELD_USAGE_TYPE.TARGET.equals(toVerify.getUsageType())) {
@@ -117,7 +126,7 @@ public class PMMLOASUtils {
typeFieldNode.set(MAXIMUM,
getNumericNode(interval.getRightMargin()));
}
} else {
- ArrayNode intervalsNode = JsonUtil.arrayNode();
+ ArrayNode intervalsNode = PMMLOASUtils.arrayNode();
IntStream.range(0, intervals.size()).forEach(i -> {
Interval interval = intervals.get(i);
String leftMargin = interval.getLeftMargin() != null ?
interval.getLeftMargin().toString() : "-" + INFINITY_SYMBOL;
@@ -131,7 +140,7 @@ public class PMMLOASUtils {
public static void addToSetNode(String fieldName, DATA_TYPE dataType,
List<String> allowedValues, ObjectNode setNode) {
final ObjectNode propertiesNode = (ObjectNode) setNode.get(PROPERTIES);
- final ObjectNode typeFieldNode = JsonUtil.objectNode();
+ final ObjectNode typeFieldNode = PMMLOASUtils.objectNode();
String mappedType = getMappedType(dataType);
typeFieldNode.set(TYPE, new TextNode(mappedType));
String mappedFormat = getMappedFormat(dataType);
@@ -147,7 +156,7 @@ public class PMMLOASUtils {
public static ArrayNode conditionallyCreateEnumNode(final ObjectNode
parent) {
if (parent.get(ENUM) == null) {
- ArrayNode availableValues = JsonUtil.arrayNode();
+ ArrayNode availableValues = PMMLOASUtils.arrayNode();
parent.set(ENUM, availableValues);
}
return (ArrayNode) parent.get(ENUM);
@@ -160,9 +169,9 @@ public class PMMLOASUtils {
}
public static ObjectNode createSetNode() {
- final ObjectNode toReturn = JsonUtil.objectNode();
+ final ObjectNode toReturn = PMMLOASUtils.objectNode();
toReturn.set(TYPE, new TextNode(OBJECT));
- final ObjectNode propertiesNode = JsonUtil.objectNode();
+ final ObjectNode propertiesNode = PMMLOASUtils.objectNode();
toReturn.set(PROPERTIES, propertiesNode);
return toReturn;
}
diff --git
a/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/impl/PMMLOASResultImpl.java
b/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/impl/PMMLOASResultImpl.java
index 40ec1f44c2..cd8af22f11 100644
---
a/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/impl/PMMLOASResultImpl.java
+++
b/drools/kogito-pmml-openapi/src/main/java/org/kie/kogito/pmml/openapi/impl/PMMLOASResultImpl.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
+import org.kie.kogito.pmml.openapi.PMMLOASUtils;
import org.kie.kogito.pmml.openapi.api.PMMLOASResult;
import org.kie.pmml.api.enums.DATA_TYPE;
import org.kie.pmml.api.enums.ResultCode;
@@ -33,8 +34,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
-import io.smallrye.openapi.runtime.io.JsonUtil;
-
import static org.kie.kogito.pmml.openapi.PMMLOASUtils.addIntervals;
import static org.kie.kogito.pmml.openapi.PMMLOASUtils.addToSetNode;
import static org.kie.kogito.pmml.openapi.PMMLOASUtils.createSetNodeInParent;
@@ -51,8 +50,8 @@ public class PMMLOASResultImpl implements PMMLOASResult {
protected final ObjectNode jsonNodes;
private PMMLOASResultImpl() {
- jsonNodes = JsonUtil.objectNode();
- ObjectNode definitions = JsonUtil.objectNode();
+ jsonNodes = PMMLOASUtils.objectNode();
+ ObjectNode definitions = PMMLOASUtils.objectNode();
jsonNodes.set(DEFINITIONS, definitions);
addOutputSet();
}
@@ -77,12 +76,12 @@ public class PMMLOASResultImpl implements PMMLOASResult {
protected void addMiningFields(List<MiningField> toAdd) {
final ObjectNode definitionsNode = (ObjectNode)
jsonNodes.get(DEFINITIONS);
- final ObjectNode inputSetNode = JsonUtil.objectNode();
+ final ObjectNode inputSetNode = PMMLOASUtils.objectNode();
definitionsNode.set(INPUT_SET, inputSetNode);
inputSetNode.set(TYPE, new TextNode(OBJECT));
- final ArrayNode requiredNode = JsonUtil.arrayNode();
+ final ArrayNode requiredNode = PMMLOASUtils.arrayNode();
inputSetNode.set(REQUIRED, requiredNode);
- final ObjectNode propertiesNode = JsonUtil.objectNode();
+ final ObjectNode propertiesNode = PMMLOASUtils.objectNode();
inputSetNode.set(PROPERTIES, propertiesNode);
toAdd.forEach(miningField -> {
if (isRequired(miningField)) { // A MiningField may be not
predicted AND not required if it has a
@@ -93,7 +92,7 @@ public class PMMLOASResultImpl implements PMMLOASResult {
addToResultSet(miningField.getName(),
miningField.getDataType(), miningField.getAllowedValues());
addToResultVariables(miningField.getName(),
miningField.getDataType(), miningField.getAllowedValues());
} else {
- final ObjectNode typeFieldNode = JsonUtil.objectNode();
+ final ObjectNode typeFieldNode = PMMLOASUtils.objectNode();
String mappedType = getMappedType(miningField.getDataType());
typeFieldNode.set(TYPE, new TextNode(mappedType));
String mappedFormat =
getMappedFormat(miningField.getDataType());
@@ -104,7 +103,7 @@ public class PMMLOASResultImpl implements PMMLOASResult {
typeFieldNode.set(DEFAULT, new
TextNode(miningField.getMissingValueReplacement()));
}
if (miningField.getAllowedValues() != null &&
!miningField.getAllowedValues().isEmpty()) {
- ArrayNode availableValues = JsonUtil.arrayNode();
+ ArrayNode availableValues = PMMLOASUtils.arrayNode();
miningField.getAllowedValues().forEach(availableValues::add);
typeFieldNode.set(ENUM, availableValues);
}
diff --git
a/drools/kogito-pmml-openapi/src/test/java/org/kie/kogito/pmml/openapi/PMMLOASUtilsTest.java
b/drools/kogito-pmml-openapi/src/test/java/org/kie/kogito/pmml/openapi/PMMLOASUtilsTest.java
index c78dbb0bb2..e662efa864 100644
---
a/drools/kogito-pmml-openapi/src/test/java/org/kie/kogito/pmml/openapi/PMMLOASUtilsTest.java
+++
b/drools/kogito-pmml-openapi/src/test/java/org/kie/kogito/pmml/openapi/PMMLOASUtilsTest.java
@@ -46,8 +46,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.ShortNode;
import com.fasterxml.jackson.databind.node.TextNode;
-import io.smallrye.openapi.runtime.io.JsonUtil;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.kie.kogito.pmml.openapi.PMMLOASUtils.INFINITY_SYMBOL;
import static org.kie.kogito.pmml.openapi.api.PMMLOASResult.BOOLEAN;
@@ -211,7 +209,7 @@ class PMMLOASUtilsTest {
@Test
void addIntervals() {
- ObjectNode typeFieldNode = JsonUtil.objectNode();
+ ObjectNode typeFieldNode = PMMLOASUtils.objectNode();
PMMLOASUtils.addIntervals(typeFieldNode, Collections.emptyList());
assertThat(typeFieldNode).isEmpty();
//
@@ -223,7 +221,7 @@ class PMMLOASUtilsTest {
assertThat(typeFieldNode.get(MAXIMUM)).isNull();
assertThat(typeFieldNode.get(INTERVALS)).isNull();
//
- typeFieldNode = JsonUtil.objectNode();
+ typeFieldNode = PMMLOASUtils.objectNode();
interval = new Interval(null, 35.0);
PMMLOASUtils.addIntervals(typeFieldNode,
Collections.singletonList(interval));
assertThat(typeFieldNode.get(MINIMUM)).isNull();
@@ -232,7 +230,7 @@ class PMMLOASUtilsTest {
assertThat(numericNode.asDouble()).isEqualTo(interval.getRightMargin().doubleValue());
assertThat(typeFieldNode.get(INTERVALS)).isNull();
//
- typeFieldNode = JsonUtil.objectNode();
+ typeFieldNode = PMMLOASUtils.objectNode();
interval = new Interval(-34.23, 35.0);
PMMLOASUtils.addIntervals(typeFieldNode,
Collections.singletonList(interval));
assertThat(typeFieldNode.get(MINIMUM)).isNotNull();
@@ -243,7 +241,7 @@ class PMMLOASUtilsTest {
assertThat(numericNode.asDouble()).isEqualTo(interval.getRightMargin().doubleValue());
assertThat(typeFieldNode.get(INTERVALS)).isNull();
//
- typeFieldNode = JsonUtil.objectNode();
+ typeFieldNode = PMMLOASUtils.objectNode();
List<Interval> intervals = IntStream.range(0, 3)
.mapToObj(i -> new Interval(i * 2 + 3, i * 3 + 4))
.collect(Collectors.toList());
@@ -308,7 +306,7 @@ class PMMLOASUtilsTest {
@Test
void conditionallyCreateEnumNode() {
- ObjectNode parentNode = JsonUtil.objectNode();
+ ObjectNode parentNode = PMMLOASUtils.objectNode();
ArrayNode created =
PMMLOASUtils.conditionallyCreateEnumNode(parentNode);
assertThat(created).isNotNull().isEmpty();
@@ -321,7 +319,7 @@ class PMMLOASUtilsTest {
@Test
void createSetNodeInParent() {
- ObjectNode parentNode = JsonUtil.objectNode();
+ ObjectNode parentNode = PMMLOASUtils.objectNode();
String nodeToCreate = "nodeToCreate";
ObjectNode retrieved = PMMLOASUtils.createSetNodeInParent(parentNode,
nodeToCreate);
commonValidateSetNode(retrieved);
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml
b/kogito-build/kogito-dependencies-bom/pom.xml
index a7851dc58b..82b4502967 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -35,31 +35,31 @@
<properties>
<!-- this version property is used in plugins but also in dependencies too
-->
- <version.io.quarkus>3.15.3.1</version.io.quarkus>
+ <version.io.quarkus>3.20.1</version.io.quarkus>
<version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
- <version.org.springframework.boot>3.4.5</version.org.springframework.boot>
- <version.org.apache.kafka>3.7.1</version.org.apache.kafka>
+ <version.org.springframework.boot>3.4.6</version.org.springframework.boot>
+ <version.org.apache.kafka>3.9.0</version.org.apache.kafka>
-
<version.org.bouncycastle.bc.jdk18on>1.78.1</version.org.bouncycastle.bc.jdk18on>
+
<version.org.bouncycastle.bc.jdk18on>1.80</version.org.bouncycastle.bc.jdk18on>
<!-- dependencies versions -->
<version.com.networknt>1.0.86</version.com.networknt>
- <version.com.fasterxml.jackson>2.17.2</version.com.fasterxml.jackson>
-
<version.com.fasterxml.jackson.databind>2.17.2</version.com.fasterxml.jackson.databind>
+ <version.com.fasterxml.jackson>2.18.4</version.com.fasterxml.jackson>
+
<version.com.fasterxml.jackson.databind>2.18.4</version.com.fasterxml.jackson.databind>
<version.com.jayway.jsonpath>2.9.0</version.com.jayway.jsonpath>
<version.com.ongres.scram>2.1</version.com.ongres.scram>
<version.net.minidev.jsonsmart>2.4.10</version.net.minidev.jsonsmart>
<version.net.thisptr.jackson-jq>1.0.0-preview.20240207</version.net.thisptr.jackson-jq>
-
<version.io.quarkiverse.jackson-jq>2.0.2</version.io.quarkiverse.jackson-jq>
-
<version.io.quarkiverse.openapi.generator>2.9.0-lts</version.io.quarkiverse.openapi.generator>
+
<version.io.quarkiverse.jackson-jq>2.2.0</version.io.quarkiverse.jackson-jq>
+
<version.io.quarkiverse.openapi.generator>2.10.0-lts</version.io.quarkiverse.openapi.generator>
<version.io.quarkiverse.asyncapi>0.3.0</version.io.quarkiverse.asyncapi>
<version.io.quarkiverse.reactivemessaging.http>2.5.0-lts</version.io.quarkiverse.reactivemessaging.http>
-
<version.io.quarkiverse.embedded.postgresql>0.3.0</version.io.quarkiverse.embedded.postgresql>
+
<version.io.quarkiverse.embedded.postgresql>0.5.0</version.io.quarkiverse.embedded.postgresql>
<version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
- <version.com.github.javaparser>3.26.1</version.com.github.javaparser>
-
<version.com.fasterxml.jackson.datatype>2.17.2</version.com.fasterxml.jackson.datatype>
- <version.com.github.victools>4.31.0</version.com.github.victools>
-
<version.com.github.tomakehurst.wiremock>2.35.2</version.com.github.tomakehurst.wiremock>
+ <version.com.github.javaparser>3.26.3</version.com.github.javaparser>
+
<version.com.fasterxml.jackson.datatype>2.18.2</version.com.fasterxml.jackson.datatype>
+ <version.com.github.victools>4.37.0</version.com.github.victools>
+ <version.org.wiremock>3.13.0</version.org.wiremock>
<version.com.google.protobuf>3.25.5</version.com.google.protobuf>
<!-- We don't use gson directly. This is just to align versions of
transitive dependencies -->
<version.com.google.gson>2.10.1</version.com.google.gson>
@@ -67,75 +67,80 @@
<version.com.sun.xml.bind.core>4.0.5</version.com.sun.xml.bind.core>
<version.com.sun.activation>2.0.1</version.com.sun.activation>
<version.javax.inject>2.0.1</version.javax.inject>
-
<version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
- <version.ch.qos.logback>1.5.16</version.ch.qos.logback>
+
<version.org.eclipse.microprofile.openapi>4.0.2</version.org.eclipse.microprofile.openapi>
+ <version.ch.qos.logback>1.5.18</version.ch.qos.logback>
<version.jakarta.annotation-api>2.1.1</version.jakarta.annotation-api>
<version.jakarta.validation-api>3.0.2</version.jakarta.validation-api>
<version.jakarta.xml.bind-api>4.0.1</version.jakarta.xml.bind-api>
- <version.io.netty>4.1.118.Final</version.io.netty>
+ <version.io.netty>4.1.121.Final</version.io.netty>
- <version.io.cloudevents>2.3.0</version.io.cloudevents>
+ <version.io.cloudevents>3.0.0</version.io.cloudevents>
<!--
We add Fabric8 here to use as a basis for Addons/Kubernetes
Don't add as a management dependency because it will break SpringBoot and
Quarkus
Kubernetes addons since they use a different version.
-->
-
<version.io.fabric8.kubernetes-client>6.13.4</version.io.fabric8.kubernetes-client>
- <version.io.micrometer>1.12.2</version.io.micrometer>
+
<version.io.fabric8.kubernetes-client>7.1.0</version.io.fabric8.kubernetes-client>
+
<version.io.fabric8.openshift-mock>6.13.5</version.io.fabric8.openshift-mock>
+ <version.io.micrometer>1.14.7</version.io.micrometer>
<version.org.flywaydb>11.8.0</version.org.flywaydb>
- <version.org.postgresql>42.7.4</version.org.postgresql>
+ <version.org.postgresql>42.7.5</version.org.postgresql>
<version.com.h2>2.3.232</version.com.h2> <!-- Overriding version 2.3.230
to fix https://github.com/h2database/h2database/issues/4079 -->
<version.io.serverlessworkflow>4.1.0.Final</version.io.serverlessworkflow>
- <version.io.smallrye-open-api>3.10.0</version.io.smallrye-open-api>
- <version.org.awaitility>4.2.0</version.org.awaitility>
+ <version.io.smallrye-open-api>4.0.10</version.io.smallrye-open-api>
+ <version.io.smallrye-config>3.11.4</version.io.smallrye-config>
+ <version.org.awaitility>4.2.2</version.org.awaitility>
-
<version.io.smallrye.reactive.mutiny-vertx-web-client>3.17.1</version.io.smallrye.reactive.mutiny-vertx-web-client>
+ <version.com.squareup.okhttp3>4.12.0</version.com.squareup.okhttp3>
- <version.io.vertx>4.5.11</version.io.vertx>
- <version.io.grpc>1.65.1</version.io.grpc>
+
<version.io.smallrye.reactive.mutiny-vertx-web-client>3.18.1</version.io.smallrye.reactive.mutiny-vertx-web-client>
- <version.io.quarkus.camel>3.15.1</version.io.quarkus.camel> <!-- TODO:
quarkus version mismatch -->
+ <version.io.vertx>4.5.13</version.io.vertx>
+ <version.io.grpc>1.69.1</version.io.grpc>
- <version.io.swagger.parser.v3>2.1.19</version.io.swagger.parser.v3>
+ <version.io.quarkus.camel>3.20.1</version.io.quarkus.camel>
+
+ <version.io.swagger.parser.v3>2.1.20</version.io.swagger.parser.v3>
<version.io.swagger.core.v3>2.2.19</version.io.swagger.core.v3>
- <version.org.apache.commons>3.14.0</version.org.apache.commons>
+ <version.org.apache.commons>3.17.0</version.org.apache.commons>
+ <version.commons.io>2.19.0</version.commons.io>
<version.org.graalvm.nativeimage>23.1.2</version.org.graalvm.nativeimage>
- <version.org.infinispan>15.0.11.Final</version.org.infinispan>
-
<version.org.infinispan.protostream>5.0.8.Final</version.org.infinispan.protostream>
+ <version.org.infinispan>15.0.14.Final</version.org.infinispan>
+
<version.org.infinispan.protostream>5.0.13.Final</version.org.infinispan.protostream>
<version.org.rocksdb>7.10.2</version.org.rocksdb>
<!-- consider migrating to 3.x JDK 9:
https://jakarta.ee/specifications/restful-ws/ -->
<version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
<version.jakarta.persistence-api>3.1.0</version.jakarta.persistence-api>
- <version.org.jboss.resteasy>6.2.7.Final</version.org.jboss.resteasy>
+ <version.org.jboss.resteasy>6.2.12.Final</version.org.jboss.resteasy>
<version.org.keycloak>26.1.0</version.org.keycloak>
<!-- It seems that the confluent kafka cannot replace wurstmeister/kafka
so easily. See FAI-729 -->
<version.wurstmeister.kafka>2.12-2.2.1</version.wurstmeister.kafka>
- <version.org.mongo>4.11.1</version.org.mongo>
- <version.org.mongo-image>4.4.14</version.org.mongo-image>
+ <version.org.mongo>5.3.1</version.org.mongo>
+ <version.org.mongo-image>5.0.31</version.org.mongo-image>
<version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino>
<version.org.redis>2.0.4</version.org.redis>
<version.org.postgres>15.9-alpine3.20</version.org.postgres>
<!-- we align to version used by quarkus -->
<version.org.apache.avro>1.12.0</version.org.apache.avro>
<version.org.assertj>3.27.3</version.org.assertj>
- <version.org.glassfish.jaxb>4.0.4</version.org.glassfish.jaxb>
+ <version.org.glassfish.jaxb>4.0.5</version.org.glassfish.jaxb>
<version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj>
<version.org.hamcrest>2.2</version.org.hamcrest> <!-- else old version
coming from Mockito wins and breaks tests -->
<version.org.junit>4.13.2</version.org.junit>
<version.org.junit.jupiter>5.12.2</version.org.junit.jupiter>
<version.org.junit.platform>1.12.2</version.org.junit.platform><!--
otherwise Quarkus brings its own, silently disabling some tests -->
<version.org.mockito>5.17.0</version.org.mockito>
- <version.org.testcontainers>1.20.1</version.org.testcontainers>
- <version.org.xmlunit-core>2.10.0</version.org.xmlunit-core>
- <version.io.rest-assured>5.5.0</version.io.rest-assured>
+ <version.org.testcontainers>1.20.6</version.org.testcontainers>
+ <version.org.xmlunit-core>2.10.1</version.org.xmlunit-core>
+ <version.io.rest-assured>5.5.2</version.io.rest-assured>
- <version.net.byte-buddy>1.14.18</version.net.byte-buddy>
+ <version.net.byte-buddy>1.15.11</version.net.byte-buddy>
<version.org.mvel>2.5.2.Final</version.org.mvel>
<version.org.reactivestreams>1.0.4</version.org.reactivestreams>
@@ -155,7 +160,7 @@
<version.black.ninia>4.2.0</version.black.ninia>
<version.com.google.collections>1.0</version.com.google.collections>
<version.com.google.guava>33.0.0-jre</version.com.google.guava>
-
<version.apache.commons.commons-compress>1.26.1</version.apache.commons.commons-compress>
+
<version.apache.commons.commons-compress>1.27.1</version.apache.commons.commons-compress>
</properties>
<dependencyManagement>
@@ -197,6 +202,12 @@
<version>${version.apache.commons.commons-compress}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${version.commons.io}</version>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -385,6 +396,23 @@
<artifactId>h2</artifactId>
<version>${version.com.h2}</version>
</dependency>
+
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>${version.io.smallrye-config}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-core</artifactId>
@@ -411,6 +439,12 @@
<version>${version.io.smallrye-open-api}</version>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${version.com.squareup.okhttp3}</version>
+ </dependency>
+
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-mutiny-vertx-web-client</artifactId>
@@ -463,6 +497,45 @@
<version>${version.jakarta.persistence-api}</version>
</dependency>
+ <!-- fabric8 dependencies -->
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-client-api</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client-api</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>knative-client</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>knative-model</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-server-mock</artifactId>
+ <version>${version.io.fabric8.kubernetes-client}</version>
+ </dependency>
+
+ <!-- fabric8 - openshift mock server -->
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-server-mock</artifactId>
+ <version>${version.io.fabric8.openshift-mock}</version>
+ </dependency>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -596,15 +669,15 @@
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
- <version>${version.com.github.tomakehurst.wiremock}</version>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
+ <version>${version.org.wiremock}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8-standalone</artifactId>
- <version>${version.com.github.tomakehurst.wiremock}</version>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock-standalone</artifactId>
+ <version>${version.org.wiremock}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/kogito-codegen-modules/kogito-codegen-decisions/pom.xml
b/kogito-codegen-modules/kogito-codegen-decisions/pom.xml
index d9ff03ab2b..88a1e6d2d0 100644
--- a/kogito-codegen-modules/kogito-codegen-decisions/pom.xml
+++ b/kogito-codegen-modules/kogito-codegen-decisions/pom.xml
@@ -19,8 +19,8 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://maven.apache.org/POM/4.0.0";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.kie.kogito</groupId>
@@ -31,10 +31,10 @@
<artifactId>kogito-codegen-decisions</artifactId>
<name>Kogito :: Codegen Decisions</name>
- <properties>
- <java.module.name>org.kie.kogito.codegen.decision</java.module.name>
- <dependency-plugin.version>3.6.1</dependency-plugin.version>
- </properties>
+ <properties>
+ <java.module.name>org.kie.kogito.codegen.decision</java.module.name>
+ <dependency-plugin.version>3.6.1</dependency-plugin.version>
+ </properties>
<dependencyManagement>
<dependencies>
@@ -45,12 +45,12 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.kie</groupId>
- <artifactId>kie-dmn-test-resources</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- </dependency>
+ <dependency>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-dmn-test-resources</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -84,12 +84,17 @@
<!-- test -->
- <dependency>
- <groupId>org.kie</groupId>
- <artifactId>kie-dmn-test-resources</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.kie</groupId>
+ <artifactId>kie-dmn-test-resources</artifactId>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-codegen-api</artifactId>
@@ -121,52 +126,53 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.kie.kogito</groupId>
- <artifactId>kogito-events-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.kie.kogito</groupId>
+ <artifactId>kogito-events-api</artifactId>
+ </dependency>
</dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
-
<directory>${project.build.directory}/generated-test-resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <!-- Unpack DMN resources from org.kie:kie-dmn-test-resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency-plugin.version}</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.kie</groupId>
- <artifactId>kie-dmn-test-resources</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <type>jar</type>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/generated-test-resources</outputDirectory>
- <includes>**/*.dmn</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+
<directory>${project.build.directory}/generated-test-resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <!-- Unpack DMN resources from org.kie:kie-dmn-test-resources -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.kie</groupId>
+
<artifactId>kie-dmn-test-resources</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+
<outputDirectory>${project.build.directory}/generated-test-resources
+ </outputDirectory>
+ <includes>**/*.dmn</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/kogito-maven-plugin/pom.xml b/kogito-maven-plugin/pom.xml
index 566bc96bb8..face522094 100644
--- a/kogito-maven-plugin/pom.xml
+++ b/kogito-maven-plugin/pom.xml
@@ -125,6 +125,15 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ </dependency>
+ <!-- Required to force commons-io version in projects using
kogito-maven-plugin (e.g. Spring Boot ones)-->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<!-- Test -->
<dependency>
diff --git
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml
index b5f1b5c180..52039028f5 100644
---
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml
+++
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-rest/pom.xml
@@ -57,8 +57,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
index cb9fa645b2..0036ec6582 100644
---
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
+++
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
@@ -73,8 +73,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
index 2889353a58..d7232476c4 100644
---
a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
+++
b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
@@ -19,18 +19,28 @@
package org.kie.kogito.events.mongodb;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
import org.bson.conversions.Bson;
+import com.mongodb.ClientBulkWriteException;
import com.mongodb.ClientSessionOptions;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
import com.mongodb.client.ChangeStreamIterable;
import com.mongodb.client.ClientSession;
import com.mongodb.client.ListDatabasesIterable;
import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCluster;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.MongoIterable;
+import com.mongodb.client.model.bulk.ClientBulkWriteOptions;
+import com.mongodb.client.model.bulk.ClientBulkWriteResult;
+import com.mongodb.client.model.bulk.ClientNamespacedWriteModel;
import com.mongodb.connection.ClusterDescription;
import io.quarkus.test.Mock;
@@ -47,6 +57,56 @@ public class MockMongoClient implements MongoClient {
private MongoDatabase mongoDatabase = mock(MongoDatabase.class);
+ @Override
+ public CodecRegistry getCodecRegistry() {
+ return null;
+ }
+
+ @Override
+ public ReadPreference getReadPreference() {
+ return null;
+ }
+
+ @Override
+ public WriteConcern getWriteConcern() {
+ return null;
+ }
+
+ @Override
+ public ReadConcern getReadConcern() {
+ return null;
+ }
+
+ @Override
+ public Long getTimeout(TimeUnit timeUnit) {
+ return 0L;
+ }
+
+ @Override
+ public MongoCluster withCodecRegistry(CodecRegistry codecRegistry) {
+ return null;
+ }
+
+ @Override
+ public MongoCluster withReadPreference(ReadPreference readPreference) {
+ return null;
+ }
+
+ @Override
+ public MongoCluster withWriteConcern(WriteConcern writeConcern) {
+ return null;
+ }
+
+ @Override
+ public MongoCluster withReadConcern(ReadConcern readConcern) {
+ return null;
+ }
+
+ @Override
+ public MongoCluster withTimeout(long timeout, TimeUnit timeUnit) {
+ return null;
+ }
+
@Override
public MongoDatabase getDatabase(String databaseName) {
MongoCollection mongoCollection = mock(MongoCollection.class);
@@ -141,6 +201,26 @@ public class MockMongoClient implements MongoClient {
return null;
}
+ @Override
+ public ClientBulkWriteResult bulkWrite(List<? extends
ClientNamespacedWriteModel> models) throws ClientBulkWriteException {
+ return null;
+ }
+
+ @Override
+ public ClientBulkWriteResult bulkWrite(List<? extends
ClientNamespacedWriteModel> models, ClientBulkWriteOptions options) throws
ClientBulkWriteException {
+ return null;
+ }
+
+ @Override
+ public ClientBulkWriteResult bulkWrite(ClientSession clientSession, List<?
extends ClientNamespacedWriteModel> models) throws ClientBulkWriteException {
+ return null;
+ }
+
+ @Override
+ public ClientBulkWriteResult bulkWrite(ClientSession clientSession, List<?
extends ClientNamespacedWriteModel> models, ClientBulkWriteOptions options)
throws ClientBulkWriteException {
+ return null;
+ }
+
@Override
public ClusterDescription getClusterDescription() {
return null;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
index 62c6fd99a2..aa10f07ed8 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
@@ -37,6 +37,10 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-addons-kubernetes-service-catalog</artifactId>
@@ -57,6 +61,10 @@
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-client-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.kie</groupId>
@@ -75,19 +83,14 @@
<artifactId>quarkus-test-kubernetes-client</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>openshift-server-mock</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
index 14f48f2084..08e1593437 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
import io.fabric8.kubernetes.api.model.ContainerPortBuilder;
import io.fabric8.kubernetes.api.model.IntOrString;
@@ -32,7 +32,7 @@ import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServicePortBuilder;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -42,12 +42,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
public class DeploymentUtilsTest {
private final String namespace = "serverless-workflow-greeting-quarkus";
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Inject
KubernetesResourceDiscovery discovery;
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
index 549cbdfd45..e3fd150438 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
@@ -20,9 +20,9 @@ package
org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -31,11 +31,11 @@ import jakarta.inject.Inject;
import static
org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils.createKnativeServiceIfNotExists;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
class Fabric8KubernetesServiceCatalogTest extends KubernetesServiceCatalogTest
{
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@BeforeEach
void beforeEach() {
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
index e42fec0c99..4b6d577e62 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
@@ -23,10 +23,10 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* This test covers the queryIngressByName method from {@link IngressUtils}
*/
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
public class IngressUtilsTest {
private final String namespace = "serverless-workflow-greeting-quarkus";
@@ -47,7 +47,7 @@ public class IngressUtilsTest {
KubernetesResourceDiscovery discovery;
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Test
void testIngressNotFound() {
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
index cd9864bc8e..564d70fb42 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
@@ -23,9 +23,9 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -34,14 +34,14 @@ import jakarta.inject.Inject;
import static org.assertj.core.api.Assertions.assertThat;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
class KnativeServiceDiscoveryTest {
private static final String REMOTE_SERVICE_HOST =
"serverless-workflow-greeting-quarkus.default.10.99.154.147.sslip.io";
private static final String NAMESPACE = "default";
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Inject
KnativeServiceDiscovery knativeServiceDiscovery;
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
index 94b4994381..6f033b5e2d 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
@@ -23,11 +23,11 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
import io.fabric8.knative.client.KnativeClient;
import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -39,13 +39,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
* This test also covers the queryServiceByName method from {@link
ServiceUtils}
*/
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
public class KubernetesResourceDiscoveryTest {
private final String namespace = "serverless-workflow-greeting-quarkus";
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Inject
KubernetesResourceDiscovery kubernetesResourceDiscovery;
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
index 4b6a124384..65095bfb5a 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
// Change import
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.ReplicationController;
@@ -39,7 +39,7 @@ import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class) // Changed to use
KubernetesMockServerTestResource
public class OpenShiftServiceDiscoveryTest {
private final String namespace = "serverless-workflow-greeting-quarkus";
@@ -137,4 +137,4 @@ public class OpenShiftServiceDiscoveryTest {
Optional<String> url =
kubeResourceDiscovery.query(kubeURI).map(URI::toString);
assertEquals("https://secure-test-route-tls:443";, url.get());
}
-}
+}
\ No newline at end of file
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
index 4ca9858aa9..8803521b2c 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
@@ -24,11 +24,11 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -37,13 +37,13 @@ import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertEquals;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
public class PodUtilsTest {
private final String namespace = "serverless-workflow-greeting-quarkus";
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Inject
KubernetesResourceDiscovery discovery;
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
index 26440a09a6..48e2f8da32 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
@@ -24,7 +24,7 @@ import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
import io.fabric8.kubernetes.api.model.ContainerPortBuilder;
import io.fabric8.kubernetes.api.model.IntOrString;
@@ -32,7 +32,7 @@ import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServicePortBuilder;
import io.fabric8.kubernetes.api.model.apps.StatefulSet;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -42,13 +42,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
public class StatefulSetUtilsTest {
private final String namespace = "serverless-workflow-greeting-quarkus";
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Inject
KubernetesResourceDiscovery discovery;
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/deployment-no-service.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/deployment-no-service.yaml
index 8a81464caf..f8b207c61c 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/deployment-no-service.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/deployment-no-service.yaml
@@ -49,14 +49,14 @@ status:
conditions:
- type: Available
status: 'True'
- lastUpdateTime: '2022-08-18T13:15:57Z'
- lastTransitionTime: '2022-08-18T13:15:57Z'
+# lastUpdateTime: '2022-08-18T13:15:57Z' Commented out temporarily due to
bug in fabric 7.1.0. https://github.com/fabric8io/kubernetes-client/issues/6906
+# lastTransitionTime: '2022-08-18T13:15:57Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
reason: MinimumReplicasAvailable
message: Deployment has minimum availability.
- type: Progressing
status: 'True'
- lastUpdateTime: '2022-08-18T13:15:57Z'
- lastTransitionTime: '2022-08-18T13:15:53Z'
+# lastUpdateTime: '2022-08-18T13:15:57Z' Commented out temporarily due to
bug in fabric 7.1.0. https://github.com/fabric8io/kubernetes-client/issues/6906
+# lastTransitionTime: '2022-08-18T13:15:53Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
reason: NewReplicaSetAvailable
message: >-
ReplicaSet "example-deployment-no-service-585b54b56f" has successfully
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/pod-deployment-no-service.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/pod-deployment-no-service.yaml
index cc712c87bc..b058dab6ad 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/pod-deployment-no-service.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deployment/pod-deployment-no-service.yaml
@@ -95,19 +95,19 @@ status:
- type: Initialized
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T13:15:53Z'
+# lastTransitionTime: '2022-08-18T13:15:53Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: Ready
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T13:15:57Z'
+# lastTransitionTime: '2022-08-18T13:15:57Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: ContainersReady
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T13:15:57Z'
+# lastTransitionTime: '2022-08-18T13:15:57Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: PodScheduled
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T13:15:53Z'
+# lastTransitionTime: '2022-08-18T13:15:53Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
hostIP: 192.168.49.2
podIP: 172.17.0.11
podIPs:
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/deployment-config-no-service.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/deployment-config-no-service.yaml
index e2d139a7cf..717ce8a6ba 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/deployment-config-no-service.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/deployment-config-no-service.yaml
@@ -53,13 +53,13 @@ status:
conditions:
- type: Available
status: 'True'
- lastUpdateTime: '2022-08-22T17:30:30Z'
- lastTransitionTime: '2022-08-22T17:30:30Z'
+# lastUpdateTime: '2022-08-22T17:30:30Z' Commented out temporarily due to
bug in fabric 7.1.0. https://github.com/fabric8io/kubernetes-client/issues/6906
+# lastTransitionTime: '2022-08-22T17:30:30Z'
message: Deployment config has minimum availability.
- type: Progressing
status: 'True'
- lastUpdateTime: '2022-08-22T17:30:34Z'
- lastTransitionTime: '2022-08-22T17:30:34Z'
+# lastUpdateTime: '2022-08-22T17:30:34Z'
+# lastTransitionTime: '2022-08-22T17:30:34Z'
reason: NewReplicationControllerAvailable
message: >-
replication controller "example-dc-with-service-1" successfully rolled
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/pod-deployment-config-no-service.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/pod-deployment-config-no-service.yaml
index 98ec421829..39d7680eb5 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/pod-deployment-config-no-service.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/deploymentConfig/pod-deployment-config-no-service.yaml
@@ -123,19 +123,19 @@ status:
- type: Initialized
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-22T17:30:11Z'
+# lastTransitionTime: '2022-08-22T17:30:11Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: Ready
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-22T17:30:30Z'
+# lastTransitionTime: '2022-08-22T17:30:30Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: ContainersReady
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-22T17:30:30Z'
+# lastTransitionTime: '2022-08-22T17:30:30Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: PodScheduled
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-22T17:30:11Z'
+# lastTransitionTime: '2022-08-22T17:30:11Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
hostIP: 10.240.0.25
podIP: 172.17.25.190
podIPs:
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
index 20cad62212..b992a095f0 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.default.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-kubernetes.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-kubernetes.yaml
index 0d06b493d7..49f4a0750a 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-kubernetes.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-kubernetes.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.default.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z'
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z'
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-openshift.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-openshift.yaml
index f8ef98956d..c233160a3e 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-openshift.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting-openshift.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.default.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z'
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z'
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting.yaml
index 96e7dd0ee3..cc1c906282 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/knative/quarkus-greeting.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.default.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z'
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z'
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service-custom-port-name.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service-custom-port-name.yaml
index 5b655c9457..62d29ba1ea 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service-custom-port-name.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service-custom-port-name.yaml
@@ -41,19 +41,19 @@ status:
- type: Initialized
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T18:41:32Z'
+# lastTransitionTime: '2022-08-17T18:41:32Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: Ready
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T18:41:35Z'
+# lastTransitionTime: '2022-08-17T18:41:35Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: ContainersReady
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T18:41:35Z'
+# lastTransitionTime: '2022-08-17T18:41:35Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: PodScheduled
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T18:41:32Z'
+# lastTransitionTime: '2022-08-17T18:41:32Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
hostIP: 192.168.49.2
podIP: 172.17.0.22
podIPs:
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service.yaml
index 9addea7e0f..22d8d65fba 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/pod/pod-no-service.yaml
@@ -38,19 +38,19 @@ status:
- type: Initialized
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T17:37:56Z'
+# lastTransitionTime: '2022-08-17T17:37:56Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: Ready
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T17:37:58Z'
+# lastTransitionTime: '2022-08-17T17:37:58Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: ContainersReady
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T17:37:58Z'
+# lastTransitionTime: '2022-08-17T17:37:58Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: PodScheduled
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-17T17:37:56Z'
+# lastTransitionTime: '2022-08-17T17:37:56Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
hostIP: 192.168.49.2
podIP: 172.17.0.21
podIPs:
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route-tls.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route-tls.yaml
index b65fa2802b..fbd5b06178 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route-tls.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route-tls.yaml
@@ -60,7 +60,7 @@ status:
conditions:
- type: Admitted
status: 'True'
- lastTransitionTime: '2022-08-22T18:26:43Z'
+# lastTransitionTime: '2022-08-22T18:26:43Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
wildcardPolicy: None
routerCanonicalHostname: >-
secure-test-route-tls
\ No newline at end of file
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route.yaml
index ee9183e578..2a8585984e 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/route/route.yaml
@@ -41,7 +41,7 @@ status:
conditions:
- type: Admitted
status: 'True'
- lastTransitionTime: '2022-08-22T18:14:25Z'
+# lastTransitionTime: '2022-08-22T18:14:25Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
wildcardPolicy: None
routerCanonicalHostname: >-
test-route.org
diff --git
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/statefulset/statefulset-pod-no-service.yaml
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/statefulset/statefulset-pod-no-service.yaml
index 1e1e095953..fe7dff4ef0 100644
---
a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/statefulset/statefulset-pod-no-service.yaml
+++
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/resources/statefulset/statefulset-pod-no-service.yaml
@@ -100,19 +100,19 @@ status:
- type: Initialized
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T17:15:15Z'
+# lastTransitionTime: '2022-08-18T17:15:15Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: Ready
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T17:15:18Z'
+# lastTransitionTime: '2022-08-18T17:15:18Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: ContainersReady
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T17:15:18Z'
+# lastTransitionTime: '2022-08-18T17:15:18Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
- type: PodScheduled
status: 'True'
lastProbeTime: null
- lastTransitionTime: '2022-08-18T17:15:15Z'
+# lastTransitionTime: '2022-08-18T17:15:15Z' Commented out temporarily due
to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
hostIP: 192.168.49.2
podIP: 172.17.0.11
podIPs:
diff --git a/quarkus/addons/jobs/messaging/deployment/pom.xml
b/quarkus/addons/jobs/messaging/deployment/pom.xml
index f648834dd9..5e1dff8429 100644
--- a/quarkus/addons/jobs/messaging/deployment/pom.xml
+++ b/quarkus/addons/jobs/messaging/deployment/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+ <artifactId>quarkus-messaging-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git a/quarkus/addons/knative/serving/integration-tests/pom.xml
b/quarkus/addons/knative/serving/integration-tests/pom.xml
index 3dac05dcff..479c618baa 100644
--- a/quarkus/addons/knative/serving/integration-tests/pom.xml
+++ b/quarkus/addons/knative/serving/integration-tests/pom.xml
@@ -102,8 +102,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -111,11 +111,6 @@
<artifactId>quarkus-test-kubernetes-client</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>openshift-server-mock</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-addons-quarkus-kubernetes-test-utils</artifactId>
diff --git
a/quarkus/addons/knative/serving/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
b/quarkus/addons/knative/serving/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
index cd9993e400..0b87479aa2 100644
---
a/quarkus/addons/knative/serving/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
+++
b/quarkus/addons/knative/serving/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.test.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git a/quarkus/addons/knative/serving/runtime/pom.xml
b/quarkus/addons/knative/serving/runtime/pom.xml
index 8f6b478585..dbd62870bd 100644
--- a/quarkus/addons/knative/serving/runtime/pom.xml
+++ b/quarkus/addons/knative/serving/runtime/pom.xml
@@ -74,8 +74,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
b/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
index 50c124a0dd..f30475ce9d 100644
---
a/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
+++
b/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting-https.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.test.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git
a/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting.yaml
b/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting.yaml
index cd9993e400..0b87479aa2 100644
---
a/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting.yaml
+++
b/quarkus/addons/knative/serving/runtime/src/test/resources/knative/quarkus-greeting.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.test.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git
a/quarkus/addons/kubernetes/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
b/quarkus/addons/kubernetes/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
index cd9993e400..0b87479aa2 100644
---
a/quarkus/addons/kubernetes/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
+++
b/quarkus/addons/kubernetes/integration-tests/src/test/resources/knative/quarkus-greeting.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.test.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git a/quarkus/addons/kubernetes/runtime/pom.xml
b/quarkus/addons/kubernetes/runtime/pom.xml
index 0e0ab7f800..cf3f8bd05a 100644
--- a/quarkus/addons/kubernetes/runtime/pom.xml
+++ b/quarkus/addons/kubernetes/runtime/pom.xml
@@ -71,8 +71,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
index ad7acb6f94..354ef58944 100644
---
a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
+++
b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
@@ -29,13 +29,13 @@ import java.util.Optional;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.k8s.Endpoint;
import org.kie.kogito.addons.k8s.EndpointDiscovery;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServicePort;
import io.fabric8.kubernetes.api.model.ServiceSpec;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -47,11 +47,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
public class KubernetesServiceEndpointDiscoveryTest {
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
@Named("default")
@Inject
diff --git
a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
index 175bffa6b6..9e8d7e7632 100644
---
a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
+++
b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
@@ -23,9 +23,9 @@ import java.net.URI;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
-import
org.kie.kogito.addons.quarkus.k8s.test.utils.OpenShiftMockServerTestResource;
+import
org.kie.kogito.addons.quarkus.k8s.test.utils.KubernetesMockServerTestResource;
-import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static
org.kie.kogito.addons.quarkus.k8s.test.utils.KubeTestUtils.createKnativeServiceIfNotExists;
@QuarkusTest
-@QuarkusTestResource(OpenShiftMockServerTestResource.class)
+@QuarkusTestResource(KubernetesMockServerTestResource.class)
class KubeDiscoveryConfigCacheUpdaterTest {
private static final String remoteServiceUrl =
"http://serverless-workflow-greeting-quarkus.test.10.99.154.147.sslip.io";;
@@ -44,7 +44,7 @@ class KubeDiscoveryConfigCacheUpdaterTest {
KubernetesServiceCatalog kubernetesServiceCatalog;
@Inject
- OpenShiftClient client;
+ KubernetesClient client;
KubeDiscoveryConfigCacheUpdater kubeDiscoveryConfigCacheUpdater;
diff --git
a/quarkus/addons/kubernetes/runtime/src/test/resources/knative/quarkus-greeting.yaml
b/quarkus/addons/kubernetes/runtime/src/test/resources/knative/quarkus-greeting.yaml
index 60020eff7a..9fe9462d73 100644
---
a/quarkus/addons/kubernetes/runtime/src/test/resources/knative/quarkus-greeting.yaml
+++
b/quarkus/addons/kubernetes/runtime/src/test/resources/knative/quarkus-greeting.yaml
@@ -54,14 +54,14 @@ status:
address:
url: http://serverless-workflow-greeting-quarkus.test.svc.cluster.local
conditions:
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: ConfigurationsReady
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: Ready
- - lastTransitionTime: '2022-08-17T13:59:00Z'
- status: 'True'
+# - lastTransitionTime: '2022-08-17T13:59:00Z' Commented out temporarily
due to bug in fabric 7.1.0.
https://github.com/fabric8io/kubernetes-client/issues/6906
+ - status: 'True'
type: RoutesReady
latestCreatedRevisionName: serverless-workflow-greeting-quarkus-00001
latestReadyRevisionName: serverless-workflow-greeting-quarkus-00001
diff --git a/quarkus/addons/kubernetes/test-utils/pom.xml
b/quarkus/addons/kubernetes/test-utils/pom.xml
index 1bca46f194..0efe2f4b4f 100644
--- a/quarkus/addons/kubernetes/test-utils/pom.xml
+++ b/quarkus/addons/kubernetes/test-utils/pom.xml
@@ -32,11 +32,15 @@
<name>KIE Add-On Kubernetes Tests Utils</name>
<description>Util classes intended to be used in test scope.</description>
- <properties>
-
<java.module.name>org.kie.kogito.addons.quarkus.k8s.test.utils</java.module.name>
- </properties>
+ <properties>
+
<java.module.name>org.kie.kogito.addons.quarkus.k8s.test.utils</java.module.name>
+ </properties>
<dependencies>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-server-mock</artifactId>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client</artifactId>
diff --git
a/quarkus/addons/kubernetes/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KubernetesMockServerTestResource.java
b/quarkus/addons/kubernetes/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KubernetesMockServerTestResource.java
new file mode 100644
index 0000000000..3474a37029
--- /dev/null
+++
b/quarkus/addons/kubernetes/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KubernetesMockServerTestResource.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.addons.quarkus.k8s.test.utils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+
+/**
+ * Quarkus test resource that provides a Fabric8 Kubernetes mock server with
CRUD support.
+ */
+public class KubernetesMockServerTestResource implements
QuarkusTestResourceLifecycleManager {
+
+ private static final String TEST_NAMESPACE =
"serverless-workflow-greeting-quarkus";
+ private final KubernetesServer server = new KubernetesServer(false, true);
// Use CRUD mode
+
+ @Override
+ public Map<String, String> start() {
+ try {
+ server.before(); // Start the mock Kubernetes server
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to start Kubernetes mock
server", e);
+ }
+
+ String mockServerUrl =
server.getClient().getConfiguration().getMasterUrl();
+
+ // Ensure the Fabric8 client picks up the mock server
+ System.setProperty(Config.KUBERNETES_MASTER_SYSTEM_PROPERTY,
mockServerUrl);
+
+ Map<String, String> config = new HashMap<>();
+ config.put("quarkus.kubernetes-client.master-url", mockServerUrl);
+ config.put("quarkus.kubernetes-client.namespace", TEST_NAMESPACE);
+ config.put("quarkus.kubernetes-client.trust-certs", "true");
+ return config;
+ }
+
+ @Override
+ public void stop() {
+ if (server != null) {
+ server.after(); // Stop the mock server
+ }
+ }
+
+ /**
+ * Expose the Fabric8 Kubernetes mock server instance for advanced use in
tests.
+ */
+ public KubernetesServer getServer() {
+ return server;
+ }
+}
diff --git
a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
index d09fb81b0a..495d4a7fc3 100644
---
a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
+++
b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
@@ -88,8 +88,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
index 8012fdad3d..e9c958eb4e 100644
---
a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
+++
b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
@@ -20,6 +20,7 @@ package org.kie.kogito.infinispan.health;
import org.eclipse.microprofile.health.HealthCheckResponse;
import org.infinispan.client.hotrod.RemoteCacheManager;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.testcontainers.quarkus.InfinispanQuarkusTestResource;
@@ -34,6 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@QuarkusTest
@QuarkusTestResource(InfinispanQuarkusTestResource.class)
+@Disabled("Disabled because of agreement to remove Infinispan code
https://lists.apache.org/thread/zdhdyzrzqrp4v25btloyfgk60bry4stz";)
public class InfinispanHealthCheckIT {
private InfinispanHealthCheck healthCheck;
diff --git a/quarkus/bom/pom.xml b/quarkus/bom/pom.xml
index 981fa6edc2..7896bd79a3 100755
--- a/quarkus/bom/pom.xml
+++ b/quarkus/bom/pom.xml
@@ -37,9 +37,10 @@
<description>Internal BOM descriptor for Kogito modules targeting Quarkus
use-cases. Specific dependencies targeting the Quarkus platform must be added
here.</description>
<properties>
- <!-- Keep it aligned with
https://github.com/quarkusio/quarkus/blob/3.15/pom.xml#L72 -->
-
<version.io.fabric8.kubernetes-client>6.13.4</version.io.fabric8.kubernetes-client>
+ <!-- Keep it aligned with
https://github.com/quarkusio/quarkus/blob/3.20.1/pom.xml#L72 -->
+
<version.io.fabric8.kubernetes-client>7.1.0</version.io.fabric8.kubernetes-client>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
diff --git
a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
index b36d5d2443..58bbf69828 100644
---
a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
+++
b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
@@ -22,7 +22,7 @@ public class MissingRestCapabilityException extends
RuntimeException {
public MissingRestCapabilityException() {
super("No REST capability detected! \n" +
"Add RestEasy (quarkus-resteasy) and RestEasy Jackson
(quarkus-resteasy-jackson) extensions or " +
- "add RestEasy Reactive (quarkus-resteasy-reactive) and
RestEasy Reactive Jackson (quarkus-resteasy-reactive-jackson) extensions " +
+ "add RestEasy Reactive (quarkus-rest) and RestEasy Reactive
Jackson (quarkus-rest-jackson) extensions " +
"if you want Kogito to generate REST endpoints automatically.
\n" +
"You may also disable automated REST generation by setting
`kogito.generate.rest = false`. \n" +
"You may also override this notice by setting
`kogito.generate.rest = true` ");
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
index ceac3864a2..31c6f87736 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
@@ -76,7 +76,7 @@
<!-- Quarkus Deployment Extensions Dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+ <artifactId>quarkus-messaging-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkiverse.reactivemessaging.http</groupId>
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
index 550fb9d128..e899d5fc18 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
@@ -138,7 +138,7 @@ public class LiveReloadProcessor {
Collection<GeneratedFile> generatedFiles = new
ArrayList<>(generateSources(codeGenProvider));
Collection<GeneratedBeanBuildItem> generatedBeans =
compileGeneratedSources(generatedFiles);
if (!generatedBeans.isEmpty()) {
- classLoader.addElement(new MemoryClassPathElement(
+ classLoader.addNormalPriorityElement(new
MemoryClassPathElement(
generatedBeans.stream().collect(Collectors.toMap(x ->
x.getName().replace('.', '/').concat(".class"),
GeneratedBeanBuildItem::getData)), true));
}
return !generatedFiles.isEmpty() ? new
CodeGenerationResult(generatedFiles, indexCompiledSources(generatedBeans))
@@ -189,7 +189,7 @@ public class LiveReloadProcessor {
Path classPath =
outDir.getParent().getParent().resolve("classes");
Path serviceLoaderPath =
classPath.resolve("META-INF/services");
if (Files.isDirectory(classPath) &&
Files.isDirectory(serviceLoaderPath)) {
- classLoader.addElement(new
PathTreeClassPathElement(PathTree.ofDirectoryOrFile(classPath), true));
+ classLoader.addNormalPriorityElement(new
PathTreeClassPathElement(PathTree.ofDirectoryOrFile(classPath), true));
}
}
}
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/JsonSchemaImpl.java
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/JsonSchemaImpl.java
index 2eaae303ba..73cb98abcf 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/JsonSchemaImpl.java
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/JsonSchemaImpl.java
@@ -18,6 +18,7 @@
*/
package org.kie.kogito.serverless.workflow.parser.schema;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -26,9 +27,9 @@ import org.eclipse.microprofile.openapi.models.media.Schema;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonSetter;
+import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.smallrye.openapi.api.constants.OpenApiConstants;
import io.smallrye.openapi.api.models.media.SchemaImpl;
import static
org.kie.kogito.serverless.workflow.utils.ServerlessWorkflowUtils.DEFS_PREFIX;
@@ -41,8 +42,34 @@ import static
org.kie.kogito.serverless.workflow.utils.ServerlessWorkflowUtils.D
@JsonInclude(JsonInclude.Include.NON_NULL)
public class JsonSchemaImpl extends SchemaImpl {
+ public static final String REF_PREFIX_SCHEMA = "#/components/schemas/";
+
private Map<String, Schema> defs;
+ private List<Schema.SchemaType> type;
+
+ @JsonSetter("type")
+ public void setType(JsonNode typeNode) {
+ if (typeNode.isArray()) {
+ List<Schema.SchemaType> types = new ArrayList<>();
+ for (JsonNode node : typeNode) {
+
types.add(Schema.SchemaType.valueOf(node.asText().toUpperCase()));
+ }
+ this.type = types;
+ } else if (typeNode.isTextual()) {
+ this.type = new ArrayList<>();
+
this.type.add(Schema.SchemaType.valueOf(typeNode.asText().toUpperCase()));
+ }
+ }
+
+ public List<Schema.SchemaType> getType() {
+ return type;
+ }
+
+ public void setType(List<Schema.SchemaType> type) {
+ this.type = type;
+ }
+
@JsonSetter("$defs")
@JsonDeserialize(contentAs = JsonSchemaImpl.class)
public void setDefs(Map<String, Schema> defs) {
@@ -52,7 +79,7 @@ public class JsonSchemaImpl extends SchemaImpl {
@JsonSetter("$ref")
@Override
public void setRef(String ref) {
- super.setRef(ref.replace(DEFS_PREFIX,
OpenApiConstants.REF_PREFIX_SCHEMA));
+ super.setRef(ref.replace(DEFS_PREFIX, REF_PREFIX_SCHEMA));
}
public Map<String, Schema> getDefs() {
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/OpenApiModelSchemaGenerator.java
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/OpenApiModelSchemaGenerator.java
index 9dbf864b3c..38f4c71217 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/OpenApiModelSchemaGenerator.java
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/OpenApiModelSchemaGenerator.java
@@ -53,7 +53,7 @@ public final class OpenApiModelSchemaGenerator {
private static final Logger logger =
LoggerFactory.getLogger(OpenApiModelSchemaGenerator.class);
- private static final Schema ID_SCHEMA =
OASFactory.createSchema().type(SchemaType.STRING).description("Process instance
id");
+ private static final Schema ID_SCHEMA =
OASFactory.createSchema().type(List.of(SchemaType.STRING)).description("Process
instance id");
private static final String INPUT_SUFFIX = "_input";
private static final String OUTPUT_SUFFIX = "_output";
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
index 82eb2e1fd3..f795b39bb4 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
@@ -97,8 +97,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java
index 30785859d0..ad7a9d09ba 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/src/test/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessorTest.java
@@ -76,7 +76,7 @@ public class LiveReloadProcessorTest {
}
private static void configureWiremockServer() {
- wireMockServer = new
WireMockServer(WireMockConfiguration.wireMockConfig().extensions(new
ResponseTemplateTransformer(false)).dynamicPort());
+ wireMockServer = new
WireMockServer(WireMockConfiguration.wireMockConfig().extensions(new
ResponseTemplateTransformer(null, false, null,
java.util.Collections.emptyList())).dynamicPort());
wireMockServer.start();
wireMockServer.stubFor(post(urlEqualTo("/echo"))
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
index a3cd00bd9f..cb709ba31e 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
@@ -119,8 +119,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -244,7 +244,7 @@
<arguments>
<argument>${project.build.directory}/generated-sources/grpc</argument>
</arguments>
-
<mainClass>io.quarkus.grpc.deployment.GrpcPostProcessing</mainClass>
+ <mainClass>io.quarkus.grpc.codegen.GrpcPostProcessing</mainClass>
</configuration>
</execution>
</executions>
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ConversationFlowIT.java
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ConversationFlowIT.java
index 9d18e18b13..533aaf110b 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ConversationFlowIT.java
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ConversationFlowIT.java
@@ -21,6 +21,7 @@ package org.kie.kogito.quarkus.workflows;
import java.util.Map;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import io.quarkus.test.common.QuarkusTestResource;
@@ -34,6 +35,7 @@ import static org.hamcrest.CoreMatchers.notNullValue;
@QuarkusTestResource(OperationsMockService.class)
@QuarkusIntegrationTest
+@Disabled("Disabled due to bug
https://github.com/quarkusio/quarkus/issues/46801. When issues are resolved, we
need to reenable.")
class ConversationFlowIT {
@BeforeAll
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EnumEchoServiceMock.java
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EnumEchoServiceMock.java
index 83a7017de4..f3e86aa666 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EnumEchoServiceMock.java
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EnumEchoServiceMock.java
@@ -41,7 +41,7 @@ public class EnumEchoServiceMock implements
QuarkusTestResourceLifecycleManager
}
private void configureWiremockServer() {
- wireMockServer = new
WireMockServer(WireMockConfiguration.wireMockConfig().extensions(new
ResponseTemplateTransformer(false)).dynamicPort());
+ wireMockServer = new
WireMockServer(WireMockConfiguration.wireMockConfig().extensions(new
ResponseTemplateTransformer(null, false, null,
java.util.Collections.emptyList())).dynamicPort());
wireMockServer.start();
wireMockServer.stubFor(post(urlEqualTo("/echo"))
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
index 5b6bf461a0..568b833b85 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
@@ -100,8 +100,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
index efe7b6a7a2..5f56b197c7 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
+++
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
@@ -18,9 +18,12 @@
*/
package org.kie.kogito.it;
+import org.junit.jupiter.api.Disabled;
+
import io.quarkus.test.junit.QuarkusIntegrationTest;
@QuarkusIntegrationTest
+@Disabled("Disabled because of agreement to remove Infinispan code
https://lists.apache.org/thread/zdhdyzrzqrp4v25btloyfgk60bry4stz";)
class InfinispanOptimisticLockingIT extends OptimisticLockingTest {
}
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
b/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
index 5c4b9e7b29..214777cf51 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
+++
b/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
@@ -63,11 +63,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
@@ -81,8 +81,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
index 32dcc9306b..7734be546e 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
@@ -129,8 +129,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml
b/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml
index e2072e4466..8fe26151e4 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml
+++
b/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/pom.xml
@@ -60,11 +60,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
index eafc7069ff..c7b60b8b87 100644
--- a/springboot/bom/pom.xml
+++ b/springboot/bom/pom.xml
@@ -35,8 +35,8 @@
<packaging>pom</packaging>
<properties>
- <version.io.swagger.core.v3>2.2.20</version.io.swagger.core.v3>
- <version.org.springdoc>2.3.0</version.org.springdoc>
+ <version.io.swagger.core.v3>2.2.30</version.io.swagger.core.v3>
+ <version.org.springdoc>2.8.8</version.org.springdoc>
<!-- Groovy -->
<!-- must be aligned with the Archetype plugin:
https://maven.apache.org/archetype/maven-archetype-plugin/dependencies.html -->
<version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
diff --git
a/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
b/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
index 22c7f4d38a..630eaa3d37 100644
---
a/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
+++
b/springboot/integration-tests/integration-tests-springboot-decisions-it/pom.xml
@@ -146,6 +146,13 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>io.smallrye.config</groupId>
+ <artifactId>smallrye-config</artifactId>
+ <version>${version.io.smallrye-config}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git
a/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
b/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
index 4a5d5c1e4d..b214930f9b 100644
---
a/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
+++
b/springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
@@ -112,8 +112,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.github.tomakehurst</groupId>
- <artifactId>wiremock-jre8-standalone</artifactId>
+ <groupId>org.wiremock</groupId>
+ <artifactId>wiremock-standalone</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
b/springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
index 2b7c82fea5..48d5bb1437 100644
---
a/springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
+++
b/springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/MonitoringTest.java
@@ -65,9 +65,9 @@ public class MonitoringTest extends BaseRestTest {
KogitoGAV kogitoGAV = configBean.getGav().get();
-
assertThat(response).contains(format("kogito_process_instance_started_total{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\",}
1.0",
+
assertThat(response).contains(format("kogito_process_instance_started_total{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\"}
1.0",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
-
assertThat(response).contains(format("kogito_process_instance_running_total{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\",}
1.0",
+
assertThat(response).contains(format("kogito_process_instance_running{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\"}
1.0",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
String taskId = given()
@@ -100,23 +100,23 @@ public class MonitoringTest extends BaseRestTest {
.statusCode(200)
.extract().body().asString();
-
assertThat(response).contains(format("kogito_work_item_duration_seconds_max{artifactId=\"%s\",name=\"MonitoringTask\",version=\"%s\",}",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
+
assertThat(response).contains(format("kogito_work_item_duration_seconds_max{artifactId=\"%s\",name=\"MonitoringTask\",version=\"%s\"}",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
assertThat(response)
-
.contains(format("kogito_work_item_duration_seconds_count{artifactId=\"%s\",name=\"MonitoringTask\",version=\"%s\",}
1.0", kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
-
assertThat(response).contains(format("kogito_work_item_duration_seconds_sum{artifactId=\"%s\",name=\"MonitoringTask\",version=\"%s\",}",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
+
.contains(format("kogito_work_item_duration_seconds_count{artifactId=\"%s\",name=\"MonitoringTask\",version=\"%s\"}
1", kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
+
assertThat(response).contains(format("kogito_work_item_duration_seconds_sum{artifactId=\"%s\",name=\"MonitoringTask\",version=\"%s\"}",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
assertThat(response)
.contains(format(
-
"kogito_process_instance_completed_total{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",process_state=\"Completed\",version=\"%s\",}
1.0",
+
"kogito_process_instance_completed_total{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",process_state=\"Completed\",version=\"%s\"}
1.0",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
-
assertThat(response).contains(format("kogito_process_instance_running_total{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\",}
0.0",
+
assertThat(response).contains(format("kogito_process_instance_running{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\"}
0.0",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
-
assertThat(response).contains(format("kogito_process_instance_duration_seconds_max{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\",}",
+
assertThat(response).contains(format("kogito_process_instance_duration_seconds_max{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\"}",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
assertThat(response)
-
.contains(format("kogito_process_instance_duration_seconds_count{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\",}
1.0",
+
.contains(format("kogito_process_instance_duration_seconds_count{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\"}
1",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
-
assertThat(response).contains(format("kogito_process_instance_duration_seconds_sum{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\",}",
+
assertThat(response).contains(format("kogito_process_instance_duration_seconds_sum{app_id=\"default-process-monitoring-listener\",artifactId=\"%s\",process_id=\"monitoring\",version=\"%s\"}",
kogitoGAV.getArtifactId(), kogitoGAV.getVersion()));
}
diff --git
a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
index 22c8673bfa..6c52ead576 100644
---
a/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
+++
b/springboot/integration-tests/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/src/test/java/org/kie/kogito/it/InfinispanOptimisticLockingIT.java
@@ -18,12 +18,14 @@
*/
package org.kie.kogito.it;
+import org.junit.jupiter.api.Disabled;
import
org.kie.kogito.testcontainers.springboot.InfinispanSpringBootTestResource;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ContextConfiguration;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = KogitoSpringbootApplication.class, properties = {
"kogito.persistence.optimistic.lock=true" })
@ContextConfiguration(initializers = InfinispanSpringBootTestResource.class)
+@Disabled("Disabled because of agreement to remove Infinispan code
https://lists.apache.org/thread/zdhdyzrzqrp4v25btloyfgk60bry4stz";)
public class InfinispanOptimisticLockingIT extends OptimisticLockingTest {
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
