This is an automated email from the ASF dual-hosted git repository.
Kusuma04-dev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie.git
The following commit(s) were added to refs/heads/main by this push:
new bda36f85a3a [incubator-kie#7260] Migrate `quarkus-resteasy` to
`quarkus-rest` (#7258)
bda36f85a3a is described below
commit bda36f85a3a66da4bc38e763fd9ab2ae5a1b3f62
Author: Kusuma04-dev <[email protected]>
AuthorDate: Fri Nov 6 11:55:47 2026 +0530
[incubator-kie#7260] Migrate `quarkus-resteasy` to `quarkus-rest` (#7258)
* migrated quarkus resteasy to rest
---------
Co-authored-by: Kusuma04-dev <[email protected]>
---
.../pom.xml | 4 +-
kie-parent/pom.xml | 31 +++++++
.../integration-tests-process/pom.xml | 4 +-
.../integration-tests-process/pom.xml | 4 +-
.../integration-tests-process/pom.xml | 4 +-
.../integration-tests-process/pom.xml | 4 +-
.../integration-tests-process/pom.xml | 4 +-
.../integration-tests-process/pom.xml | 4 +-
.../integration-tests-process/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 6 +-
.../pom.xml | 6 +-
.../pom.xml | 6 +-
.../pom.xml | 6 +-
kogito-apps-quarkus/integration-tests-jobs/pom.xml | 4 +-
.../deployment/pom.xml | 6 +-
.../runtime/pom.xml | 6 +-
.../persistence-commons-reporting-api/pom.xml | 2 +-
.../pom.xml | 4 +-
.../reporting/api/PostgresMappingsApiV1.java | 2 +-
kogito-apps-quarkus/security-commons/pom.xml | 2 +-
.../java/org/kie/kogito/security/UserResource.java | 2 +-
.../explainability-service-rest/pom.xml | 8 +-
.../explainability-service/pom.xml | 2 +-
kogito-jitexecutor/jitexecutor-bpmn/pom.xml | 4 +-
kogito-jitexecutor/jitexecutor-dmn/pom.xml | 4 +-
.../addons/explainability/deployment/pom.xml | 4 +-
.../explainability/integration-tests/pom.xml | 4 +-
.../addons/explainability/runtime/pom.xml | 4 +-
.../addons/jobs/common/messaging/pom.xml | 2 +-
.../addons/jobs/common/rest-callback/pom.xml | 2 +-
.../knative/eventing/integration-tests/pom.xml | 6 +-
.../addons/kubernetes/integration-tests/pom.xml | 4 +-
kogito-quarkus/addons/messaging/common/pom.xml | 2 +-
.../addons/messaging/integration-tests/pom.xml | 4 +-
kogito-quarkus/addons/monitoring/core/pom.xml | 2 +-
.../addons/monitoring/elastic/deployment/pom.xml | 2 +-
.../monitoring/prometheus/deployment/pom.xml | 2 +-
.../addons/monitoring/prometheus/runtime/pom.xml | 2 +-
.../integration-tests/pom.xml | 4 +-
.../process-management/integration-tests/pom.xml | 6 +-
kogito-quarkus/addons/process-svg/runtime/pom.xml | 2 +-
kogito-quarkus/addons/source-files/runtime/pom.xml | 4 +-
.../addons/tracing-decision/deployment/pom.xml | 2 +-
.../tracing-decision/integration-tests/pom.xml | 4 +-
.../addons/tracing-decision/runtime/pom.xml | 2 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../quarkus/dmn/KogitoDMNCodeCodestartIT.java | 2 +-
.../deployment/MissingRestCapabilityException.java | 2 +-
.../kogito-quarkus-common/pom.xml | 2 +-
.../pom.xml | 4 +-
.../test/resources/projects/classic-inst/pom.xml | 4 +-
.../src/test/resources/projects/simple-dmn/pom.xml | 4 +-
.../kogito-quarkus-integration-test/pom.xml | 4 +-
.../kogito-quarkus-incubation-common/pom.xml | 2 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../kogito-quarkus-rules-integration-test/pom.xml | 4 +-
.../integration-tests-kogito-plugin/pom.xml | 4 +-
.../it/integration-tests-kogito-plugin-it/pom.xml | 4 +-
.../integration-tests-quarkus-decisions/pom.xml | 4 +-
.../integration-tests-quarkus-legacy-rules/pom.xml | 4 +-
.../integration-tests-quarkus-norest/pom.xml | 4 +-
.../integration-tests-quarkus-predictions/pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 5 -
.../quarkus/reactive/ProcessIT.java | 2 +-
.../integration-tests-quarkus-processes/pom.xml | 19 +---
.../kogito/integrationtests/quarkus/ProcessIT.java | 2 +-
.../kogito/integrationtests/quarkus/TaskIT.java | 2 +-
.../providers/jackson/PatchMethodFilter.java} | 27 ++++--
.../integration-tests-quarkus-rules/pom.xml | 4 +-
.../integration-tests-quarkus-source-files/pom.xml | 4 +-
.../integration-tests-quarkus-transactions/pom.xml | 5 +-
.../pom.xml | 4 +-
.../integration-tests-quarkus-usertasks/pom.xml | 4 +-
.../integration-tests-quarkus-wshumantasks/pom.xml | 4 +-
.../pom.xml | 11 ---
.../integrationtests/springboot/ProcessTest.java | 2 +-
.../integrationtests/springboot/TaskTest.java | 2 +-
kogito-test-utils/pom.xml | 5 +
.../kie/kogito/test/utils/JsonSchemaMatchers.java | 102 +++++++++++++++++++++
.../kogito/test/utils/JsonSchemaMatchersTest.java | 55 +++++++++++
.../trusty-service/trusty-service-common/pom.xml | 4 +-
.../trusty/service/common/api/DecisionsApiV1.java | 2 +-
.../trusty/service/common/api/ExecutionsApiV1.java | 4 +-
.../service/common/api/ExplainabilityApiV1.java | 2 +-
.../deployment/pom.xml | 2 +-
.../integration-test/pom.xml | 2 +-
.../integration-test/pom.xml | 4 +-
.../integration-test/pom.xml | 4 +-
.../optaplanner-quarkus/deployment/pom.xml | 7 +-
...erProcessorOverridePropertiesAtRuntimeTest.java | 2 +-
.../devui-integration-test/pom.xml | 2 +-
.../drl-integration-test/pom.xml | 2 +-
.../optaplanner-quarkus/integration-test/pom.xml | 2 +-
.../reflection-integration-test/pom.xml | 2 +-
100 files changed, 372 insertions(+), 209 deletions(-)
diff --git
a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
index 490cbf333ae..d212770d8da 100644
--- a/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
+++ b/drools-quarkus-extension/drools-quarkus-integration-test-hotreload/pom.xml
@@ -48,11 +48,11 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
diff --git a/kie-parent/pom.xml b/kie-parent/pom.xml
index e3979e4a610..80595e4b7ff 100644
--- a/kie-parent/pom.xml
+++ b/kie-parent/pom.xml
@@ -974,6 +974,17 @@
<artifactId>json-schema-validator</artifactId>
<version>${version.io.rest-assured}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- CVE fix: jackson-coreutils pulled transitively via
json-schema-validator -->
+ <exclusion>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>jackson-coreutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>json-patch</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
@@ -1101,6 +1112,15 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <!-- CVE fix: json-patch/jackson-coreutils pulled in transitively
via swagger-compat-spec-parser -->
+ <exclusion>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>json-patch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>jackson-coreutils</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Vertx libraries, including PostgreSQL client -->
@@ -1926,6 +1946,17 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
<version>${version.org.jboss.resteasy}</version>
+ <exclusions>
+ <!-- CVE fix: no patched version of json-patch/jackson-coreutils
exists -->
+ <exclusion>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>json-patch</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>jackson-coreutils</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml
index 000c81c62f0..0eab1fc1ef1 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-jpa/integration-tests-process/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
index c354218116b..8bbc4a58e89 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-mongodb/integration-tests-process/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
index cd6e371f8b8..a15b782b093 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/integration-tests-process/pom.xml
@@ -41,11 +41,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
index a84503e43e3..63a17e475b1 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/integration-tests-process/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml
index ca4047d98ed..261f3e8fc6b 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-jpa/integration-tests-process/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
index 8a4e9188887..dcb19d31f45 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-mongodb/integration-tests-process/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
index fed9a8c7321..6a2e340d9a6 100644
---
a/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
+++
b/kogito-apps-quarkus/data-index-quarkus/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-postgresql/integration-tests-process/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/integration-tests-data-index-service-quarkus-parent/integration-tests-data-index-service-quarkus/pom.xml
b/kogito-apps-quarkus/integration-tests-data-index-service-quarkus-parent/integration-tests-data-index-service-quarkus/pom.xml
index 4b6dcc5bfe7..4a79f5f15e2 100644
---
a/kogito-apps-quarkus/integration-tests-data-index-service-quarkus-parent/integration-tests-data-index-service-quarkus/pom.xml
+++
b/kogito-apps-quarkus/integration-tests-data-index-service-quarkus-parent/integration-tests-data-index-service-quarkus/pom.xml
@@ -93,11 +93,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
diff --git
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
index 6fabe0bbd41..968c2e9af43 100644
---
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
+++
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/pom.xml
@@ -51,15 +51,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+ <artifactId>quarkus-rest-client-oidc-filter</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
index 5079269ea2c..07983bd359e 100644
---
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
+++
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/pom.xml
@@ -50,15 +50,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+ <artifactId>quarkus-rest-client-oidc-filter</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
diff --git
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
index 427d96f1aee..c0bf6519775 100644
---
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
+++
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/pom.xml
@@ -50,15 +50,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+ <artifactId>quarkus-rest-client-oidc-filter</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
index a73898ea34c..3cc3263e11c 100644
---
a/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
+++
b/kogito-apps-quarkus/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/pom.xml
@@ -50,15 +50,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+ <artifactId>quarkus-rest-client-oidc-filter</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git a/kogito-apps-quarkus/integration-tests-jobs/pom.xml
b/kogito-apps-quarkus/integration-tests-jobs/pom.xml
index af8a730ac00..4e3119d54a4 100644
--- a/kogito-apps-quarkus/integration-tests-jobs/pom.xml
+++ b/kogito-apps-quarkus/integration-tests-jobs/pom.xml
@@ -94,11 +94,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- Test Dependencies -->
diff --git
a/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
b/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
index 491c9083cdc..e84b5adb41a 100644
---
a/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
+++
b/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/deployment/pom.xml
@@ -48,11 +48,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+ <artifactId>quarkus-rest-jackson-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git
a/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
b/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
index 3deed4e073a..f5500dff5bf 100644
---
a/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
+++
b/kogito-apps-quarkus/jobs-service-quarkus/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/pom.xml
@@ -43,11 +43,7 @@
<!-- adding resteasy classic to be aligned with kogito runtimes that does
not support the reactive -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-mutiny</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus.http</groupId>
diff --git
a/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
b/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
index f3300205e84..6a50d068030 100644
---
a/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
+++
b/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-api/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
diff --git
a/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
b/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
index 5c5c1a52bf0..5ca830119e8 100644
---
a/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
+++
b/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
b/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
index edd95fd1d5a..25c9bad6a2d 100644
---
a/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
+++
b/kogito-apps-quarkus/persistence-commons-quarkus/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
@@ -27,7 +27,6 @@ import
org.eclipse.microprofile.openapi.annotations.media.Schema;
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
import
org.kie.kogito.persistence.postgresql.reporting.database.GenericPostgresDatabaseManagerImpl;
import
org.kie.kogito.persistence.postgresql.reporting.model.PostgresMappingDefinition;
import
org.kie.kogito.persistence.postgresql.reporting.model.PostgresMappingDefinitions;
@@ -40,6 +39,7 @@ import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
diff --git a/kogito-apps-quarkus/security-commons/pom.xml
b/kogito-apps-quarkus/security-commons/pom.xml
index ef4e94bbf7e..91a35105636 100644
--- a/kogito-apps-quarkus/security-commons/pom.xml
+++ b/kogito-apps-quarkus/security-commons/pom.xml
@@ -41,7 +41,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jsonb</artifactId>
+ <artifactId>quarkus-rest-jsonb</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-apps-quarkus/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
b/kogito-apps-quarkus/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
index 6302acec829..c56e2ad2225 100644
---
a/kogito-apps-quarkus/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
+++
b/kogito-apps-quarkus/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
@@ -21,7 +21,7 @@ package org.kie.kogito.security;
import java.util.Collections;
import java.util.Set;
-import org.jboss.resteasy.annotations.cache.NoCache;
+import org.jboss.resteasy.reactive.NoCache;
import io.quarkus.security.Authenticated;
import io.quarkus.security.credential.TokenCredential;
diff --git a/kogito-explainability/explainability-service-rest/pom.xml
b/kogito-explainability/explainability-service-rest/pom.xml
index 80137aa3edb..2f2b5f71a52 100644
--- a/kogito-explainability/explainability-service-rest/pom.xml
+++ b/kogito-explainability/explainability-service-rest/pom.xml
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -50,16 +50,12 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-openapi</artifactId>
</dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-mutiny</artifactId>
- </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-oidc</artifactId>
diff --git a/kogito-explainability/explainability-service/pom.xml
b/kogito-explainability/explainability-service/pom.xml
index ced21ea55a6..f37bec26a46 100644
--- a/kogito-explainability/explainability-service/pom.xml
+++ b/kogito-explainability/explainability-service/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/kogito-jitexecutor/jitexecutor-bpmn/pom.xml
b/kogito-jitexecutor/jitexecutor-bpmn/pom.xml
index a5c7ecc9ddc..bf8bb19a149 100644
--- a/kogito-jitexecutor/jitexecutor-bpmn/pom.xml
+++ b/kogito-jitexecutor/jitexecutor-bpmn/pom.xml
@@ -40,11 +40,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- ensure Quarkus' openapi takes precedence over the v7 dependency -->
<dependency>
diff --git a/kogito-jitexecutor/jitexecutor-dmn/pom.xml
b/kogito-jitexecutor/jitexecutor-dmn/pom.xml
index 5be72423c33..25e855217f2 100644
--- a/kogito-jitexecutor/jitexecutor-dmn/pom.xml
+++ b/kogito-jitexecutor/jitexecutor-dmn/pom.xml
@@ -38,11 +38,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- ensure Quarkus' openapi takes precedence over the v7 dependency -->
<dependency>
diff --git a/kogito-quarkus/addons/explainability/deployment/pom.xml
b/kogito-quarkus/addons/explainability/deployment/pom.xml
index c31cf2e65f0..f326bb1e678 100644
--- a/kogito-quarkus/addons/explainability/deployment/pom.xml
+++ b/kogito-quarkus/addons/explainability/deployment/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-deployment</artifactId>
+ <artifactId>quarkus-rest-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+ <artifactId>quarkus-rest-jackson-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git a/kogito-quarkus/addons/explainability/integration-tests/pom.xml
b/kogito-quarkus/addons/explainability/integration-tests/pom.xml
index d364ed23bf8..914faa41b9c 100644
--- a/kogito-quarkus/addons/explainability/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/explainability/integration-tests/pom.xml
@@ -37,11 +37,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.cloudevents</groupId>
diff --git a/kogito-quarkus/addons/explainability/runtime/pom.xml
b/kogito-quarkus/addons/explainability/runtime/pom.xml
index 6d83b885e28..e34d76dca69 100644
--- a/kogito-quarkus/addons/explainability/runtime/pom.xml
+++ b/kogito-quarkus/addons/explainability/runtime/pom.xml
@@ -39,11 +39,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
diff --git a/kogito-quarkus/addons/jobs/common/messaging/pom.xml
b/kogito-quarkus/addons/jobs/common/messaging/pom.xml
index 0421594045a..a578f24d0e2 100644
--- a/kogito-quarkus/addons/jobs/common/messaging/pom.xml
+++ b/kogito-quarkus/addons/jobs/common/messaging/pom.xml
@@ -60,7 +60,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/kogito-quarkus/addons/jobs/common/rest-callback/pom.xml
b/kogito-quarkus/addons/jobs/common/rest-callback/pom.xml
index 25ba0f0b194..ff42cd764b2 100644
--- a/kogito-quarkus/addons/jobs/common/rest-callback/pom.xml
+++ b/kogito-quarkus/addons/jobs/common/rest-callback/pom.xml
@@ -61,7 +61,7 @@
<!-- Test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/kogito-quarkus/addons/knative/eventing/integration-tests/pom.xml
b/kogito-quarkus/addons/knative/eventing/integration-tests/pom.xml
index 68a254757b0..4202404d193 100644
--- a/kogito-quarkus/addons/knative/eventing/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/knative/eventing/integration-tests/pom.xml
@@ -47,15 +47,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+ <artifactId>quarkus-rest-client-oidc-filter</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/kogito-quarkus/addons/kubernetes/integration-tests/pom.xml
b/kogito-quarkus/addons/kubernetes/integration-tests/pom.xml
index 883109a7ea1..c031661a9b9 100644
--- a/kogito-quarkus/addons/kubernetes/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/kubernetes/integration-tests/pom.xml
@@ -50,11 +50,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git a/kogito-quarkus/addons/messaging/common/pom.xml
b/kogito-quarkus/addons/messaging/common/pom.xml
index 2a964f42d87..973be70a885 100644
--- a/kogito-quarkus/addons/messaging/common/pom.xml
+++ b/kogito-quarkus/addons/messaging/common/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/kogito-quarkus/addons/messaging/integration-tests/pom.xml
b/kogito-quarkus/addons/messaging/integration-tests/pom.xml
index 9293b1494cb..5ca32996b37 100644
--- a/kogito-quarkus/addons/messaging/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/messaging/integration-tests/pom.xml
@@ -38,11 +38,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
diff --git a/kogito-quarkus/addons/monitoring/core/pom.xml
b/kogito-quarkus/addons/monitoring/core/pom.xml
index 26bdc764965..e574f5e7c32 100644
--- a/kogito-quarkus/addons/monitoring/core/pom.xml
+++ b/kogito-quarkus/addons/monitoring/core/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
diff --git a/kogito-quarkus/addons/monitoring/elastic/deployment/pom.xml
b/kogito-quarkus/addons/monitoring/elastic/deployment/pom.xml
index 8a836e7f8fe..72238eb2604 100644
--- a/kogito-quarkus/addons/monitoring/elastic/deployment/pom.xml
+++ b/kogito-quarkus/addons/monitoring/elastic/deployment/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-deployment</artifactId>
+ <artifactId>quarkus-rest-deployment</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/kogito-quarkus/addons/monitoring/prometheus/deployment/pom.xml
b/kogito-quarkus/addons/monitoring/prometheus/deployment/pom.xml
index aa6f13872a1..4196d7dcd25 100644
--- a/kogito-quarkus/addons/monitoring/prometheus/deployment/pom.xml
+++ b/kogito-quarkus/addons/monitoring/prometheus/deployment/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-deployment</artifactId>
+ <artifactId>quarkus-rest-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/kogito-quarkus/addons/monitoring/prometheus/runtime/pom.xml
b/kogito-quarkus/addons/monitoring/prometheus/runtime/pom.xml
index d0c93a1458c..304ad126ab0 100644
--- a/kogito-quarkus/addons/monitoring/prometheus/runtime/pom.xml
+++ b/kogito-quarkus/addons/monitoring/prometheus/runtime/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/addons/process-instance-migration/integration-tests/pom.xml
b/kogito-quarkus/addons/process-instance-migration/integration-tests/pom.xml
index 086ac6fb71f..884e5f6f444 100644
--- a/kogito-quarkus/addons/process-instance-migration/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/process-instance-migration/integration-tests/pom.xml
@@ -64,11 +64,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/kogito-quarkus/addons/process-management/integration-tests/pom.xml
b/kogito-quarkus/addons/process-management/integration-tests/pom.xml
index 3397ed40abe..271e72d9e25 100644
--- a/kogito-quarkus/addons/process-management/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/process-management/integration-tests/pom.xml
@@ -60,15 +60,15 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
+ <artifactId>quarkus-rest-client-oidc-filter</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/kogito-quarkus/addons/process-svg/runtime/pom.xml
b/kogito-quarkus/addons/process-svg/runtime/pom.xml
index f1c86b97404..e1a9c2a2be0 100644
--- a/kogito-quarkus/addons/process-svg/runtime/pom.xml
+++ b/kogito-quarkus/addons/process-svg/runtime/pom.xml
@@ -62,7 +62,7 @@
<!-- test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/kogito-quarkus/addons/source-files/runtime/pom.xml
b/kogito-quarkus/addons/source-files/runtime/pom.xml
index c10ccb42bad..f158deacbe8 100644
--- a/kogito-quarkus/addons/source-files/runtime/pom.xml
+++ b/kogito-quarkus/addons/source-files/runtime/pom.xml
@@ -86,8 +86,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.quarkus.resteasy.reactive</groupId>
- <artifactId>resteasy-reactive</artifactId>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-rest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/kogito-quarkus/addons/tracing-decision/deployment/pom.xml
b/kogito-quarkus/addons/tracing-decision/deployment/pom.xml
index 2008d25cb5d..88188935703 100644
--- a/kogito-quarkus/addons/tracing-decision/deployment/pom.xml
+++ b/kogito-quarkus/addons/tracing-decision/deployment/pom.xml
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
+ <artifactId>quarkus-rest-jackson-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/kogito-quarkus/addons/tracing-decision/integration-tests/pom.xml
b/kogito-quarkus/addons/tracing-decision/integration-tests/pom.xml
index a64cdf1d6aa..8a5d3c37c4f 100644
--- a/kogito-quarkus/addons/tracing-decision/integration-tests/pom.xml
+++ b/kogito-quarkus/addons/tracing-decision/integration-tests/pom.xml
@@ -38,11 +38,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
diff --git a/kogito-quarkus/addons/tracing-decision/runtime/pom.xml
b/kogito-quarkus/addons/tracing-decision/runtime/pom.xml
index 5138ba98860..a2c5aecc924 100644
--- a/kogito-quarkus/addons/tracing-decision/runtime/pom.xml
+++ b/kogito-quarkus/addons/tracing-decision/runtime/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml
index 5ff771c6f4e..d62ff954016 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test-hot-reload/pom.xml
@@ -45,11 +45,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- this is used implicitly by hot reload tests so let's make Maven
aware of it -->
<dependency>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml
index 47c410c1fc3..58f21fb5002 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/pom.xml
@@ -45,11 +45,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
b/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
index 25d5c9e80cf..2f3de5d189a 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
+++
b/kogito-quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
@@ -53,7 +53,7 @@ public class KogitoDMNCodeCodestartIT {
@RegisterExtension
public static QuarkusCodestartTest codestartTest =
QuarkusCodestartTest.builder()
.setupStandaloneExtensionTest("org.drools:drools-quarkus-decisions")
-
.extension(ArtifactKey.fromString("io.quarkus:quarkus-resteasy-jackson")) //
account for KOGITO-5817
+
.extension(ArtifactKey.fromString("io.quarkus:quarkus-rest-jackson")) //
account for KOGITO-5817
.extension(ArtifactCoords.fromString("org.assertj:assertj-core:" +
assertjVersion()))
.putData(QuarkusDataKey.APP_CONFIG,
Map.of("quarkus.http.test-port", "0"))
.languages(JAVA)
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
b/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
index 58bbf698285..2f60f0e9884 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
+++
b/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.common.deployment;
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 (quarkus-rest) and RestEasy Jackson
(quarkus-rest-jackson) extensions or " +
"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" +
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
index 9de10bb1297..b34bbb70e8d 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
<scope>provided</scope>
</dependency>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml
index 27408784164..baf00a2f767 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/pom.xml
@@ -61,11 +61,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/pom.xml
index 671b65db7d2..d33be4a9649 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/pom.xml
@@ -44,11 +44,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/pom.xml
index e623fec07a4..7412a31fa0b 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/pom.xml
@@ -44,11 +44,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml
index e06d5b25fdb..a00c27e41d8 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/pom.xml
@@ -46,11 +46,11 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git a/kogito-quarkus/extensions/kogito-quarkus-incubation-common/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-incubation-common/pom.xml
index 7e9dd7369ab..daa8bb04784 100644
--- a/kogito-quarkus/extensions/kogito-quarkus-incubation-common/pom.xml
+++ b/kogito-quarkus/extensions/kogito-quarkus-incubation-common/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml
index a2fbf1038a3..521d7efd41c 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml
@@ -49,11 +49,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml
index 4bcf61c16ea..04d3f2d20a4 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/pom.xml
@@ -50,11 +50,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml
index 131087de27d..399de2242da 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/pom.xml
@@ -53,11 +53,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml
index b6e19232a88..29bcdd91421 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test-hot-reload/pom.xml
@@ -49,11 +49,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- this is used implicitly by hot reload tests so let's make Maven
aware of it -->
<dependency>
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml
b/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml
index 969f74a53f2..e128582b818 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml
+++
b/kogito-quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/pom.xml
@@ -48,11 +48,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
index 8b42b341dd3..d38ee23b379 100644
--- a/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
+++ b/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
@@ -47,11 +47,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml
index 1e5f1e98d00..de7c6a6090b 100644
---
a/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/pom.xml
@@ -49,11 +49,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml
index 83a94593c1c..97c49cb82f4 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-decisions/pom.xml
@@ -44,11 +44,11 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml
index b0ec5edc9aa..ae342fe6c05 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-legacy-rules/pom.xml
@@ -47,11 +47,11 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml
index 7fd6d737b40..b2633091f06 100644
--- a/kogito-quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml
+++ b/kogito-quarkus/integration-tests/integration-tests-quarkus-norest/pom.xml
@@ -47,11 +47,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
index 3daef954eb6..f56e8a57491 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
@@ -42,11 +42,11 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml
index 9cd4841e379..b11e2634bf9 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/pom.xml
@@ -43,11 +43,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
index 6c988f335ad..ae71f44dd8c 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
@@ -78,11 +78,6 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>json-schema-validator</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/src/test/java/org/kie/kogito/integrationtests/quarkus/reactive/ProcessIT.java
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/src/test/java/org/kie/kogito/integrationtests/quarkus/reactive/ProcessIT.java
index 45f2cabfdc0..54d3d14c2c7 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/src/test/java/org/kie/kogito/integrationtests/quarkus/reactive/ProcessIT.java
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes-reactive/src/test/java/org/kie/kogito/integrationtests/quarkus/reactive/ProcessIT.java
@@ -30,9 +30,9 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import static io.restassured.RestAssured.given;
-import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchema;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.kie.kogito.test.utils.JsonSchemaMatchers.matchesJsonSchema;
@QuarkusIntegrationTest
public class ProcessIT {
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
index 2a863be19e9..915743d2717 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
@@ -71,11 +71,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -108,11 +108,6 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>json-schema-validator</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-quarkus-test-utils</artifactId>
@@ -228,16 +223,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy.microprofile</groupId>
- <artifactId>microprofile-config</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>jakarta.authorization</groupId>
<artifactId>jakarta.authorization-api</artifactId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/ProcessIT.java
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/ProcessIT.java
index bc1f768781a..e093f953109 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/ProcessIT.java
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/ProcessIT.java
@@ -30,9 +30,9 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import static io.restassured.RestAssured.given;
-import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchema;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.kie.kogito.test.utils.JsonSchemaMatchers.matchesJsonSchema;
@QuarkusIntegrationTest
public class ProcessIT {
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
index a84c5845918..f4f09ebe494 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
@@ -42,11 +42,11 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import static io.restassured.RestAssured.given;
-import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchema;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.kie.kogito.test.utils.JsonSchemaMatchers.matchesJsonSchema;
@QuarkusIntegrationTest
class TaskIT {
diff --git
a/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
b/kogito-quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/main/java/org/jboss/resteasy/plugins/providers/jackson/PatchMethodFilter.java
similarity index 52%
copy from
kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
copy to
kogito-quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/main/java/org/jboss/resteasy/plugins/providers/jackson/PatchMethodFilter.java
index 58bbf698285..cc1eb0b0836 100644
---
a/kogito-quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/MissingRestCapabilityException.java
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/main/java/org/jboss/resteasy/plugins/providers/jackson/PatchMethodFilter.java
@@ -16,15 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.kie.kogito.quarkus.common.deployment;
+package org.jboss.resteasy.plugins.providers.jackson;
-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-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` ");
+import jakarta.annotation.Priority;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.ext.Provider;
+
+/**
+ * No-op replacement of RESTEasy's PatchMethodFilter. The original has a hard
bytecode dependency on
+ * com.github.java-json-tools:json-patch, which is excluded from the classpath
because of an unaddressed
+ * vulnerability (see kie-parent). PATCH support is not used by this
application.
+ */
+@Provider
+@Priority(Integer.MAX_VALUE)
+public class PatchMethodFilter implements ContainerRequestFilter {
+
+ @Override
+ public void filter(ContainerRequestContext requestContext) {
+ // intentionally empty
}
}
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml
index 19b2a13ccf2..2f532b6ed24 100644
--- a/kogito-quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml
+++ b/kogito-quarkus/integration-tests/integration-tests-quarkus-rules/pom.xml
@@ -47,11 +47,11 @@
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
index 673f894fdaf..477e6deec94 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
@@ -49,11 +49,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<!-- Test -->
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-transactions/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-transactions/pom.xml
index 23ad13902bc..4a0d3e06a72 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-transactions/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-transactions/pom.xml
@@ -68,11 +68,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
@@ -159,4 +159,3 @@
</profile>
</profiles>
</project>
-
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-usertask-listeners-rollback/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-usertask-listeners-rollback/pom.xml
index 6ab47014139..f5cb5e53b7e 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-usertask-listeners-rollback/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-usertask-listeners-rollback/pom.xml
@@ -36,11 +36,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-usertasks/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-usertasks/pom.xml
index 82fd9546f22..73f9c5cd0b2 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-usertasks/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-usertasks/pom.xml
@@ -36,11 +36,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
diff --git
a/kogito-quarkus/integration-tests/integration-tests-quarkus-wshumantasks/pom.xml
b/kogito-quarkus/integration-tests/integration-tests-quarkus-wshumantasks/pom.xml
index e286bec396e..e4f919ea4d0 100644
---
a/kogito-quarkus/integration-tests/integration-tests-quarkus-wshumantasks/pom.xml
+++
b/kogito-quarkus/integration-tests/integration-tests-quarkus-wshumantasks/pom.xml
@@ -36,11 +36,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.jbpm</groupId>
diff --git
a/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
b/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
index 5cbd56f9c24..855a8f50fef 100644
---
a/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
+++
b/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/pom.xml
@@ -88,17 +88,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>json-schema-validator</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jspecify</groupId>
- <artifactId>jspecify</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>io.rest-assured</groupId>
diff --git
a/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
b/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
index 08122e3d34e..db2d3462153 100644
---
a/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
+++
b/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
@@ -31,9 +31,9 @@ import
org.springframework.test.context.junit.jupiter.SpringExtension;
import io.restassured.http.ContentType;
import static io.restassured.RestAssured.given;
-import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchema;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
+import static org.kie.kogito.test.utils.JsonSchemaMatchers.matchesJsonSchema;
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = KogitoSpringbootApplication.class)
diff --git
a/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
b/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
index 51129c4bfb9..60c1f37710c 100644
---
a/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
+++
b/kogito-springboot/integration-tests/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
@@ -49,11 +49,11 @@ import
com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
import io.restassured.http.ContentType;
import static io.restassured.RestAssured.given;
-import static
io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchemaInClasspath;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static
org.kie.kogito.test.utils.JsonSchemaMatchers.matchesJsonSchemaInClasspath;
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = KogitoSpringbootApplication.class)
diff --git a/kogito-test-utils/pom.xml b/kogito-test-utils/pom.xml
index 4d0a69910ee..31f64ffd26d 100644
--- a/kogito-test-utils/pom.xml
+++ b/kogito-test-utils/pom.xml
@@ -143,6 +143,11 @@
<artifactId>jackson-databind</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.networknt</groupId>
+ <artifactId>json-schema-validator</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git
a/kogito-test-utils/src/main/java/org/kie/kogito/test/utils/JsonSchemaMatchers.java
b/kogito-test-utils/src/main/java/org/kie/kogito/test/utils/JsonSchemaMatchers.java
new file mode 100644
index 00000000000..4e879b003f3
--- /dev/null
+++
b/kogito-test-utils/src/main/java/org/kie/kogito/test/utils/JsonSchemaMatchers.java
@@ -0,0 +1,102 @@
+/*
+ * 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.test.utils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.util.Set;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.networknt.schema.JsonSchema;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SpecVersion;
+import com.networknt.schema.ValidationMessage;
+
+/**
+ * Hamcrest matchers validating a JSON document against a JSON Schema (draft
2019-09).
+ * <p>
+ * Replacement for {@code io.restassured.module.jsv.JsonSchemaValidator},
which depends on the
+ * {@code com.github.java-json-tools} libraries (jackson-coreutils,
json-patch) affected by unresolved CVEs.
+ */
+public final class JsonSchemaMatchers {
+
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+
+ private JsonSchemaMatchers() {
+ }
+
+ /**
+ * Matches a JSON string that is valid against the schema read from the
given stream.
+ * Reading the schema from a stream (instead of a URI) also works for the
{@code quarkus://} class loader scheme.
+ */
+ public static Matcher<String> matchesJsonSchema(InputStream schema) {
+ return new
JsonSchemaMatcher(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909).getSchema(schema));
+ }
+
+ /**
+ * Matches a JSON string that is valid against the schema found in the
classpath at the given location.
+ */
+ public static Matcher<String> matchesJsonSchemaInClasspath(String
classpathResource) {
+ try (InputStream schema =
Thread.currentThread().getContextClassLoader().getResourceAsStream(classpathResource))
{
+ if (schema == null) {
+ throw new IllegalArgumentException("JSON schema not found in
classpath: " + classpathResource);
+ }
+ return matchesJsonSchema(schema);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+ private static final class JsonSchemaMatcher extends
TypeSafeMatcher<String> {
+
+ private final JsonSchema schema;
+
+ private JsonSchemaMatcher(JsonSchema schema) {
+ this.schema = schema;
+ }
+
+ @Override
+ protected boolean matchesSafely(String json) {
+ return validate(json).isEmpty();
+ }
+
+ @Override
+ protected void describeMismatchSafely(String json, Description
mismatchDescription) {
+ mismatchDescription.appendText("JSON does not match the schema:
").appendValueList("", "; ", "", validate(json));
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("a JSON document valid against the JSON
schema");
+ }
+
+ private Set<ValidationMessage> validate(String json) {
+ try {
+ return schema.validate(MAPPER.readTree(json));
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+ }
+}
diff --git
a/kogito-test-utils/src/test/java/org/kie/kogito/test/utils/JsonSchemaMatchersTest.java
b/kogito-test-utils/src/test/java/org/kie/kogito/test/utils/JsonSchemaMatchersTest.java
new file mode 100644
index 00000000000..c25e8b6fe18
--- /dev/null
+++
b/kogito-test-utils/src/test/java/org/kie/kogito/test/utils/JsonSchemaMatchersTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.test.utils;
+
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.kie.kogito.test.utils.JsonSchemaMatchers.matchesJsonSchema;
+
+class JsonSchemaMatchersTest {
+
+ private static final String SCHEMA = """
+ {
+ "$schema": "https://json-schema.org/draft/2019-09/schema";,
+ "type": "object",
+ "properties": { "name": { "type": "string" } },
+ "required": ["name"]
+ }
+ """;
+
+ private static Matcher<String> matcher() {
+ return matchesJsonSchema(new
ByteArrayInputStream(SCHEMA.getBytes(StandardCharsets.UTF_8)));
+ }
+
+ @Test
+ void validDocumentMatches() {
+ assertThat(matcher().matches("{\"name\":\"pepe\"}")).isTrue();
+ }
+
+ @Test
+ void invalidDocumentDoesNotMatch() {
+ assertThat(matcher().matches("{\"name\":1}")).isFalse();
+ assertThat(matcher().matches("{}")).isFalse();
+ }
+}
diff --git a/kogito-trusty/trusty-service/trusty-service-common/pom.xml
b/kogito-trusty/trusty-service/trusty-service-common/pom.xml
index da5b832b59b..ae52d49715e 100644
--- a/kogito-trusty/trusty-service/trusty-service-common/pom.xml
+++ b/kogito-trusty/trusty-service/trusty-service-common/pom.xml
@@ -41,11 +41,11 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
b/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
index a0c2d037f8d..1124ad343a0 100644
---
a/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
+++
b/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
@@ -27,7 +27,6 @@ import
org.eclipse.microprofile.openapi.annotations.media.Schema;
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
import org.kie.kogito.trusty.service.common.TrustyService;
import org.kie.kogito.trusty.service.common.responses.ExecutionHeaderResponse;
import org.kie.kogito.trusty.service.common.responses.ResponseUtils;
@@ -40,6 +39,7 @@ import
org.kie.kogito.trusty.storage.api.model.decision.DecisionOutcome;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
diff --git
a/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
b/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
index 18fdd01d652..87695934624 100644
---
a/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
+++
b/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
@@ -36,8 +36,6 @@ import
org.eclipse.microprofile.openapi.annotations.media.Schema;
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
-import org.jboss.resteasy.annotations.jaxrs.QueryParam;
import org.kie.kogito.trusty.service.common.TrustyService;
import org.kie.kogito.trusty.service.common.models.MatchedExecutionHeaders;
import org.kie.kogito.trusty.service.common.responses.ExecutionHeaderResponse;
@@ -53,7 +51,9 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
diff --git
a/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
b/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
index abe3542ec0e..e5378e84475 100644
---
a/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
+++
b/kogito-trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
@@ -29,7 +29,6 @@ import
org.eclipse.microprofile.openapi.annotations.media.Schema;
import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
-import org.jboss.resteasy.annotations.jaxrs.PathParam;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
import org.kie.kogito.explainability.api.CounterfactualSearchDomain;
@@ -47,6 +46,7 @@ import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
index 55810f19cf0..ccb54bae7b5 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/deployment/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-deployment</artifactId>
+ <artifactId>quarkus-rest-deployment</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
index fc744d52b45..60b3e0dc834 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus-benchmark/integration-test/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
index 4bde922ab3e..8efca0ef32e 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus-jackson/integration-test/pom.xml
@@ -45,11 +45,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
+ <artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
index 0a2187ecabd..b631c503c62 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus-jsonb/integration-test/pom.xml
@@ -45,11 +45,11 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jsonb</artifactId>
+ <artifactId>quarkus-rest-jsonb</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
index 2f5235a0e8e..8a3f85862d0 100644
--- a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
+++ b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/pom.xml
@@ -62,7 +62,12 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-deployment</artifactId>
+ <artifactId>quarkus-rest</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-rest-jackson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
index ba1a90a37e2..a6757cc9c68 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus/deployment/src/test/java/org/optaplanner/quarkus/OptaPlannerProcessorOverridePropertiesAtRuntimeTest.java
@@ -61,7 +61,7 @@ class OptaPlannerProcessorOverridePropertiesAtRuntimeTest {
@RegisterExtension
static final QuarkusProdModeTest config = new QuarkusProdModeTest()
- .setForcedDependencies(List.of(Dependency.of("io.quarkus",
"quarkus-resteasy", QUARKUS_VERSION)))
+ .setForcedDependencies(List.of(Dependency.of("io.quarkus",
"quarkus-rest", QUARKUS_VERSION)))
// We want to check if these are overridden at runtime
.overrideConfigKey("quarkus.optaplanner.solver.termination.best-score-limit",
"0")
.overrideConfigKey("quarkus.optaplanner.solver.move-thread-count",
"4")
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
index ab02bbc7e5f..fb1d80ff9bb 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus/devui-integration-test/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
index ad38e3b1248..44cf48726fb 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus/drl-integration-test/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
index 6ed84c57687..d5222040fb3 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus/integration-test/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
diff --git
a/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
b/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
index 841001a16ed..b64496507e2 100644
---
a/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
+++
b/optaplanner-quarkus-integration/optaplanner-quarkus/reflection-integration-test/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
+ <artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>org.optaplanner</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
