You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ma...@apache.org on 2023/12/14 15:50:52 UTC
(incubator-kie-kogito-apps) 02/12: [Quarkus 3] Updated rewrite data
This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch q3lts
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
commit f439facf825b208647b1971774c5acf0105277e2
Author: Pere Fernández <pe...@users.noreply.github.com>
AuthorDate: Thu Nov 30 10:23:11 2023 +0100
[Quarkus 3] Updated rewrite data
---
.../quarkus-3/patches/0001_before_sh.patch | 1971 +++++++++++---------
.ci/environments/quarkus-3/quarkus3.yml | 37 +-
2 files changed, 1088 insertions(+), 920 deletions(-)
diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
index 2133542e0..226757e51 100644
--- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch
+++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
@@ -1,8 +1,8 @@
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
-index a2f165965..913483b15 100644
+index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-embedded/src/main/java/org/kie/kogito/HelloService.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
@@ -12,10 +12,10 @@ index a2f165965..913483b15 100644
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
-index b42d5fa5e..e66564255 100644
+index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-knative-eventing/src/main/java/org/kie/kogito/HelloService.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
@@ -25,10 +25,10 @@ index b42d5fa5e..e66564255 100644
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
-index 065d0dcfc..92feddee9 100644
+index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-management/src/main/java/org/kie/kogito/HelloService.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
@@ -38,10 +38,10 @@ index 065d0dcfc..92feddee9 100644
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
-index 065d0dcfc..92feddee9 100644
+index 6363355d0..1e721ddd3 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-quarkus/integration-tests-jobs-service-quarkus-messaging/src/main/java/org/kie/kogito/HelloService.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito;
@@ -51,10 +51,10 @@ index 065d0dcfc..92feddee9 100644
@ApplicationScoped
public class HelloService extends AbstractHelloService {
diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
-index ecce9235e..c9675ba78 100644
+index 155e810a6..d172b044d 100644
--- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
+++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-quarkus/src/test/java/org/kie/kogito/it/trusty/NativeQuarkusTrustyExplainabilityEnd2EndIT.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.it.trusty;
+@@ -21,9 +21,9 @@ package org.kie.kogito.it.trusty;
import org.junit.jupiter.api.Disabled;
import org.kie.kogito.testcontainers.QuarkusKogitoServiceContainer;
@@ -66,11 +66,156 @@ index ecce9235e..c9675ba78 100644
@Disabled("https://issues.redhat.com/browse/FAI-748")
public class NativeQuarkusTrustyExplainabilityEnd2EndIT extends AbstractTrustyExplainabilityEnd2EndIT {
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
+index 11291f6ae..1b06a30b0 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeCommonClient.java
+@@ -25,8 +25,8 @@ import java.util.Map;
+ import java.util.Optional;
+ import java.util.concurrent.CompletableFuture;
+
+-import javax.enterprise.context.ApplicationScoped;
+-import javax.inject.Inject;
++import jakarta.enterprise.context.ApplicationScoped;
++import jakarta.inject.Inject;
+
+ import org.eclipse.microprofile.config.inject.ConfigProperty;
+ import org.kie.kogito.index.model.Job;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
+index d74df65ca..ccf7c4729 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceErrorDataEventMerger.java
+@@ -18,7 +18,7 @@
+ */
+ package org.kie.kogito.index.event.mapper;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+ import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
+index 1d1eeea8a..d271a9070 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceNodeDataEventMerger.java
+@@ -23,7 +23,7 @@ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Optional;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+ import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
+index 87c9e2d27..1c64d13bd 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceStateDataEventMerger.java
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.event.mapper;
+
+ import java.util.Set;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+ import org.kie.kogito.event.process.ProcessInstanceStateDataEvent;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
+index 8a695a484..bcdcf315e 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/ProcessInstanceVariableDataEventMerger.java
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.event.mapper;
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+ import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
+index bbf66d19f..a9ea5620d 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAssignmentDataEventMerger.java
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.event.mapper;
+
+ import java.util.HashSet;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentEventBody;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
+index 018c67d96..796b35abc 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceAttachmentDataEventMerger.java
+@@ -22,7 +22,7 @@ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Optional;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentEventBody;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
+index de2191fa5..113a1551b 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceCommentDataEventMerger.java
+@@ -22,7 +22,7 @@ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Optional;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.usertask.UserTaskInstanceCommentDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceCommentEventBody;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
+index eb858e9ec..b36730e48 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceDeadlineDataEventMerger.java
+@@ -18,7 +18,7 @@
+ */
+ package org.kie.kogito.index.event.mapper;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
+index 9429c8707..86e704b26 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceStateEventMerger.java
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.event.mapper;
+
+ import java.net.URI;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
+diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
+index e8aad2e9c..0566b70c5 100644
+--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
++++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/event/mapper/UserTaskInstanceVariableDataEventMerger.java
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.event.mapper;
+ import java.util.HashMap;
+ import java.util.Map;
+
+-import javax.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.context.ApplicationScoped;
+
+ import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
-index 998101ea6..1a65df37a 100644
+index cbe2a79ae..cbf058b55 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/ObjectMapperProducer.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.json;
@@ -80,25 +225,27 @@ index 998101ea6..1a65df37a 100644
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
-index ce929cfa9..e8ef5765e 100644
+index 722958a69..625be7422 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.index.service;
-
- import java.util.List;
+@@ -26,9 +26,9 @@ import java.util.List;
+ import java.util.Map;
+ import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
+-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
- import org.kie.kogito.index.model.Job;
- import org.kie.kogito.index.model.NodeInstance;
+ import org.eclipse.microprofile.faulttolerance.Retry;
+ import org.kie.kogito.event.process.ProcessInstanceDataEvent;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
-index 0ed221d5d..3950109d2 100644
+index e6a97e630..6bf9a3538 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java
-@@ -25,8 +25,7 @@ import java.util.Objects;
+@@ -28,8 +28,7 @@ import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@@ -108,19 +255,19 @@ index 0ed221d5d..3950109d2 100644
import org.kie.kogito.index.api.KogitoRuntimeClient;
import org.kie.kogito.index.graphql.query.GraphQLQueryOrderByParser;
-@@ -49,6 +48,7 @@ import graphql.schema.GraphQLScalarType;
+@@ -53,6 +52,7 @@ import graphql.schema.GraphQLScalarType;
import graphql.schema.GraphQLSchema;
import graphql.schema.idl.SchemaParser;
import graphql.schema.idl.TypeDefinitionRegistry;
+import jakarta.annotation.PostConstruct;
+ import static java.lang.String.format;
import static java.util.Collections.singletonList;
- import static org.kie.kogito.persistence.api.query.QueryFilterFactory.equalTo;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
-index 6db75dc9b..3fdc95d03 100644
+index b1c09be8c..e114411d4 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java
-@@ -23,7 +23,7 @@ import java.time.ZonedDateTime;
+@@ -25,7 +25,7 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
@@ -130,10 +277,10 @@ index 6db75dc9b..3fdc95d03 100644
import org.kie.kogito.index.DateTimeUtils;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
-index 9c23020dd..1cf3e7988 100644
+index d1d427515..2803e95b8 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLInstrumentation.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.graphql;
@@ -145,10 +292,10 @@ index 9c23020dd..1cf3e7988 100644
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
-index b375c9852..0b47d6699 100644
+index baaf75cbb..07a134f6a 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.graphql;
@@ -162,10 +309,10 @@ index b375c9852..0b47d6699 100644
import graphql.GraphQL;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
-index abcdc8525..d061122f1 100644
+index 3d4ef5377..d1f7393af 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/GraphQLScalarTypeProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.graphql;
@@ -179,10 +326,10 @@ index abcdc8525..d061122f1 100644
import graphql.schema.GraphQLScalarType;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
-index 10e1e44da..a310e924f 100644
+index c8dad3201..1efe23e68 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/OracleDateTimeCoercing.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.graphql;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.graphql;
import java.time.ZonedDateTime;
@@ -192,10 +339,10 @@ index 10e1e44da..a310e924f 100644
import io.quarkus.arc.properties.IfBuildProperty;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
-index 2fa0e148d..c7e3ebaf8 100644
+index 4c12f8458..e9d474a9e 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/PostgreSqlDateTimeCoercing.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.graphql;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.graphql;
import java.time.ZonedDateTime;
@@ -205,10 +352,10 @@ index 2fa0e148d..c7e3ebaf8 100644
import io.quarkus.arc.properties.IfBuildProperty;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
-index 3008c56ae..fa5d6a83f 100644
+index 762a69d7b..a71fbe802 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/BlockingGraphqlRouterProducer.java
-@@ -15,9 +15,8 @@
+@@ -18,9 +18,8 @@
*/
package org.kie.kogito.index.vertx;
@@ -220,7 +367,7 @@ index 3008c56ae..fa5d6a83f 100644
import io.quarkus.arc.properties.IfBuildProperty;
import io.quarkus.vertx.web.Route;
-@@ -25,7 +24,7 @@ import io.vertx.ext.web.RoutingContext;
+@@ -28,7 +27,7 @@ import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.graphql.ApolloWSHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandlerOptions;
@@ -230,10 +377,10 @@ index 3008c56ae..fa5d6a83f 100644
import static io.quarkus.vertx.web.Route.HttpMethod.GET;
diff --git a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
-index f4c030201..182fb2e3c 100644
+index 6707ec910..e92585353 100644
--- a/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
+++ b/data-index/data-index-graphql/src/main/java/org/kie/kogito/index/vertx/ReactiveGraphqlRouterProducer.java
-@@ -15,9 +15,8 @@
+@@ -18,9 +18,8 @@
*/
package org.kie.kogito.index.vertx;
@@ -245,7 +392,7 @@ index f4c030201..182fb2e3c 100644
import io.quarkus.arc.properties.UnlessBuildProperty;
import io.quarkus.vertx.web.Route;
-@@ -25,7 +24,7 @@ import io.vertx.ext.web.RoutingContext;
+@@ -28,7 +27,7 @@ import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.graphql.ApolloWSHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandler;
import io.vertx.ext.web.handler.graphql.GraphQLHandlerOptions;
@@ -255,28 +402,26 @@ index f4c030201..182fb2e3c 100644
import static io.quarkus.vertx.web.Route.HttpMethod.GET;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
-index 4ac42ab22..684f87d44 100644
+index ebaf891ad..1d4bbc355 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
-@@ -23,9 +23,9 @@ import java.util.Map;
- import java.util.Optional;
+@@ -22,8 +22,8 @@ import java.util.List;
+ import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.enterprise.context.ApplicationScoped;
--import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
-+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
- import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.index.api.KogitoRuntimeClient;
+ import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
-index c27bf657c..837d0d6fd 100644
+index b6cd7a755..c56c1efcf 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/auth/MultiTenantResolver.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.service.auth;
-import javax.enterprise.context.ApplicationScoped;
@@ -287,10 +432,10 @@ index c27bf657c..837d0d6fd 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
-index 25ee8cade..e0c7a7934 100644
+index 5d20283f9..abedee5eb 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLProtoSchemaMapper.java
-@@ -21,9 +21,9 @@ import java.util.Map;
+@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -304,26 +449,32 @@ index 25ee8cade..e0c7a7934 100644
import org.kie.kogito.index.graphql.GraphQLObjectTypeMapper;
import org.kie.kogito.index.graphql.query.GraphQLInputObjectTypeMapper;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
-index fac7f0621..a702c2057 100644
+index 9a5aec671..3738fca0e 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/graphql/GraphQLSchemaManagerImpl.java
-@@ -22,9 +22,9 @@ import java.util.Optional;
- import java.util.concurrent.CompletableFuture;
+@@ -24,8 +24,7 @@ import java.util.List;
+ import java.util.Optional;
import java.util.function.Supplier;
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
-+import jakarta.annotation.PostConstruct;
import org.kie.kogito.index.graphql.AbstractGraphQLSchemaManager;
import org.kie.kogito.index.graphql.query.GraphQLQueryParserRegistry;
- import org.kie.kogito.index.json.DataIndexParsingException;
+@@ -33,6 +32,7 @@ import org.kie.kogito.index.json.DataIndexParsingException;
+ import org.kie.kogito.index.model.ProcessInstanceState;
+ import org.kie.kogito.index.service.DataIndexServiceException;
+ import org.kie.kogito.persistence.api.Storage;
++import jakarta.annotation.PostConstruct;
+ import org.reactivestreams.Publisher;
+
+ import com.fasterxml.jackson.databind.JsonNode;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
-index ab2c22960..11027f70d 100644
+index c6c008e53..ac441e3d3 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/BlockingMessagingEventConsumer.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
*/
package org.kie.kogito.index.service.messaging;
@@ -339,11 +490,11 @@ index ab2c22960..11027f70d 100644
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.DataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
-index 16be6bcff..da659d46e 100644
+index 39bfb2574..ddb0d4fd6 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/DomainEventConsumer.java
-@@ -16,9 +16,9 @@
-
+@@ -18,9 +18,9 @@
+ */
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
@@ -356,12 +507,12 @@ index 16be6bcff..da659d46e 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.event.DataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
-index e75147bab..3603a7e60 100644
+index c848e2a5c..467b10445 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.service.messaging;
- import java.io.IOException;
+@@ -22,8 +22,8 @@ import java.io.IOException;
import java.lang.reflect.Type;
+ import java.util.function.Supplier;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
@@ -369,12 +520,12 @@ index e75147bab..3603a7e60 100644
+import jakarta.inject.Inject;
import org.eclipse.microprofile.reactive.messaging.Message;
- import org.kie.kogito.event.process.ProcessInstanceDataEvent;
+ import org.kie.kogito.event.AbstractDataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
-index c86ff6036..e9d5e6476 100644
+index fc5d30695..a93ec262f 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.service.messaging;
@@ -388,10 +539,10 @@ index c86ff6036..e9d5e6476 100644
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.DataEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
-index a1cff2fac..8306e3279 100644
+index a18e6a8bf..0ec38acde 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/vertx/VertxRouterSetup.java
-@@ -17,9 +17,9 @@ package org.kie.kogito.index.service.vertx;
+@@ -20,9 +20,9 @@ package org.kie.kogito.index.service.vertx;
import java.util.Optional;
@@ -405,23 +556,23 @@ index a1cff2fac..8306e3279 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
-index 20fcc7b6f..0ad467ae9 100644
+index 8ef52ccc6..c950e5659 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractDomainIndexingServiceIT.java
-@@ -22,7 +22,7 @@ import java.util.Map;
+@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
- import org.apache.groovy.util.Maps;
import org.junit.jupiter.api.AfterEach;
+ import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
-index b40ae732d..cc55dc3a7 100644
+index f0aad8dec..a32ddb76f 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingIT.java
-@@ -15,15 +15,14 @@
+@@ -18,15 +18,14 @@
*/
package org.kie.kogito.index.service;
@@ -432,7 +583,7 @@ index b40ae732d..cc55dc3a7 100644
+import jakarta.inject.Inject;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
- import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.event.KogitoJobCloudEvent;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
@@ -441,11 +592,11 @@ index b40ae732d..cc55dc3a7 100644
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
-index 67b9621f2..09576f171 100644
+index ef18a7d98..44cc9fff0 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java
-@@ -24,8 +24,8 @@ import java.util.Map;
- import java.util.UUID;
+@@ -30,8 +30,8 @@ import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.IntStream;
-import javax.inject.Inject;
@@ -456,10 +607,10 @@ index 67b9621f2..09576f171 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
-index 563ed1b6f..e904915d2 100644
+index 8fc93d4bf..dd2d66e85 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractQueryIT.java
-@@ -19,7 +19,7 @@ import java.util.Date;
+@@ -22,7 +22,7 @@ import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -469,10 +620,10 @@ index 563ed1b6f..e904915d2 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
-index 482a87f69..b43b3e90a 100644
+index f38c8a9b3..8989e0eac 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/cache/AbstractStorageIT.java
-@@ -19,7 +19,7 @@ import java.util.UUID;
+@@ -22,7 +22,7 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -482,10 +633,10 @@ index 482a87f69..b43b3e90a 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
-index 0f2bf8b60..94c582f2d 100644
+index a577e9858..ed5e3c0a3 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/AbstractWebSocketSubscriptionIT.java
-@@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture;
+@@ -24,7 +24,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -495,10 +646,10 @@ index 0f2bf8b60..94c582f2d 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
-index 710dccaad..79c86b5a5 100644
+index 0dfd09e61..edda090aa 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLQueryOrderByIT.java
-@@ -21,7 +21,7 @@ import java.util.function.Function;
+@@ -24,7 +24,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -508,10 +659,10 @@ index 710dccaad..79c86b5a5 100644
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.service.graphql.GraphQLSchemaManagerImpl;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
-index 3d7a4823a..4986d3eea 100644
+index f9dc10f1e..07ae841a5 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
-@@ -20,7 +20,7 @@ import java.util.List;
+@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -521,10 +672,10 @@ index 3d7a4823a..4986d3eea 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
-index 62d5e7816..ef1025c57 100644
+index 06bbe2dbb..a85eae7f6 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingConsumerIT.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.index.service.messaging;
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.service.messaging;
import java.time.Duration;
import java.util.Collection;
@@ -534,11 +685,11 @@ index 62d5e7816..ef1025c57 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
-index f80c8c2cf..bce3174a1 100644
+index 3dde99da4..46732f9c8 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractDomainMessagingHttpConsumerIT.java
-@@ -16,15 +16,14 @@
-
+@@ -18,15 +18,14 @@
+ */
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.inject.Any;
@@ -548,7 +699,7 @@ index f80c8c2cf..bce3174a1 100644
+import jakarta.inject.Inject;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
- import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.model.ProcessInstanceState;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
@@ -557,10 +708,10 @@ index f80c8c2cf..bce3174a1 100644
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
import static org.kie.kogito.index.test.TestUtils.getProcessCloudEvent;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
-index d9a6e5761..b3a7818cc 100644
+index 9c238c371..ed2ced9c2 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingConsumerIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.service.messaging;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.service.messaging;
import java.time.Duration;
@@ -570,11 +721,11 @@ index d9a6e5761..b3a7818cc 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
-index baeeeb9a5..4bdacbf8b 100644
+index 0f75ba639..80268d3f4 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingHttpConsumerIT.java
-@@ -16,16 +16,15 @@
-
+@@ -18,16 +18,15 @@
+ */
package org.kie.kogito.index.service.messaging;
-import javax.enterprise.inject.Any;
@@ -584,20 +735,20 @@ index baeeeb9a5..4bdacbf8b 100644
+import jakarta.inject.Inject;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
- import org.kie.kogito.event.process.UserTaskInstanceDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.index.event.KogitoJobCloudEvent;
import org.kie.kogito.index.model.ProcessInstanceState;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
-
- import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.*;
- import static org.kie.kogito.index.test.TestUtils.*;
-
+ import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
+ import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
+ import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_USERTASKINSTANCES_EVENTS;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
-index 34b83ea61..673606577 100644
+index fd97ba148..ac4edd255 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/AbstractMessagingLoadKafkaIT.java
-@@ -23,7 +23,7 @@ import java.util.UUID;
+@@ -25,7 +25,7 @@ import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -606,11 +757,24 @@ index 34b83ea61..673606577 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
+diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
+index 764d0efc8..c5916a970 100644
+--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
++++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverterTest.java
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.service.messaging;
+ import java.net.URI;
+ import java.time.OffsetDateTime;
+
+-import javax.ws.rs.core.HttpHeaders;
++import jakarta.ws.rs.core.HttpHeaders;
+
+ import org.eclipse.microprofile.reactive.messaging.Message;
+ import org.eclipse.microprofile.reactive.messaging.Metadata;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
-index d2592c9b4..9706c7e37 100644
+index 3669c0550..81415cdbc 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/messaging/ReactiveMessagingEventConsumerTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.index.service.messaging;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.service.messaging;
import java.util.UUID;
@@ -620,24 +784,25 @@ index d2592c9b4..9706c7e37 100644
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
-index 8ba74733f..c14d09d57 100644
+index dd339669b..495aa4d91 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/test/InMemoryMessagingTestResource.java
-@@ -21,7 +21,7 @@ import java.util.Map;
+@@ -23,7 +23,8 @@ import java.util.Map;
import java.util.stream.Stream;
import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-import io.smallrye.reactive.messaging.providers.connectors.InMemoryConnector;
++
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_JOBS_EVENTS;
import static org.kie.kogito.index.service.messaging.ReactiveMessagingEventConsumer.KOGITO_PROCESSINSTANCES_EVENTS;
diff --git a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
-index c661a01e7..8f16962a6 100644
+index 58f04a1be..2d1352fbd 100644
--- a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
+++ b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageServiceImpl.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -648,10 +813,10 @@ index c661a01e7..8f16962a6 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
-index c190c7353..e5189f5a5 100644
+index b977cc090..95a73b29c 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/InfinispanCacheStartup.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
*/
package org.kie.kogito.index.infinispan;
@@ -666,10 +831,10 @@ index c190c7353..e5189f5a5 100644
import io.quarkus.runtime.Startup;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
-index 61d309809..c0ae6dbbf 100644
+index 5a7bd8876..022292675 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/protostream/ProtostreamProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.infinispan.protostream;
@@ -683,10 +848,10 @@ index 61d309809..c0ae6dbbf 100644
import org.infinispan.protostream.MessageMarshaller;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
-index 5b3f5b287..1061fbc59 100644
+index 030bcd308..caade14ec 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaAcceptor.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.infinispan.schema;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.infinispan.schema;
import java.util.Optional;
@@ -696,10 +861,10 @@ index 5b3f5b287..1061fbc59 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.api.schema.SchemaAcceptor;
diff --git a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
-index 24b7f2ebc..8ac91631a 100644
+index e468429a7..00405ac14 100644
--- a/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
+++ b/data-index/data-index-storage/data-index-storage-infinispan/src/main/java/org/kie/kogito/index/infinispan/schema/ProtoSchemaManager.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.index.infinispan.schema;
+@@ -21,9 +21,9 @@ package org.kie.kogito.index.infinispan.schema;
import java.util.ArrayList;
import java.util.List;
@@ -713,10 +878,15 @@ index 24b7f2ebc..8ac91631a 100644
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.commons.configuration.XMLStringConfiguration;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
-index aab322ab8..efd0a5c04 100644
+index aae8a0de9..ca632a4d4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImpl.java
-@@ -20,11 +20,11 @@ import java.util.Map;
+@@ -18,14 +18,14 @@
+ */
+ package org.kie.kogito.index.mongodb.storage;
+
++import jakarta.annotation.PostConstruct;
+ import java.util.Map;
import java.util.Objects;
import java.util.function.Supplier;
@@ -728,16 +898,14 @@ index aab322ab8..efd0a5c04 100644
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
-+import jakarta.annotation.PostConstruct;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
- import org.kie.kogito.index.model.ProcessInstance;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
-index 22a3c5020..bd36d998e 100644
+index 821db8cb6..d5d1c6b37 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserver.java
-@@ -16,10 +16,10 @@
-
+@@ -18,10 +18,10 @@
+ */
package org.kie.kogito.index.mongodb.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -752,10 +920,10 @@ index 22a3c5020..bd36d998e 100644
import org.kie.kogito.index.storage.DataIndexStorageService;
import org.kie.kogito.persistence.mongodb.index.IndexCreateOrUpdateEvent;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
-index 3e5ebfe7e..2e051d624 100644
+index 58b44ecdb..29f8f383a 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/mock/MockIndexCreateOrUpdateEventListener.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.mongodb.mock;
+@@ -20,8 +20,8 @@ package org.kie.kogito.index.mongodb.mock;
import java.util.List;
@@ -767,10 +935,10 @@ index 3e5ebfe7e..2e051d624 100644
import org.kie.kogito.persistence.mongodb.index.IndexCreateOrUpdateEvent;
import org.mockito.Mockito;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
-index 15f97f852..bab3a3bb4 100644
+index d7b27ffb1..f7aa6ad50 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/DomainQueryIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.mongodb.query;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.query;
import java.util.UUID;
@@ -780,11 +948,11 @@ index 15f97f852..bab3a3bb4 100644
import org.bson.Document;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
-index 0b339b3b7..0026c7bc6 100644
+index 5dce2a361..75cfa5cc1 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/JobQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
@@ -793,11 +961,11 @@ index 0b339b3b7..0026c7bc6 100644
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.Job;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
-index 739e57746..c70a0de42 100644
+index db78b8470..b570feab4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessDefinitionQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
@@ -806,11 +974,11 @@ index 739e57746..c70a0de42 100644
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
-index 41195a849..042ee20d5 100644
+index 1c3330bb1..b3fd19d3d 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessIdQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
@@ -819,11 +987,11 @@ index 41195a849..042ee20d5 100644
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.mongodb.model.ProcessIdEntity;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
-index 59bbfc513..c470234b5 100644
+index e6db6b9af..22b968701 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/ProcessInstanceQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
@@ -832,11 +1000,11 @@ index 59bbfc513..c470234b5 100644
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.ProcessInstance;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
-index acbdb205c..c140a1288 100644
+index e7149a0af..4eba34451 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/query/UserTaskInstanceQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.query;
-import javax.inject.Inject;
@@ -845,10 +1013,10 @@ index acbdb205c..c140a1288 100644
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.index.model.UserTaskInstance;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
-index e836b63f3..a4618674e 100644
+index c31ddfc9a..4d170d136 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/DomainStorageIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.mongodb.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
@@ -858,10 +1026,10 @@ index e836b63f3..a4618674e 100644
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
-index 2d621acd7..076a4bc46 100644
+index 088d6ccfa..d06f876c4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/JobStorageIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.mongodb.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
@@ -871,11 +1039,11 @@ index 2d621acd7..076a4bc46 100644
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
-index b0f15736b..8cb1bc3da 100644
+index 7744351fb..0e68d9fa4 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/MongoModelServiceImplIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.storage;
-import javax.inject.Inject;
@@ -884,37 +1052,37 @@ index b0f15736b..8cb1bc3da 100644
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
-index bdd558f29..eb99bcd86 100644
+index 2c669e5c8..705b74121 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessDefinitionStorageIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.mongodb.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
+ import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
- import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
-index 591a5fa50..0153d534d 100644
+index d19db523e..b39813b30 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIdStorageIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.storage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
+ import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
- import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
-index 3c91dc471..5b9bcb2cb 100644
+index 029734653..f2ae68498 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessIndexObserverIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.mongodb.storage;
-import javax.inject.Inject;
@@ -923,10 +1091,10 @@ index 3c91dc471..5b9bcb2cb 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
-index 41e635b0d..e2f409c7b 100644
+index 04bd7bb6c..42e4e7ef0 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/ProcessInstanceStorageIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.mongodb.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
@@ -936,10 +1104,10 @@ index 41e635b0d..e2f409c7b 100644
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
-index b6b19973f..9207f03f9 100644
+index 3f3b95df0..141226ba2 100644
--- a/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-mongodb/src/test/java/org/kie/kogito/index/mongodb/storage/UserTaskInstanceStorageIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.mongodb.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.mongodb.storage;
import java.util.UUID;
@@ -949,21 +1117,19 @@ index b6b19973f..9207f03f9 100644
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.AfterEach;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
-index 790b2d944..93def8333 100644
+index 81e8fb2f2..b989f88f8 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/AttachmentEntity.java
-@@ -19,13 +19,13 @@ package org.kie.kogito.index.oracle.model;
+@@ -21,12 +21,12 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
--import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
@@ -971,24 +1137,22 @@ index 790b2d944..93def8333 100644
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
- import org.hibernate.annotations.OnDelete;
- import org.hibernate.annotations.OnDeleteAction;
+ @Entity(name = "attachments")
+ @Table(name = "attachments")
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
-index 7b391f0e9..830cb6201 100644
+index 03e06e35b..089393a66 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/CommentEntity.java
-@@ -19,13 +19,13 @@ package org.kie.kogito.index.oracle.model;
+@@ -21,12 +21,12 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
--import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
@@ -996,13 +1160,13 @@ index 7b391f0e9..830cb6201 100644
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
- import org.hibernate.annotations.OnDelete;
- import org.hibernate.annotations.OnDeleteAction;
+ @Entity(name = "comments")
+ @Table(name = "comments")
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
-index a2071050f..9fb1963bd 100644
+index 7082fa32e..a970ad43d 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntity.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.index.oracle.model;
+@@ -21,9 +21,9 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
@@ -1016,11 +1180,11 @@ index a2071050f..9fb1963bd 100644
@Entity(name = "jobs")
@Table(name = "jobs")
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
-index 65efa3b56..4dab97cc5 100644
+index f2ae36f77..3182fcc9e 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/JobEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1029,10 +1193,10 @@ index 65efa3b56..4dab97cc5 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
-index f44999a41..e04018622 100644
+index b943daa6e..ce93b82a3 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/MilestoneEntity.java
-@@ -18,14 +18,14 @@ package org.kie.kogito.index.oracle.model;
+@@ -20,14 +20,14 @@ package org.kie.kogito.index.oracle.model;
import java.util.Objects;
@@ -1056,10 +1220,10 @@ index f44999a41..e04018622 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
-index 8db9a852b..28ba768a2 100644
+index a1807c850..35006acdb 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeEntity.java
-@@ -19,19 +19,19 @@ package org.kie.kogito.index.oracle.model;
+@@ -21,19 +21,19 @@ package org.kie.kogito.index.oracle.model;
import java.util.Map;
import java.util.Objects;
@@ -1093,10 +1257,10 @@ index 8db9a852b..28ba768a2 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
-index 2759fea98..366dcfeff 100644
+index 57650f4e8..fb39316ec 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/NodeInstanceEntity.java
-@@ -19,13 +19,13 @@ package org.kie.kogito.index.oracle.model;
+@@ -21,13 +21,13 @@ package org.kie.kogito.index.oracle.model;
import java.time.ZonedDateTime;
import java.util.Objects;
@@ -1118,10 +1282,10 @@ index 2759fea98..366dcfeff 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
-index 411986e11..74ef15b26 100644
+index 1ceb07e52..8c3d86302 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntity.java
-@@ -20,17 +20,17 @@ import java.util.List;
+@@ -22,17 +22,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -1151,11 +1315,11 @@ index 411986e11..74ef15b26 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
-index 88be8193c..4977378ff 100644
+index f301ca0a0..93b855f3f 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessDefinitionEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1164,10 +1328,10 @@ index 88be8193c..4977378ff 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
-index f8875af09..f477b3a20 100644
+index 65dbfd9f4..a9c041341 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntity.java
-@@ -21,17 +21,17 @@ import java.util.List;
+@@ -23,17 +23,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -1197,11 +1361,11 @@ index f8875af09..f477b3a20 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
-index c4873a558..4ccc4f9d7 100644
+index 5e50438b7..0e0702e09 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1210,10 +1374,10 @@ index c4873a558..4ccc4f9d7 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
-index 6249bb545..c6c3dc7af 100644
+index 894847308..5d51525ea 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/ProcessInstanceErrorEntity.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.oracle.model;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.model;
import java.util.Objects;
@@ -1223,10 +1387,10 @@ index 6249bb545..c6c3dc7af 100644
@Embeddable
public class ProcessInstanceErrorEntity {
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
-index b14d71cff..784048459 100644
+index cad8138f3..98cd6fd26 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntity.java
-@@ -21,16 +21,16 @@ import java.util.List;
+@@ -23,17 +23,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -1235,6 +1399,7 @@ index b14d71cff..784048459 100644
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
+-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
@@ -1245,6 +1410,7 @@ index b14d71cff..784048459 100644
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
++import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
@@ -1254,11 +1420,11 @@ index b14d71cff..784048459 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
-index ed0c35dda..634096498 100644
+index 9a2659f67..5a369e560 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/model/UserTaskInstanceEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1267,24 +1433,28 @@ index ed0c35dda..634096498 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
-index d365088eb..708cc46f9 100644
+index d319ee18c..d1f2479b6 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/AbstractStorage.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.index.oracle.storage;
+@@ -22,9 +22,9 @@ import java.util.ConcurrentModificationException;
import java.util.Map;
import java.util.function.Function;
+-import javax.persistence.LockModeType;
+-import javax.persistence.PersistenceException;
-import javax.transaction.Transactional;
++import jakarta.persistence.LockModeType;
++import jakarta.persistence.PersistenceException;
+import jakarta.transaction.Transactional;
import org.kie.kogito.index.oracle.model.AbstractEntity;
import org.kie.kogito.persistence.api.Storage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
-index c6e1f20bb..1bbc9e400 100644
+index 877abe5f3..ab6dad0ee 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/JobEntityStorage.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -1295,10 +1465,10 @@ index c6e1f20bb..1bbc9e400 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.oracle.mapper.JobEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
-index 1e9d336c6..d848509ae 100644
+index 24beb9672..a663c662b 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleQuery.java
-@@ -19,13 +19,13 @@ import java.util.Collection;
+@@ -22,13 +22,13 @@ import java.util.Collection;
import java.util.List;
import java.util.function.Function;
@@ -1319,7 +1489,7 @@ index 1e9d336c6..d848509ae 100644
import org.hibernate.query.criteria.internal.path.PluralAttributePath;
import org.kie.kogito.index.oracle.model.AbstractEntity;
-@@ -95,7 +95,7 @@ public class OracleQuery<E extends AbstractEntity, T> implements Query<T> {
+@@ -98,7 +98,7 @@ public class OracleQuery<E extends AbstractEntity, T> implements Query<T> {
criteriaQuery.orderBy(orderBy);
}
@@ -1329,10 +1499,10 @@ index 1e9d336c6..d848509ae 100644
if (limit != null) {
query.setMaxResults(limit);
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
-index 3af6c90b3..672206bb4 100644
+index af2056e27..8c1d6dcfa 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/OracleStorageService.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.oracle.storage;
@@ -1344,28 +1514,30 @@ index 3af6c90b3..672206bb4 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
-index 890479188..3baec9aa7 100644
+index 48478e265..e2deddebb 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionEntityStorage.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.index.oracle.storage;
+@@ -20,10 +20,10 @@ package org.kie.kogito.index.oracle.storage;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+-import javax.persistence.LockModeType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
++import jakarta.persistence.LockModeType;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.oracle.mapper.ProcessDefinitionEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
-index eafdce942..47203e5bb 100644
+index 587a76a75..294e31ff3 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/ProcessInstanceEntityStorage.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -1376,11 +1548,11 @@ index eafdce942..47203e5bb 100644
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.oracle.mapper.ProcessInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
-index 9cc2f5077..fef9eca39 100644
+index 50bc2ac5e..87ea6a547 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/main/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceEntityStorage.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.oracle.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -1391,10 +1563,10 @@ index 9cc2f5077..fef9eca39 100644
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.oracle.mapper.UserTaskInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
-index 90a12128c..0a50caeea 100644
+index 61f265918..960c7b577 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/JobEntityMapperIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.oracle.mapper;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.mapper;
import java.time.ZonedDateTime;
@@ -1404,10 +1576,10 @@ index 90a12128c..0a50caeea 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
-index fd6dfc218..1cff20251 100644
+index 669ad5a5d..6f46dda29 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessDefinitionEntityMapperIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.oracle.mapper;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.mapper;
import java.util.Set;
@@ -1417,10 +1589,10 @@ index fd6dfc218..1cff20251 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
-index c0fff697d..dc8ff7ee4 100644
+index c521f56d7..0a8e3fb15 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/ProcessInstanceEntityMapperIT.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.index.oracle.mapper;
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.oracle.mapper;
import java.time.ZonedDateTime;
import java.util.Set;
@@ -1430,10 +1602,10 @@ index c0fff697d..dc8ff7ee4 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
-index edc6e58da..1a7e2b841 100644
+index 7e6cdfebc..800783e58 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/mapper/UserTaskInstanceEntityMapperIT.java
-@@ -21,7 +21,7 @@ import java.util.HashMap;
+@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -1443,11 +1615,11 @@ index edc6e58da..1a7e2b841 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
-index 54905e6d0..fee65f818 100644
+index 1df635219..b909391d0 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/JobEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
@@ -1456,11 +1628,11 @@ index 54905e6d0..fee65f818 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.oracle.storage.JobEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
-index 5829e4260..171656270 100644
+index 5da3effc8..3f0b67305 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessDefinitionEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
@@ -1469,11 +1641,11 @@ index 5829e4260..171656270 100644
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.oracle.storage.ProcessDefinitionEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
-index c9bd0be58..476b9ed9e 100644
+index e174e9361..c168c9418 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/ProcessInstanceEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
@@ -1482,11 +1654,11 @@ index c9bd0be58..476b9ed9e 100644
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.oracle.storage.ProcessInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
-index b357fb130..cd6a1b2a3 100644
+index a3ecedcce..4d9b8eac5 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/query/UserTaskInstanceEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.oracle.query;
-import javax.inject.Inject;
@@ -1495,10 +1667,10 @@ index b357fb130..cd6a1b2a3 100644
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.oracle.storage.UserTaskInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
-index ab4f2d6b5..71f1fb857 100644
+index 46b34dd5c..33b1b6f55 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/DomainQueryTest.java
-@@ -18,14 +18,14 @@ package org.kie.kogito.index.oracle.storage;
+@@ -21,14 +21,14 @@ package org.kie.kogito.index.oracle.storage;
import java.util.List;
import java.util.function.Function;
@@ -1522,70 +1694,62 @@ index ab4f2d6b5..71f1fb857 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
-index 61c53189c..61fec3c9e 100644
+index 70ccd3e3d..c9120a2e2 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/JobStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.oracle.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.UUID;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
- import org.junit.jupiter.api.BeforeEach;
+ import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
-index da331e67c..b995ce074 100644
+index 644bc7a2e..aa2112a3c 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessDefinitionStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.oracle.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.Set;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
+ import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
- import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
-index e5e7c260a..8ee120129 100644
+index 52cdb10a4..bf028a67b 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/ProcessInstanceStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.oracle.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.UUID;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
-index 5369b898c..d3c835771 100644
+index bfeff81a7..7ff6ed545 100644
--- a/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-oracle/src/test/java/org/kie/kogito/index/oracle/storage/UserTaskInstanceStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.oracle.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.oracle.storage;
import java.util.UUID;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
-index a8b3aa7be..7e36ffdd7 100644
+index bbbdd80bd..201ee5ae9 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/main/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImpl.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.index.postgresql.reporting.database;
+@@ -21,9 +21,9 @@ package org.kie.kogito.index.postgresql.reporting.database;
import java.util.Locale;
import java.util.Objects;
@@ -1599,10 +1763,10 @@ index a8b3aa7be..7e36ffdd7 100644
import org.kie.kogito.index.postgresql.model.JobEntityRepository;
import org.kie.kogito.index.postgresql.model.ProcessInstanceEntityRepository;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
-index e5507c04a..7ac49f786 100644
+index 2fac53c23..6c519d138 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/ProcessInstanceVariableMappingIT.java
-@@ -17,14 +17,14 @@ package org.kie.kogito.index.postgresql.reporting;
+@@ -20,14 +20,14 @@ package org.kie.kogito.index.postgresql.reporting;
import java.util.List;
@@ -1626,10 +1790,10 @@ index e5507c04a..7ac49f786 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
-index e8c0baf40..f147c99a6 100644
+index d49e0098d..1ae039145 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql-reporting/src/test/java/org/kie/kogito/index/postgresql/reporting/database/PostgresDataIndexDatabaseManagerImplTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.postgresql.reporting.database;
@@ -1639,21 +1803,19 @@ index e8c0baf40..f147c99a6 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
-index 765cba4f1..e815147fd 100644
+index 5a628288e..0154f4dcb 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/AttachmentEntity.java
-@@ -19,13 +19,13 @@ package org.kie.kogito.index.postgresql.model;
+@@ -21,12 +21,12 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
--import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
@@ -1661,24 +1823,22 @@ index 765cba4f1..e815147fd 100644
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
- import org.hibernate.annotations.OnDelete;
- import org.hibernate.annotations.OnDeleteAction;
+ @Entity(name = "attachments")
+ @Table(name = "attachments")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
-index 9c244e809..6cd9e1599 100644
+index cdce6fdf6..e1cea6931 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/CommentEntity.java
-@@ -19,13 +19,13 @@ package org.kie.kogito.index.postgresql.model;
+@@ -21,12 +21,12 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
--import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
@@ -1686,13 +1846,13 @@ index 9c244e809..6cd9e1599 100644
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
- import org.hibernate.annotations.OnDelete;
- import org.hibernate.annotations.OnDeleteAction;
+ @Entity(name = "comments")
+ @Table(name = "comments")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
-index aa24c7d1a..09213bbe9 100644
+index 5abe45657..106015f72 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntity.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.index.postgresql.model;
+@@ -21,9 +21,9 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
@@ -1706,11 +1866,11 @@ index aa24c7d1a..09213bbe9 100644
@Entity(name = "jobs")
@Table(name = "jobs")
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
-index 8ad87be81..9f26483b6 100644
+index a6539a864..334402f28 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/JobEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1719,10 +1879,10 @@ index 8ad87be81..9f26483b6 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
-index 142e1f349..5c38df5bf 100644
+index 74b97b526..17dbbeb1a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/MilestoneEntity.java
-@@ -18,14 +18,14 @@ package org.kie.kogito.index.postgresql.model;
+@@ -20,14 +20,14 @@ package org.kie.kogito.index.postgresql.model;
import java.util.Objects;
@@ -1746,10 +1906,10 @@ index 142e1f349..5c38df5bf 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
-index c67db1e09..9deb8a5df 100644
+index 33df9215d..7e07a67b0 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeEntity.java
-@@ -19,19 +19,19 @@ package org.kie.kogito.index.postgresql.model;
+@@ -21,19 +21,19 @@ package org.kie.kogito.index.postgresql.model;
import java.util.Map;
import java.util.Objects;
@@ -1783,10 +1943,10 @@ index c67db1e09..9deb8a5df 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
-index 5c85028b8..733dba486 100644
+index d078189ca..06f3a8ba8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/NodeInstanceEntity.java
-@@ -19,13 +19,13 @@ package org.kie.kogito.index.postgresql.model;
+@@ -21,13 +21,13 @@ package org.kie.kogito.index.postgresql.model;
import java.time.ZonedDateTime;
import java.util.Objects;
@@ -1808,10 +1968,10 @@ index 5c85028b8..733dba486 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
-index 3f6714e8c..faaf9169f 100644
+index dff6add60..84548df51 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntity.java
-@@ -20,17 +20,17 @@ import java.util.List;
+@@ -22,17 +22,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -1841,11 +2001,11 @@ index 3f6714e8c..faaf9169f 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
-index 198cd99b2..d7d07ea69 100644
+index 3e938f32f..51735428a 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessDefinitionEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1854,10 +2014,10 @@ index 198cd99b2..d7d07ea69 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
-index 1fb60781d..5c6ce9fbb 100644
+index cbb679946..45ae037ac 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntity.java
-@@ -21,17 +21,17 @@ import java.util.List;
+@@ -23,17 +23,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -1887,11 +2047,11 @@ index 1fb60781d..5c6ce9fbb 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
-index 202b94546..785076c4d 100644
+index fd0be9cb1..9d544616b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1900,10 +2060,10 @@ index 202b94546..785076c4d 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
-index 2658f6f94..fa6d7563d 100644
+index 14b235434..b4dca9fe2 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/ProcessInstanceErrorEntity.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.postgresql.model;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.model;
import java.util.Objects;
@@ -1913,10 +2073,10 @@ index 2658f6f94..fa6d7563d 100644
@Embeddable
public class ProcessInstanceErrorEntity {
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
-index c75798217..2e28ef813 100644
+index 99fbd674e..94f6d5dbd 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntity.java
-@@ -21,16 +21,16 @@ import java.util.List;
+@@ -23,17 +23,17 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -1925,6 +2085,7 @@ index c75798217..2e28ef813 100644
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
+-import javax.persistence.FetchType;
-import javax.persistence.ForeignKey;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
@@ -1935,6 +2096,7 @@ index c75798217..2e28ef813 100644
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
++import jakarta.persistence.FetchType;
+import jakarta.persistence.ForeignKey;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
@@ -1944,11 +2106,11 @@ index c75798217..2e28ef813 100644
import org.hibernate.annotations.OnDelete;
import org.hibernate.annotations.OnDeleteAction;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
-index a36b9f91d..273b2ffdb 100644
+index b5f77f7b2..6a68b42e7 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/model/UserTaskInstanceEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -1957,24 +2119,28 @@ index a36b9f91d..273b2ffdb 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
-index 2118fa991..ce4728140 100644
+index dd4135b02..0bc877b87 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/AbstractStorage.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -22,9 +22,9 @@ import java.util.ConcurrentModificationException;
import java.util.Map;
import java.util.function.Function;
+-import javax.persistence.LockModeType;
+-import javax.persistence.PersistenceException;
-import javax.transaction.Transactional;
++import jakarta.persistence.LockModeType;
++import jakarta.persistence.PersistenceException;
+import jakarta.transaction.Transactional;
import org.kie.kogito.index.postgresql.model.AbstractEntity;
import org.kie.kogito.persistence.api.Storage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
-index 6e5f96f49..dce59ac20 100644
+index a738deb08..bd048e95d 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/JobEntityStorage.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -1985,10 +2151,10 @@ index 6e5f96f49..dce59ac20 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.postgresql.mapper.JobEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
-index 3e6ce9e28..74fd17bd9 100644
+index da5d5dd54..b3d980ec6 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlQuery.java
-@@ -19,13 +19,13 @@ import java.util.Collection;
+@@ -22,13 +22,13 @@ import java.util.Collection;
import java.util.List;
import java.util.function.Function;
@@ -2009,7 +2175,7 @@ index 3e6ce9e28..74fd17bd9 100644
import org.hibernate.query.criteria.internal.path.PluralAttributePath;
import org.kie.kogito.index.postgresql.model.AbstractEntity;
-@@ -95,7 +95,7 @@ public class PostgreSqlQuery<K, E extends AbstractEntity, T> implements Query<T>
+@@ -98,7 +98,7 @@ public class PostgreSqlQuery<K, E extends AbstractEntity, T> implements Query<T>
criteriaQuery.orderBy(orderBy);
}
@@ -2019,10 +2185,10 @@ index 3e6ce9e28..74fd17bd9 100644
if (limit != null) {
query.setMaxResults(limit);
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
-index 05fed4071..e5b4a840f 100644
+index 413e0a2b7..deab75186 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/PostgreSqlStorageService.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.index.postgresql.storage;
@@ -2034,28 +2200,32 @@ index 05fed4071..e5b4a840f 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
-index 2e5eef758..9b3eadb87 100644
+index 38d60c065..aaa6adc55 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionEntityStorage.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -20,11 +20,11 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.Optional;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.persistence.EntityManager;
+-import javax.persistence.LockModeType;
+-import javax.transaction.Transactional;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.persistence.EntityManager;
++import jakarta.persistence.LockModeType;
++import jakarta.transaction.Transactional;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.postgresql.mapper.ProcessDefinitionEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
-index 5b6313f03..204e3b7d4 100644
+index 12e3960b0..c7c14fb45 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceEntityStorage.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -2066,11 +2236,11 @@ index 5b6313f03..204e3b7d4 100644
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.postgresql.mapper.ProcessInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
-index cc1ba8aeb..518e4a5bd 100644
+index ed7281b75..de4b8d82e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceEntityStorage.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.index.postgresql.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -2081,10 +2251,10 @@ index cc1ba8aeb..518e4a5bd 100644
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.postgresql.mapper.UserTaskInstanceEntityMapper;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
-index 0dddb30c0..cfb12c6ad 100644
+index 96a36f757..c717d12dd 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/JobEntityMapperIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.postgresql.mapper;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.mapper;
import java.time.ZonedDateTime;
@@ -2094,10 +2264,10 @@ index 0dddb30c0..cfb12c6ad 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
-index 9f9ce07f4..749ec2390 100644
+index 8fbb3ed04..ec398cf6b 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessDefinitionEntityMapperIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.index.postgresql.mapper;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.mapper;
import java.util.Set;
@@ -2107,10 +2277,10 @@ index 9f9ce07f4..749ec2390 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
-index b76c8823d..7ea76348a 100644
+index 14a7d89b5..2dc951cf8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/ProcessInstanceEntityMapperIT.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.index.postgresql.mapper;
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.postgresql.mapper;
import java.time.ZonedDateTime;
import java.util.Set;
@@ -2120,10 +2290,10 @@ index b76c8823d..7ea76348a 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
-index b991c844f..c18dd0999 100644
+index 9d0a71005..d538c75b1 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/mapper/UserTaskInstanceEntityMapperIT.java
-@@ -21,7 +21,7 @@ import java.util.HashMap;
+@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -2133,11 +2303,11 @@ index b991c844f..c18dd0999 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
-index fc48c8fb0..efa2d6c25 100644
+index abfe0411e..972aeca6e 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/JobEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
@@ -2146,11 +2316,11 @@ index fc48c8fb0..efa2d6c25 100644
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.postgresql.storage.JobEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
-index a7fd475db..7b3ffd90e 100644
+index 3cbb177ac..c9374c38f 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessDefinitionEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
@@ -2159,11 +2329,11 @@ index a7fd475db..7b3ffd90e 100644
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.postgresql.storage.ProcessDefinitionEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
-index 60760dc54..3eb6079b1 100644
+index f8fe9be76..53ebea212 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/ProcessInstanceEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
@@ -2172,11 +2342,11 @@ index 60760dc54..3eb6079b1 100644
import org.kie.kogito.index.model.ProcessInstance;
import org.kie.kogito.index.postgresql.storage.ProcessInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
-index 8435d0285..e76f95471 100644
+index 126f642b3..8c63e274c 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/query/UserTaskInstanceEntityQueryIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.index.postgresql.query;
-import javax.inject.Inject;
@@ -2185,10 +2355,10 @@ index 8435d0285..e76f95471 100644
import org.kie.kogito.index.model.UserTaskInstance;
import org.kie.kogito.index.postgresql.storage.UserTaskInstanceEntityStorage;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
-index a614255fa..7eabc768e 100644
+index c39f5e2f6..a36748515 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/DomainQueryTest.java
-@@ -18,14 +18,14 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -21,14 +21,14 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.List;
import java.util.function.Function;
@@ -2212,70 +2382,62 @@ index a614255fa..7eabc768e 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
-index 6b27fbc49..5953447d3 100644
+index b3845d834..6d11639ef 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/JobStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.UUID;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
- import org.junit.jupiter.api.BeforeEach;
+ import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
-index a928c69ae..b105c5ddd 100644
+index 111d71d41..024da5368 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessDefinitionStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.Set;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
+ import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
- import org.kie.kogito.index.model.ProcessDefinition;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
-index 8fefdc1e1..d543d5416 100644
+index 326229c13..cb0fda630 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/ProcessInstanceStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.UUID;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
-index 232e6cd71..1de81839d 100644
+index f64359fdf..a866610a8 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/test/java/org/kie/kogito/index/postgresql/storage/UserTaskInstanceStorageIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.postgresql.storage;
+@@ -20,7 +20,7 @@ package org.kie.kogito.index.postgresql.storage;
import java.util.UUID;
-import javax.inject.Inject;
--import javax.transaction.Transactional;
+import jakarta.inject.Inject;
-+import jakarta.transaction.Transactional;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Test;
diff --git a/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java b/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
-index fb1fa800b..66eab3ebe 100644
+index f08e7b057..4bb9854bb 100644
--- a/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
+++ b/data-index/data-index-storage/data-index-storage-protobuf/src/main/java/org/kie/kogito/index/protobuf/ProtostreamProducer.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.index.protobuf;
+@@ -20,8 +20,8 @@ package org.kie.kogito.index.protobuf;
import java.io.IOException;
@@ -2287,10 +2449,10 @@ index fb1fa800b..66eab3ebe 100644
import org.infinispan.protostream.FileDescriptorSource;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
-index ebf34ecdb..2d8b34c40 100644
+index 4c3c53e43..d437fa589 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/DataIndexEventPublisher.java
-@@ -20,9 +20,9 @@ import java.io.IOException;
+@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Collection;
@@ -2304,10 +2466,10 @@ index ebf34ecdb..2d8b34c40 100644
import org.kie.kogito.event.DataEvent;
import org.kie.kogito.event.EventPublisher;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
-index 1cf53ee08..b412460b7 100644
+index c35992d1b..933234bd7 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/ProcessDefinitionRegister.java
-@@ -20,9 +20,9 @@ import java.util.Optional;
+@@ -22,9 +22,9 @@ import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
@@ -2321,11 +2483,11 @@ index 1cf53ee08..b412460b7 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.Application;
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
-index e7f175c7a..6b8c1b148 100644
+index 4ac132c3d..c1b65512d 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
-@@ -23,9 +23,9 @@ import java.util.Map;
- import java.util.concurrent.CompletableFuture;
+@@ -27,9 +27,9 @@ import java.util.concurrent.CompletableFuture;
+ import java.util.function.Function;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
@@ -2336,12 +2498,25 @@ index e7f175c7a..6b8c1b148 100644
+import jakarta.inject.Inject;
import org.eclipse.microprofile.context.ManagedExecutor;
- import org.kie.kogito.addon.source.files.SourceFilesProvider;
+ import org.kie.kogito.Application;
+diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
+index e1c56069a..6e08e93c6 100644
+--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
++++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
+@@ -21,7 +21,7 @@ package org.kie.kogito.index.addon.api;
+ import java.nio.Buffer;
+ import java.util.Optional;
+
+-import javax.enterprise.inject.Instance;
++import jakarta.enterprise.inject.Instance;
+
+ import org.junit.jupiter.api.BeforeEach;
+ import org.junit.jupiter.api.Test;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
-index 9971514df..df44a03ce 100644
+index 33b10f452..e885cf497 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/graphql/GraphQLAddonSchemaManagerImpl.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.index.addon.graphql;
@@ -2351,10 +2526,10 @@ index 9971514df..df44a03ce 100644
import org.kie.kogito.index.graphql.AbstractGraphQLSchemaManager;
import org.kie.kogito.index.model.ProcessInstanceState;
diff --git a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
-index f93b4ce3f..bfff9eda1 100644
+index 29ab0a1d8..7aba3a8b5 100644
--- a/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
+++ b/data-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-common/runtime/src/main/java/org/kie/kogito/index/addon/vertx/VertxGraphiQLSetup.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.index.addon.vertx;
@@ -2368,10 +2543,10 @@ index f93b4ce3f..bfff9eda1 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
-index 3f8545317..4d2ce0232 100644
+index d8db183fe..1a7d9726d 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityRequest.java
-@@ -17,9 +17,9 @@ package org.kie.kogito.explainability.api;
+@@ -20,9 +20,9 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
@@ -2385,10 +2560,10 @@ index 3f8545317..4d2ce0232 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
-index fbd9b8eed..3eb287160 100644
+index 1830a5968..d9b29011c 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/BaseExplainabilityResult.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.explainability.api;
+@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
@@ -2398,10 +2573,10 @@ index fbd9b8eed..3eb287160 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
-index 90b04c511..2063a6966 100644
+index 2a13a1a79..f571e5df7 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainCategorical.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.explainability.api;
+@@ -21,7 +21,7 @@ package org.kie.kogito.explainability.api;
import java.util.Collection;
import java.util.Objects;
@@ -2411,10 +2586,10 @@ index 90b04c511..2063a6966 100644
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
-index b189a93ea..5dc2461e5 100644
+index 9b19c3364..613b8c063 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualDomainRange.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.explainability.api;
+@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
@@ -2424,10 +2599,10 @@ index b189a93ea..5dc2461e5 100644
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
-index c5ab1a5a7..1cb91af6b 100644
+index c35367153..dc0bf86b6 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityRequest.java
-@@ -19,8 +19,8 @@ package org.kie.kogito.explainability.api;
+@@ -21,8 +21,8 @@ package org.kie.kogito.explainability.api;
import java.util.Collection;
import java.util.Objects;
@@ -2439,10 +2614,10 @@ index c5ab1a5a7..1cb91af6b 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
-index 1a1eb4d00..691ab6ec6 100644
+index 38580f144..09351fff3 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/CounterfactualExplainabilityResult.java
-@@ -21,7 +21,7 @@ import java.util.Collections;
+@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.Objects;
import java.util.UUID;
@@ -2452,10 +2627,10 @@ index 1a1eb4d00..691ab6ec6 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
-index 702b94eda..fc24f60e8 100644
+index 02f18fc55..633e06dd6 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityRequest.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.explainability.api;
+@@ -21,8 +21,8 @@ package org.kie.kogito.explainability.api;
import java.util.Collection;
import java.util.Objects;
@@ -2467,10 +2642,10 @@ index 702b94eda..fc24f60e8 100644
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
-index fee2c94b1..616022b70 100644
+index af066bcd4..918827b88 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/LIMEExplainabilityResult.java
-@@ -20,7 +20,7 @@ import java.util.Collections;
+@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -2480,10 +2655,10 @@ index fee2c94b1..616022b70 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
-index ba7bce867..9df8dfbe8 100644
+index 3727bdf6f..3353ba1dc 100644
--- a/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
+++ b/explainability/explainability-api/src/main/java/org/kie/kogito/explainability/api/ModelIdentifier.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.explainability.api;
+@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.api;
import java.util.Objects;
@@ -2493,10 +2668,10 @@ index ba7bce867..9df8dfbe8 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java b/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
-index d8da956d0..bb7a91dca 100644
+index da33c98eb..ba7bff960 100644
--- a/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
+++ b/explainability/explainability-service-messaging/src/main/java/org/kie/kogito/explainability/messaging/ExplainabilityMessagingHandler.java
-@@ -22,8 +22,8 @@ import java.util.Optional;
+@@ -25,8 +25,8 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -2508,10 +2683,10 @@ index d8da956d0..bb7a91dca 100644
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.eclipse.microprofile.reactive.messaging.Message;
diff --git a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
-index 25bdb5208..772b92935 100644
+index 2874f5f7c..50037afdf 100644
--- a/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
+++ b/explainability/explainability-service-messaging/src/test/java/org/kie/kogito/explainability/messaging/BaseExplainabilityMessagingHandlerIT.java
-@@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch;
+@@ -24,7 +24,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -2521,10 +2696,10 @@ index 25bdb5208..772b92935 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java b/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
-index af971e5b1..4d8c0819e 100644
+index 67b36a591..06440daca 100644
--- a/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
+++ b/explainability/explainability-service-rest/src/main/java/org/kie/kogito/explainability/rest/ExplainabilityApiV1.java
-@@ -17,14 +17,14 @@ package org.kie.kogito.explainability.rest;
+@@ -20,14 +20,14 @@ package org.kie.kogito.explainability.rest;
import java.util.concurrent.CompletionStage;
@@ -2548,10 +2723,10 @@ index af971e5b1..4d8c0819e 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
-index 5b9b38f0f..97dc3634a 100644
+index aadffa940..084a130f3 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/LocalExplainerMock.java
-@@ -19,7 +19,7 @@ import java.util.Map;
+@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@@ -2561,10 +2736,10 @@ index 5b9b38f0f..97dc3634a 100644
import org.kie.kogito.explainability.local.LocalExplainer;
import org.kie.kogito.explainability.model.Prediction;
diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
-index 42e4153ab..a54a8ed7f 100644
+index 958dcc404..cd9daa560 100644
--- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
+++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/PredictionProviderFactoryMock.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.explainability.rest;
+@@ -20,7 +20,7 @@ package org.kie.kogito.explainability.rest;
import java.util.Collection;
@@ -2574,10 +2749,10 @@ index 42e4153ab..a54a8ed7f 100644
import org.kie.kogito.explainability.PredictionProviderFactory;
import org.kie.kogito.explainability.api.HasNameValue;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
-index ed520823d..093098439 100644
+index f5b9f46e7..1d62d43a9 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/ExplanationServiceImpl.java
-@@ -19,8 +19,8 @@ package org.kie.kogito.explainability;
+@@ -21,8 +21,8 @@ package org.kie.kogito.explainability;
import java.util.concurrent.CompletionStage;
import java.util.function.Consumer;
@@ -2589,10 +2764,10 @@ index ed520823d..093098439 100644
import org.kie.kogito.explainability.api.BaseExplainabilityRequest;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
-index c9ff4ad37..10bfc7a40 100644
+index 76adbc616..ee20db64c 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/PredictionProviderFactoryImpl.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.explainability;
+@@ -20,8 +20,8 @@ package org.kie.kogito.explainability;
import java.util.Collection;
@@ -2604,11 +2779,11 @@ index c9ff4ad37..10bfc7a40 100644
import org.eclipse.microprofile.context.ManagedExecutor;
import org.eclipse.microprofile.context.ThreadContext;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
-index 16631cb22..bb3fefa85 100644
+index dd7070d27..e9627760d 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerProducer.java
-@@ -16,9 +16,9 @@
-
+@@ -18,9 +18,9 @@
+ */
package org.kie.kogito.explainability.handlers;
-import javax.enterprise.context.ApplicationScoped;
@@ -2621,10 +2796,10 @@ index 16631cb22..bb3fefa85 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.context.ManagedExecutor;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
-index ecab71879..feaf749f2 100644
+index dc5ef5687..6ce9e2770 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/CounterfactualExplainerServiceHandler.java
-@@ -26,8 +26,8 @@ import java.util.concurrent.CompletableFuture;
+@@ -29,8 +29,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -2636,10 +2811,10 @@ index ecab71879..feaf749f2 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.ConversionUtils;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
-index 3781aff0f..da202dad3 100644
+index 995ce31f3..a735a2ac6 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerProducer.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.explainability.handlers;
+@@ -20,9 +20,9 @@ package org.kie.kogito.explainability.handlers;
import java.security.SecureRandom;
@@ -2653,10 +2828,10 @@ index 3781aff0f..da202dad3 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.local.lime.LimeConfig;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
-index 3c98cacf9..32ce4e071 100644
+index bab144581..927280ebe 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LimeExplainerServiceHandler.java
-@@ -21,8 +21,8 @@ import java.util.concurrent.CompletableFuture;
+@@ -24,8 +24,8 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -2668,10 +2843,10 @@ index 3c98cacf9..32ce4e071 100644
import org.kie.kogito.explainability.PredictionProviderFactory;
import org.kie.kogito.explainability.api.BaseExplainabilityRequest;
diff --git a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
-index 45856bfb5..5d5181eaa 100644
+index 0653ceda2..b184cfcce 100644
--- a/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
+++ b/explainability/explainability-service/src/main/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistry.java
-@@ -19,10 +19,10 @@ import java.util.Optional;
+@@ -22,10 +22,10 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
@@ -2687,10 +2862,10 @@ index 45856bfb5..5d5181eaa 100644
import org.kie.kogito.explainability.api.BaseExplainabilityRequest;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
-index cb59f4827..073bb9ba8 100644
+index 32fa35a3b..b75f6fb54 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/ExplanationServiceImplTest.java
-@@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
+@@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Stream;
@@ -2700,10 +2875,10 @@ index cb59f4827..073bb9ba8 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
-index b351192b7..f6c8ef3e9 100644
+index a1ae055fe..a45934d83 100644
--- a/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
+++ b/explainability/explainability-service/src/test/java/org/kie/kogito/explainability/handlers/LocalExplainerServiceHandlerRegistryTest.java
-@@ -19,7 +19,7 @@ import java.util.Collections;
+@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.function.Consumer;
import java.util.stream.Stream;
@@ -2713,10 +2888,10 @@ index b351192b7..f6c8ef3e9 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
-index ea7a5d79a..40cc36712 100644
+index c0b70cffb..b07248fe4 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/JITBPMNServiceImpl.java
-@@ -23,7 +23,7 @@ import java.util.ArrayList;
+@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -2726,11 +2901,11 @@ index ea7a5d79a..40cc36712 100644
import org.drools.io.InputStreamResource;
import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
diff --git a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
-index 327a86878..3e134365e 100644
+index 5022f4903..00985fd63 100644
--- a/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
+++ b/jitexecutor/jitexecutor-bpmn/src/main/java/org/kie/kogito/jitexecutor/bpmn/api/BPMNValidationResource.java
-@@ -16,13 +16,13 @@
-
+@@ -18,13 +18,13 @@
+ */
package org.kie.kogito.jitexecutor.bpmn.api;
-import javax.inject.Inject;
@@ -2751,11 +2926,11 @@ index 327a86878..3e134365e 100644
import org.kie.kogito.jitexecutor.bpmn.JITBPMNService;
import org.kie.kogito.jitexecutor.bpmn.responses.JITBPMNValidationResult;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
-index 65c1a8c6f..e588db75f 100644
+index ec8b9bde9..44684aa50 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNObjectMapperCustomizer.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.jitexecutor.dmn;
-import javax.inject.Singleton;
@@ -2764,10 +2939,10 @@ index 65c1a8c6f..e588db75f 100644
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
-index c5f9c9c3f..0ed9799cd 100644
+index b2230ecd4..9b305a37a 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/JITDMNServiceImpl.java
-@@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException;
+@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@@ -2777,10 +2952,10 @@ index c5f9c9c3f..0ed9799cd 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.dmn.api.core.DMNModel;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
-index 5c929ebe3..d65902684 100644
+index b50ad939e..ef709e8a3 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/DMNValidationResource.java
-@@ -23,12 +23,12 @@ import java.util.List;
+@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -2800,10 +2975,10 @@ index 5c929ebe3..d65902684 100644
import org.kie.api.io.Resource;
import org.kie.dmn.api.core.DMNMessage;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
-index 046a5b94d..f4071407a 100644
+index 6ff12594c..d811adf50 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/JITDMNResource.java
-@@ -20,13 +20,13 @@ import java.util.HashMap;
+@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -2825,10 +3000,10 @@ index 046a5b94d..f4071407a 100644
import org.kie.dmn.core.internal.utils.MarshallingStubUtils;
import org.kie.kogito.jitexecutor.dmn.JITDMNService;
diff --git a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
-index 86ebaa195..65688dcb5 100644
+index cec99ab0e..8d673f674 100644
--- a/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
+++ b/jitexecutor/jitexecutor-dmn/src/main/java/org/kie/kogito/jitexecutor/dmn/api/SchemaResource.java
-@@ -20,12 +20,12 @@ import java.util.Collections;
+@@ -22,12 +22,12 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -2848,10 +3023,10 @@ index 86ebaa195..65688dcb5 100644
import org.eclipse.microprofile.openapi.OASFactory;
import org.eclipse.microprofile.openapi.models.OpenAPI;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
-index 8e2e55211..37dea66f7 100644
+index cdff7c265..8ecdba586 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/deployment/src/test/java/org/kie/kogito/job/http/recipient/test/JobHttpRecipientTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.job.http.recipient.test;
@@ -2861,10 +3036,10 @@ index 8e2e55211..37dea66f7 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.shrinkwrap.api.ShrinkWrap;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
-index c80a5b20f..ffb1d5366 100644
+index ec1c1ffdb..b0f1e420e 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/pom.xml
-@@ -64,7 +64,7 @@
+@@ -84,7 +84,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
@@ -2874,10 +3049,10 @@ index c80a5b20f..ffb1d5366 100644
<executions>
<execution>
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
-index a7428a6a5..34cd026ae 100644
+index d174f283c..547db16b5 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpJobExecutor.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
*/
package org.kie.kogito.job.http.recipient;
@@ -2892,10 +3067,10 @@ index a7428a6a5..34cd026ae 100644
import org.kie.kogito.job.recipient.common.http.HTTPRequest;
import org.kie.kogito.job.recipient.common.http.HTTPRequestExecutor;
diff --git a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
-index 55dec85a5..3f7063b21 100644
+index 07a7aae78..50107127c 100644
--- a/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
+++ b/jobs-service/jobs-recipients/job-http-recipient/runtime/src/main/java/org/kie/kogito/job/http/recipient/HttpRecipientValidator.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.job.http.recipient;
+@@ -21,7 +21,7 @@ package org.kie.kogito.job.http.recipient;
import java.net.MalformedURLException;
import java.net.URL;
@@ -2905,10 +3080,10 @@ index 55dec85a5..3f7063b21 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.internal.utils.ConversionUtils;
diff --git a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
-index c81c0a30a..edf4d1a8f 100644
+index 4761d0248..ffe6dc7a0 100644
--- a/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
+++ b/jobs-service/jobs-recipients/job-recipient-common-http/src/main/java/org/kie/kogito/job/recipient/common/http/HTTPRequestExecutor.java
-@@ -22,7 +22,7 @@ import java.util.Collections;
+@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.stream.Collectors;
@@ -2918,10 +3093,10 @@ index c81c0a30a..edf4d1a8f 100644
import org.kie.kogito.job.recipient.common.http.converters.HttpConverters;
import org.kie.kogito.jobs.api.URIBuilder;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
-index a1a16586b..59cb53e18 100644
+index 1a5251c2a..c82c91daa 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/pom.xml
-@@ -70,7 +70,7 @@
+@@ -90,7 +90,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
@@ -2931,10 +3106,10 @@ index a1a16586b..59cb53e18 100644
<executions>
<execution>
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
-index 8d8a7360d..084e5fa58 100644
+index fb3116828..505ebbee3 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkJobExecutor.java
-@@ -19,10 +19,10 @@ package org.kie.kogito.job.sink.recipient;
+@@ -21,10 +21,10 @@ package org.kie.kogito.job.sink.recipient;
import java.time.OffsetDateTime;
import java.util.UUID;
@@ -2949,10 +3124,10 @@ index 8d8a7360d..084e5fa58 100644
import org.kie.kogito.job.recipient.common.http.HTTPRequest;
import org.kie.kogito.job.recipient.common.http.HTTPRequestExecutor;
diff --git a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
-index f13433f65..49c73c3ae 100644
+index 5826feb9d..76d96ce49 100644
--- a/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
+++ b/jobs-service/jobs-recipients/job-sink-recipient/runtime/src/main/java/org/kie/kogito/job/sink/recipient/SinkRecipientValidator.java
-@@ -20,7 +20,7 @@ import java.net.MalformedURLException;
+@@ -22,7 +22,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Objects;
@@ -2962,10 +3137,10 @@ index f13433f65..49c73c3ae 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.internal.utils.ConversionUtils;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java
-index c3f932c0f..0b51bac8a 100644
+index 207335f46..0eddc443f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/executor/DefaultJobExecutorResolver.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.jobs.service.executor;
@@ -2979,10 +3154,10 @@ index c3f932c0f..0b51bac8a 100644
import org.kie.kogito.jobs.service.model.JobDetails;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java
-index e02ccf976..2f0dc5bb6 100644
+index b334e424b..b42b5376f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/json/JacksonConfiguration.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.json;
@@ -2994,10 +3169,10 @@ index e02ccf976..2f0dc5bb6 100644
import org.kie.kogito.jobs.service.api.serlialization.SerializationUtils;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java
-index bcbaf4f9a..66ad2417a 100644
+index 37bda9e54..09203d2ad 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/HttpGatekeeperFilter.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.jobs.service.management;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.management;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -3009,10 +3184,10 @@ index bcbaf4f9a..66ad2417a 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java
-index 5108b2871..fb959acb3 100644
+index 80101b912..a756746f6 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManager.java
-@@ -22,11 +22,11 @@ import java.util.concurrent.TimeUnit;
+@@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -3030,10 +3205,10 @@ index 5108b2871..fb959acb3 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.jobs.service.messaging.MessagingHandler;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java
-index 517a3afa8..a15ab67d9 100644
+index 0c0de570d..c07792b0e 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/management/JobServiceLeaderHealthCheck.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.service.management;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.management;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -3045,10 +3220,10 @@ index 517a3afa8..a15ab67d9 100644
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java
-index da2ecfba8..ac21dde92 100644
+index 3d2da793c..d7c36bbd4 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/DefaultJobServiceManagementRepository.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.repository.impl;
+@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.repository.impl;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
@@ -3058,11 +3233,11 @@ index da2ecfba8..ac21dde92 100644
import org.kie.kogito.jobs.service.model.JobServiceManagementInfo;
import org.kie.kogito.jobs.service.repository.JobServiceManagementRepository;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java
-index 74592869b..fb8f3f0c2 100644
+index ee7a88b67..bf349c863 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryConfiguration.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.repository.impl;
-import javax.enterprise.context.ApplicationScoped;
@@ -3073,10 +3248,10 @@ index 74592869b..fb8f3f0c2 100644
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java
-index aa961e768..d54d03deb 100644
+index 4cbb0ad1b..ddbbe7e80 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/impl/InMemoryJobRepository.java
-@@ -25,8 +25,8 @@ import java.util.concurrent.ConcurrentHashMap;
+@@ -28,8 +28,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -3088,10 +3263,10 @@ index aa961e768..d54d03deb 100644
import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java
-index 7e8cba935..eb3a57edd 100644
+index 3f1c2b9df..65e80f4b3 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/JobDetailsMarshaller.java
-@@ -22,8 +22,8 @@ import java.util.Date;
+@@ -24,8 +24,8 @@ import java.util.Date;
import java.util.Map;
import java.util.Optional;
@@ -3103,10 +3278,10 @@ index 7e8cba935..eb3a57edd 100644
import org.kie.kogito.jobs.service.model.JobDetails;
import org.kie.kogito.jobs.service.model.JobStatus;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java
-index ed0dea556..032430e7f 100644
+index 12812f945..c45bd7b10 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/RecipientMarshaller.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.repository.marshaller;
+@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.repository.marshaller;
import java.util.Objects;
import java.util.Optional;
@@ -3116,10 +3291,10 @@ index ed0dea556..032430e7f 100644
import org.kie.kogito.jobs.service.model.Recipient;
import org.kie.kogito.jobs.service.model.RecipientInstance;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java
-index b74f35cb5..a97231b26 100644
+index 2359a7b2b..fecfa1f92 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/repository/marshaller/TriggerMarshaller.java
-@@ -20,7 +20,7 @@ import java.time.temporal.ChronoUnit;
+@@ -22,7 +22,7 @@ import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.Optional;
@@ -3129,10 +3304,10 @@ index b74f35cb5..a97231b26 100644
import org.kie.kogito.timer.Trigger;
import org.kie.kogito.timer.impl.IntervalTrigger;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java
-index 507dcc605..71c7f16b1 100644
+index 48b9bb9e5..644a0d8e0 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/CallbackResourceTest.java
-@@ -18,13 +18,13 @@ package org.kie.kogito.jobs.service.resource;
+@@ -21,13 +21,13 @@ package org.kie.kogito.jobs.service.resource;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -3154,10 +3329,10 @@ index 507dcc605..71c7f16b1 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java
-index 2608df99c..b4de77b37 100644
+index 9bb98f0a3..2a7cdc175 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobResource.java
-@@ -15,18 +15,18 @@
+@@ -18,18 +18,18 @@
*/
package org.kie.kogito.jobs.service.resource;
@@ -3189,10 +3364,10 @@ index 2608df99c..b4de77b37 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java
-index edfed3472..edbdb857c 100644
+index 0da279515..4a4cfe3af 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/JobServiceManagementResource.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
*/
package org.kie.kogito.jobs.service.resource;
@@ -3210,10 +3385,10 @@ index edfed3472..edbdb857c 100644
import org.kie.kogito.jobs.service.management.ReleaseLeaderEvent;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java
-index 06dfdbf58..c853c3b24 100644
+index cd7557aa7..73476dfa3 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/BaseExceptionMapper.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.jobs.service.resource.error;
@@ -3227,10 +3402,10 @@ index 06dfdbf58..c853c3b24 100644
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
-index 79ed119fd..4ebdc6c62 100644
+index 55cd6c55e..c9af24191 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/DefaultExceptionMapper.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
@@ -3240,10 +3415,10 @@ index 79ed119fd..4ebdc6c62 100644
@Provider
public class DefaultExceptionMapper extends BaseExceptionMapper<Exception> {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
-index 81d29552b..6d36c5db7 100644
+index 0a7207d1a..d4af83f2f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/IllegalArgumentExceptionMapper.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
@@ -3253,10 +3428,10 @@ index 81d29552b..6d36c5db7 100644
@Provider
public class IllegalArgumentExceptionMapper extends BaseExceptionMapper<IllegalArgumentException> {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java
-index 6aa59d40a..c900d4fa1 100644
+index d92d13528..1de5f6335 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/InvalidScheduleTimeExceptionMapper.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.jobs.service.resource.error;
@@ -3266,11 +3441,11 @@ index 6aa59d40a..c900d4fa1 100644
import org.kie.kogito.jobs.service.exception.InvalidScheduleTimeException;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java
-index 9da96f2f4..8e82d2011 100644
+index 1df46f4d3..b2e050e27 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/JobValidationExceptionMapper.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.jobs.service.resource.error;
-import javax.ws.rs.ext.Provider;
@@ -3279,10 +3454,10 @@ index 9da96f2f4..8e82d2011 100644
import org.kie.kogito.jobs.service.exception.JobValidationException;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
-index 67dd5a451..c4f01373e 100644
+index dc084bc41..176f5a955 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/NotFoundExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.resource.error;
@@ -3294,10 +3469,10 @@ index 67dd5a451..c4f01373e 100644
@Provider
public class NotFoundExceptionMapper extends BaseExceptionMapper<NotFoundException> {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
-index fb96f2b4e..44b2b5fd8 100644
+index 26cf01e54..d6c5382f8 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/error/WebApplicationExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.resource.error;
@@ -3309,10 +3484,10 @@ index fb96f2b4e..44b2b5fd8 100644
public class WebApplicationExceptionMapper extends BaseExceptionMapper<WebApplicationException> {
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java
-index 5c0f5eab7..f03cefc3e 100644
+index 4a17ec57d..34ed6ea97 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/resource/v2/JobResourceV2.java
-@@ -15,17 +15,17 @@
+@@ -18,17 +18,17 @@
*/
package org.kie.kogito.jobs.service.resource.v2;
@@ -3342,32 +3517,27 @@ index 5c0f5eab7..f03cefc3e 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.kie.kogito.jobs.service.adapter.JobDetailsAdapter;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
-index 54b71d3e7..dae676e7d 100644
+index 3649eafcd..fa80ae3cc 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/JobSchedulerManager.java
-@@ -19,12 +19,12 @@ import java.util.Optional;
- import java.util.concurrent.TimeUnit;
+@@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+ import java.util.concurrent.atomic.AtomicLong;
--import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
--import javax.interceptor.Interceptor;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
-+import jakarta.interceptor.Interceptor;
-+import jakarta.annotation.Priority;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
- import org.kie.kogito.jobs.service.management.MessagingChangeEvent;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
-index f0173012b..65f633fe9 100644
+index 8c0828e1d..06e396e2c 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/TimerDelegateJobScheduler.java
-@@ -19,8 +19,8 @@ import java.util.Objects;
+@@ -22,8 +22,8 @@ import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletionStage;
@@ -3379,10 +3549,10 @@ index f0173012b..65f633fe9 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java
-index 25a6464a0..8238f1d32 100644
+index 503e08940..9c81c786f 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/scheduler/impl/VertxTimerServiceScheduler.java
-@@ -21,7 +21,7 @@ import java.time.chrono.ChronoZonedDateTime;
+@@ -24,7 +24,7 @@ import java.time.chrono.ChronoZonedDateTime;
import java.util.Collection;
import java.util.Optional;
@@ -3392,10 +3562,10 @@ index 25a6464a0..8238f1d32 100644
import org.kie.kogito.jobs.service.model.ManageableJobHandle;
import org.kie.kogito.jobs.service.utils.DateUtil;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java
-index 156e7fafc..d3d1c45ef 100644
+index 793744677..35d392aab 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/stream/JobStreams.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.stream;
@@ -3407,10 +3577,10 @@ index 156e7fafc..d3d1c45ef 100644
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
import org.eclipse.microprofile.reactive.messaging.Channel;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java
-index 5cd70b800..44696e3d5 100644
+index c3fae95e8..d4165a1f5 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobDetailsValidator.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.jobs.service.validation;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.validation;
import java.util.Objects;
@@ -3422,11 +3592,11 @@ index 5cd70b800..44696e3d5 100644
import org.apache.commons.lang3.StringUtils;
import org.kie.kogito.jobs.service.exception.JobValidationException;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java
-index 1ece47999..a959a54d3 100644
+index 9ce3080cc..33a955645 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/JobValidator.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.validation;
-import javax.enterprise.context.ApplicationScoped;
@@ -3437,10 +3607,10 @@ index 1ece47999..a959a54d3 100644
import org.apache.commons.lang3.StringUtils;
import org.kie.kogito.jobs.service.api.Job;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java
-index 4333a3f65..2872540e4 100644
+index 8f752c617..0196fea03 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientInstanceValidator.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.validation;
@@ -3452,10 +3622,10 @@ index 4333a3f65..2872540e4 100644
import org.kie.kogito.jobs.service.exception.JobValidationException;
import org.kie.kogito.jobs.service.model.Recipient;
diff --git a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
-index 225674149..bc94b2309 100644
+index 2c145433e..8a0d30773 100644
--- a/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
+++ b/jobs-service/jobs-service-common/src/main/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProvider.java
-@@ -21,9 +21,9 @@ import java.util.Optional;
+@@ -23,9 +23,9 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -3469,10 +3639,10 @@ index 225674149..bc94b2309 100644
@ApplicationScoped
public class RecipientValidatorProvider {
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java
-index 5fed08fd8..8f95fd1b7 100644
+index 9b6648d05..58a89f89e 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/management/JobServiceInstanceManagerTest.java
-@@ -20,8 +20,8 @@ import java.util.Arrays;
+@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.function.Function;
import java.util.stream.Stream;
@@ -3484,10 +3654,10 @@ index 5fed08fd8..8f95fd1b7 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
-index 406a18feb..6cfd0acef 100644
+index 4fe11b8a5..ebfa5f531 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseCallbackResource.java
-@@ -21,16 +21,16 @@ import java.util.HashMap;
+@@ -23,16 +23,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -3515,10 +3685,10 @@ index 406a18feb..6cfd0acef 100644
/**
* Helper resource for emulating the callback endpoint of a Job created by using the Job service events API and to have
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java
-index d32b575d9..cc12a6d31 100644
+index 2cb4b7f72..aadf605f1 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/messaging/BaseMessagingApiTest.java
-@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
+@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -3528,10 +3698,10 @@ index d32b575d9..cc12a6d31 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Channel;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java
-index bb10e274a..4413ac079 100644
+index d91a71402..c0c26dd16 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.jobs.service.resource;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.resource;
import java.io.IOException;
@@ -3541,10 +3711,10 @@ index bb10e274a..4413ac079 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.BeforeAll;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java
-index 241b594c5..f8040c745 100644
+index 58adb4860..9daf41617 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/CommonBaseJobResourceTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.resource;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.resource;
import java.io.IOException;
@@ -3554,10 +3724,10 @@ index 241b594c5..f8040c745 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
-index 61ccae4dc..e2c1e8a47 100644
+index 21c8e60d2..daa9edf7b 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/ExternalResourcesMock.java
-@@ -38,10 +38,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;
+@@ -40,10 +40,10 @@ import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;
import static com.github.tomakehurst.wiremock.client.WireMock.post;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
@@ -3573,10 +3743,10 @@ index 61ccae4dc..e2c1e8a47 100644
/**
* This resource emulates external resources that can be used in different jobs service tests, for example to check
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java
-index 3f86f36e5..b55355c5e 100644
+index 914517a3b..3103f13fd 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/http/recipient/BaseHttpRecipientPayloadTypesTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.resource.v2.http.recipient;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.resource.v2.http.recipient;
import java.time.OffsetDateTime;
@@ -3585,7 +3755,7 @@ index 3f86f36e5..b55355c5e 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-@@ -36,10 +36,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
+@@ -38,10 +38,10 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.github.tomakehurst.wiremock.WireMockServer;
import static java.util.concurrent.TimeUnit.MINUTES;
@@ -3601,10 +3771,10 @@ index 3f86f36e5..b55355c5e 100644
import static org.kie.kogito.jobs.service.TestUtils.assertJobHasFinishedV2;
import static org.kie.kogito.jobs.service.TestUtils.createJobV2;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java
-index f6386ee7a..0a05caf54 100644
+index bc3de5914..e58a5b5c8 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/v2/sink/recipient/BaseSinkRecipientPayloadTypesTest.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
+@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.resource.v2.sink.recipient;
import java.net.URI;
import java.time.OffsetDateTime;
@@ -3614,10 +3784,10 @@ index f6386ee7a..0a05caf54 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java
-index 060bfdf79..a907a1a58 100644
+index a23589deb..a1424980e 100644
--- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java
+++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/validation/RecipientValidatorProviderTest.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.jobs.service.validation;
+@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.validation;
import java.util.Arrays;
import java.util.stream.Stream;
@@ -3627,10 +3797,10 @@ index 060bfdf79..a907a1a58 100644
import org.junit.jupiter.api.Test;
import org.kie.kogito.jobs.service.api.PayloadData;
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
-index 16b28e366..d65daf68a 100644
+index 510c6038f..0087c596a 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfiguration.java
-@@ -18,14 +18,14 @@ package org.kie.kogito.jobs.service.repository.infinispan;
+@@ -21,14 +21,13 @@ package org.kie.kogito.jobs.service.repository.infinispan;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -3641,22 +3811,22 @@ index 16b28e366..d65daf68a 100644
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.interceptor.Interceptor;
+-
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.interceptor.Interceptor;
-
+import jakarta.annotation.Priority;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.Readiness;
import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
-index 09094eb12..e04825e57 100644
+index b400dfddb..7fdf4464b 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepository.java
-@@ -20,9 +20,9 @@ import java.util.Arrays;
+@@ -23,9 +23,9 @@ import java.util.Arrays;
import java.util.concurrent.CompletionStage;
import java.util.stream.Collectors;
@@ -3670,26 +3840,26 @@ index 09094eb12..e04825e57 100644
import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
diff --git a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
-index 06925a580..28af764dd 100644
+index 3952c06b8..a7e86a380 100644
--- a/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
+++ b/jobs-service/jobs-service-infinispan/src/main/java/org/kie/kogito/jobs/service/repository/infinispan/marshaller/MarshallersProducer.java
-@@ -15,8 +15,8 @@
- */
- package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.repository.infinispan.marshaller;
+
+ import java.io.IOException;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+ import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.MessageMarshaller;
- import org.kie.kogito.jobs.service.repository.marshaller.RecipientMarshaller;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
-index d6ec16ab4..bb749eee9 100644
+index 12c168e81..aab7bf2fb 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/messaging/InfinispanCallbackResource.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
@@ -3700,10 +3870,10 @@ index d6ec16ab4..bb749eee9 100644
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
-index 8fcf1199a..a22c51315 100644
+index 3d477730a..c4e7a56b8 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanConfigurationTest.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.repository.infinispan;
@@ -3715,10 +3885,10 @@ index 8fcf1199a..a22c51315 100644
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
-index fd647ce6c..e12c959b6 100644
+index 54dd96b1d..3a339e7e6 100644
--- a/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
+++ b/jobs-service/jobs-service-infinispan/src/test/java/org/kie/kogito/jobs/service/repository/infinispan/InfinispanJobRepositoryTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.jobs.service.repository.infinispan;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.infinispan;
import java.util.concurrent.TimeUnit;
@@ -3728,11 +3898,11 @@ index fd647ce6c..e12c959b6 100644
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.junit.jupiter.api.BeforeEach;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
-index b477f9eb8..60c20a33b 100644
+index 82d8b7f43..7d524ed4b 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/messaging/InMemoryCallbackResource.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
@@ -3743,10 +3913,10 @@ index b477f9eb8..60c20a33b 100644
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
-index 445948951..58651d8d1 100644
+index ee59162e2..07df1fd1d 100644
--- a/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
+++ b/jobs-service/jobs-service-inmemory/src/test/java/org/kie/kogito/jobs/service/repository/inmemory/postgresql/InmemoryPostgreSqlJobRepositoryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.repository.inmemory.postgresql;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.inmemory.postgresql;
import java.time.Duration;
@@ -3756,10 +3926,10 @@ index 445948951..58651d8d1 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInstance;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
-index 0aed5951d..532a10bed 100644
+index 5e151206c..093a5c2f1 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverter.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.jobs.service.messaging.http;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.messaging.http;
import java.lang.reflect.Type;
@@ -3769,11 +3939,11 @@ index 0aed5951d..532a10bed 100644
import org.eclipse.microprofile.reactive.messaging.Message;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
-index e16e2cbb6..ed864f2ad 100644
+index e52c40aac..f50f13710 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/HttpReactiveMessagingEventConsumer.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging.http;
-import javax.enterprise.context.ApplicationScoped;
@@ -3784,10 +3954,10 @@ index e16e2cbb6..ed864f2ad 100644
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
-index f0ac31a7a..8c28cebbf 100644
+index 6c11b0777..390381833 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/health/knative/KSinkInjectionHealthCheck.java
-@@ -22,7 +22,7 @@ import java.net.URISyntaxException;
+@@ -24,7 +24,7 @@ import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.function.UnaryOperator;
@@ -3797,10 +3967,10 @@ index f0ac31a7a..8c28cebbf 100644
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
-index 33e575885..96c09712d 100644
+index 4119e7568..25541fc62 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreams.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.jobs.service.messaging.http.stream;
+@@ -21,9 +21,9 @@ package org.kie.kogito.jobs.service.messaging.http.stream;
import java.util.Optional;
import java.util.function.Supplier;
@@ -3814,10 +3984,10 @@ index 33e575885..96c09712d 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
-index 9ec17fda7..ed1596223 100644
+index ceb2cbf42..4199cfbd7 100644
--- a/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-http/src/main/java/org/kie/kogito/jobs/service/messaging/http/v2/HttpReactiveMessagingEventConsumer.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.jobs.service.messaging.http.v2;
@@ -3829,10 +3999,10 @@ index 9ec17fda7..ed1596223 100644
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
-index 6105af82f..e140ae358 100644
+index 61b6dee7f..8d2fde08b 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/CloudEventConverterTest.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.jobs.service.messaging.http;
+@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.messaging.http;
import java.net.URI;
import java.time.OffsetDateTime;
@@ -3842,10 +4012,10 @@ index 6105af82f..e140ae358 100644
import org.eclipse.microprofile.reactive.messaging.Message;
import org.eclipse.microprofile.reactive.messaging.Metadata;
diff --git a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
-index e778e6f99..7784ce6a0 100644
+index 6fc2836a2..f8e365f92 100644
--- a/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
+++ b/jobs-service/jobs-service-messaging-http/src/test/java/org/kie/kogito/jobs/service/messaging/http/stream/HttpJobStreamsTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.messaging.http.stream;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.messaging.http.stream;
import java.util.Optional;
@@ -3855,11 +4025,11 @@ index e778e6f99..7784ce6a0 100644
import org.eclipse.microprofile.reactive.messaging.Message;
import org.kie.kogito.jobs.service.stream.AbstractJobStreamsTest;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
-index c36e80a1b..d8bda7e85 100644
+index 232c0fb3c..538c79f53 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaMessagingHandler.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging.kafka;
-import javax.enterprise.context.ApplicationScoped;
@@ -3870,11 +4040,11 @@ index c36e80a1b..d8bda7e85 100644
import org.eclipse.microprofile.reactive.messaging.spi.Connector;
import org.kie.kogito.jobs.service.messaging.MessagingHandler;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
-index 24e8e42db..603e3416c 100644
+index 90f2017c7..389ba67d5 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/KafkaReactiveMessagingEventConsumer.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging.kafka;
-import javax.enterprise.context.ApplicationScoped;
@@ -3885,10 +4055,10 @@ index 24e8e42db..603e3416c 100644
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
-index 3eed9b192..82757265a 100644
+index 1c428782f..97788d433 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfiguration.java
-@@ -20,9 +20,9 @@ import java.util.Map;
+@@ -23,9 +23,9 @@ import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -3902,10 +4072,10 @@ index 3eed9b192..82757265a 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.slf4j.Logger;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
-index f582b7082..ccc8f3016 100644
+index 9f852778a..91df88169 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaJobStreams.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.jobs.service.messaging.kafka.stream;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.service.messaging.kafka.stream;
import java.util.Optional;
@@ -3917,11 +4087,11 @@ index f582b7082..ccc8f3016 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
-index 78f08c566..bc79a69eb 100644
+index e209fd759..91576ecf3 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/main/java/org/kie/kogito/jobs/service/messaging/kafka/v2/KafkaReactiveMessagingEventConsumer.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging.kafka.v2;
-import javax.enterprise.context.ApplicationScoped;
@@ -3932,10 +4102,10 @@ index 78f08c566..bc79a69eb 100644
import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
-index 7a8e75f2c..03dcfe812 100644
+index fc3cfa355..5c219aaea 100644
--- a/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
+++ b/jobs-service/jobs-service-messaging-kafka/src/test/java/org/kie/kogito/jobs/service/messaging/kafka/stream/KafkaConfigurationTest.java
-@@ -21,8 +21,8 @@ import java.util.Map;
+@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
@@ -3947,10 +4117,10 @@ index 7a8e75f2c..03dcfe812 100644
import org.junit.jupiter.api.Test;
import org.kie.kogito.testcontainers.quarkus.KafkaQuarkusTestResource;
diff --git a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
-index 273bd972a..7f4cfd6c6 100644
+index 3e18c05b7..bc615db4d 100644
--- a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
+++ b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepository.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.jobs.service.repository.mongodb;
+@@ -21,9 +21,9 @@ package org.kie.kogito.jobs.service.repository.mongodb;
import java.time.ZonedDateTime;
import java.util.concurrent.CompletionStage;
@@ -3964,11 +4134,11 @@ index 273bd972a..7f4cfd6c6 100644
import org.bson.Document;
import org.bson.json.JsonWriterSettings;
diff --git a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
-index 28ee60bb6..77454e42e 100644
+index 869d921d5..537a7fa28 100644
--- a/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
+++ b/jobs-service/jobs-service-mongodb/src/main/java/org/kie/kogito/jobs/service/repository/mongodb/marshaller/MongoDBJobDetailsMarshaller.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.repository.mongodb.marshaller;
-import javax.enterprise.context.ApplicationScoped;
@@ -3979,11 +4149,11 @@ index 28ee60bb6..77454e42e 100644
import org.kie.kogito.jobs.service.model.JobDetails;
import org.kie.kogito.jobs.service.repository.marshaller.JobDetailsMarshaller;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
-index 77c3dec7b..ca8274ff8 100644
+index 0907fa372..3cf723ce4 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/messaging/MongoDBCallbackResource.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
@@ -3994,10 +4164,10 @@ index 77c3dec7b..ca8274ff8 100644
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
-index 354b12025..f79d2aba6 100644
+index d084da7df..b5f8cdbf1 100644
--- a/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
+++ b/jobs-service/jobs-service-mongodb/src/test/java/org/kie/kogito/jobs/service/repository/mongodb/MongoDBJobRepositoryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.repository.mongodb;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.mongodb;
import java.time.Duration;
@@ -4007,10 +4177,10 @@ index 354b12025..f79d2aba6 100644
import org.bson.Document;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
-index a042969d4..9a3f7e94b 100644
+index 9a1fc1794..3363ff6fb 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
+++ b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepository.java
-@@ -24,8 +24,8 @@ import java.util.concurrent.CompletionStage;
+@@ -26,8 +26,8 @@ import java.util.concurrent.CompletionStage;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -4022,10 +4192,10 @@ index a042969d4..9a3f7e94b 100644
import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
-index 105b644d2..2e25d4696 100644
+index 1f617472a..951c20e94 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
+++ b/jobs-service/jobs-service-postgresql-common/src/main/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepository.java
-@@ -20,8 +20,8 @@ import java.util.function.Function;
+@@ -23,8 +23,8 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -4037,10 +4207,10 @@ index 105b644d2..2e25d4696 100644
import org.kie.kogito.jobs.service.model.JobServiceManagementInfo;
import org.kie.kogito.jobs.service.repository.JobServiceManagementRepository;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
-index 2d7674c3c..95a237d44 100644
+index 6f2d6244b..d5ce76aa0 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobRepositoryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.repository.postgresql;
+@@ -20,7 +20,7 @@ package org.kie.kogito.jobs.service.repository.postgresql;
import java.time.Duration;
@@ -4050,10 +4220,10 @@ index 2d7674c3c..95a237d44 100644
import org.junit.jupiter.api.BeforeEach;
import org.kie.kogito.jobs.service.repository.ReactiveJobRepository;
diff --git a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
-index 085655d6d..5f461add9 100644
+index 569f92ee9..8c9d5c771 100644
--- a/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
+++ b/jobs-service/jobs-service-postgresql-common/src/test/java/org/kie/kogito/jobs/service/repository/postgresql/PostgreSqlJobServiceManagementRepositoryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.jobs.service.repository.postgresql;
+@@ -21,7 +21,7 @@ package org.kie.kogito.jobs.service.repository.postgresql;
import java.time.OffsetDateTime;
import java.util.concurrent.atomic.AtomicReference;
@@ -4063,11 +4233,11 @@ index 085655d6d..5f461add9 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
-index d6ea60277..29de2e09f 100644
+index dbc11be22..f2bea4ea9 100644
--- a/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
+++ b/jobs-service/jobs-service-postgresql/src/test/java/org/kie/kogito/jobs/service/messaging/PostgreSqlCallbackResource.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.jobs.service.messaging;
-import javax.enterprise.context.ApplicationScoped;
@@ -4078,11 +4248,11 @@ index d6ea60277..29de2e09f 100644
import static org.kie.kogito.jobs.service.messaging.BaseCallbackResource.CALLBACK_RESOURCE_PATH;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
-index 3e64c6df7..09cc4b247 100644
+index 9901ca4ff..c614353b8 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/main/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreams.java
-@@ -16,9 +16,9 @@
-
+@@ -18,9 +18,9 @@
+ */
package org.kie.kogito.addons.quarkus.jobs.service.embedded.stream;
-import javax.enterprise.context.ApplicationScoped;
@@ -4095,10 +4265,10 @@ index 3e64c6df7..09cc4b247 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.reactive.messaging.Acknowledgment;
diff --git a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
-index 361aa9932..a9069cf8d 100644
+index c098cd2d8..72d07bfcb 100644
--- a/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
+++ b/jobs-service/kogito-addons-jobs-service/kogito-addons-quarkus-jobs-service-embedded/runtime/src/test/java/org/kie/kogito/addons/quarkus/jobs/service/embedded/stream/EventPublisherJobStreamsTest.java
-@@ -22,7 +22,7 @@ import java.util.Arrays;
+@@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.stream.Stream;
@@ -4108,10 +4278,10 @@ index 361aa9932..a9069cf8d 100644
import org.junit.jupiter.api.Test;
import org.kie.kogito.event.EventPublisher;
diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
-index e4fc8b683..54d1b2825 100644
+index 60a28dbe4..2ae4efff1 100644
--- a/kogito-apps-build-parent/pom.xml
+++ b/kogito-apps-build-parent/pom.xml
-@@ -45,7 +45,7 @@
+@@ -65,13 +65,13 @@
<container.image.integration-tests-trusty-service-quarkus>org.kie.kogito/integration-tests-trusty-service-quarkus:${project.version}</container.image.integration-tests-trusty-service-quarkus>
<!-- OptaPlanner version -->
@@ -4120,11 +4290,18 @@ index e4fc8b683..54d1b2825 100644
<version.com.vladmihalcea.hibernate-types-55>2.12.1</version.com.vladmihalcea.hibernate-types-55>
<version.org.apache.opennlp>1.9.2</version.org.apache.opennlp>
+ <version.org.apache.commons.csv>1.8</version.org.apache.commons.csv>
+ <version.org.jredisearch>2.0.0</version.org.jredisearch>
+- <version.org.mapstruct>1.4.2.Final</version.org.mapstruct>
++ <version.org.mapstruct>1.5.5.Final</version.org.mapstruct>
+ <version.org.skyscreamer>1.5.0</version.org.skyscreamer>
+ <version.com.graphql-java-extended-scalars>19.0</version.com.graphql-java-extended-scalars>
+
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
-index fedaf09a6..0244af88b 100644
+index 64c87c399..db9be21fa 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/pom.xml
-@@ -103,7 +103,7 @@
+@@ -123,7 +123,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
@@ -4134,11 +4311,11 @@ index fedaf09a6..0244af88b 100644
<executions>
<execution>
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
-index 27f4521fc..aae38c183 100644
+index 3f7398b44..b372926dc 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/CustomDashboardService.java
-@@ -16,20 +16,20 @@
-
+@@ -18,20 +18,20 @@
+ */
package org.kie.kogito.swf.tools.custom.dashboard;
-import javax.inject.Inject;
@@ -4168,10 +4345,10 @@ index 27f4521fc..aae38c183 100644
@Path("/customDashboard")
public class CustomDashboardService {
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
-index 535536b68..daaae6f58 100644
+index 9e7340b37..bc3f7d199 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverter.java
-@@ -20,8 +20,8 @@ import java.util.Collections;
+@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.StringTokenizer;
import java.util.stream.Collectors;
@@ -4183,10 +4360,10 @@ index 535536b68..daaae6f58 100644
import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
-index 92f881096..8a9ead2a9 100644
+index 45de74a77..fd968f5fa 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/converter/CustomDashboardFilterParamConverterProvider.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.swf.tools.custom.dashboard.converter;
+@@ -21,9 +21,9 @@ package org.kie.kogito.swf.tools.custom.dashboard.converter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -4200,10 +4377,10 @@ index 92f881096..8a9ead2a9 100644
import org.kie.kogito.swf.tools.custom.dashboard.model.CustomDashboardFilter;
diff --git a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
-index 6062b8c35..53782201f 100644
+index e6cd0387c..73583d44d 100644
--- a/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
+++ b/kogito-quarkus-serverless-workflow-devui-parent/kogito-quarkus-serverless-workflow-devui/src/main/java/org/kie/kogito/swf/tools/custom/dashboard/impl/CustomDashboardStorageImpl.java
-@@ -41,7 +41,7 @@ import java.util.TimeZone;
+@@ -43,7 +43,7 @@ import java.util.TimeZone;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -4213,10 +4390,10 @@ index 6062b8c35..53782201f 100644
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
diff --git a/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java b/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
-index 8f87e4e56..33808440a 100644
+index 827b4dea1..47bff272f 100644
--- a/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
+++ b/management-console/src/main/java/org/kie/kogito/mgmt/VertxRouter.java
-@@ -15,9 +15,8 @@
+@@ -18,9 +18,8 @@
*/
package org.kie.kogito.mgmt;
@@ -4228,7 +4405,7 @@ index 8f87e4e56..33808440a 100644
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -28,6 +27,7 @@ import io.vertx.core.http.HttpHeaders;
+@@ -31,6 +30,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.StaticHandler;
@@ -4237,10 +4414,10 @@ index 8f87e4e56..33808440a 100644
@ApplicationScoped
public class VertxRouter {
diff --git a/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java b/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
-index d8dd90c91..b91d746cc 100644
+index 62f2d796b..d6a4fc4df 100644
--- a/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
+++ b/management-console/src/test/java/org/kie/kogito/mgmt/NativeStaticContentTestIT.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.mgmt;
@@ -4253,10 +4430,10 @@ index d8dd90c91..b91d746cc 100644
// Execute the same tests but in native mode.
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
-index db44c00b6..2c67118a6 100644
+index 4d4ea17f9..6f60c7466 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/InfinispanHealthCheckProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.persistence.infinispan;
@@ -4270,10 +4447,10 @@ index db44c00b6..2c67118a6 100644
import org.eclipse.microprofile.health.Readiness;
import org.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
-index 0dfdecaba..34d30f7ee 100644
+index cfee4ee89..b8ee3ce36 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanCacheShutdownObserver.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.persistence.infinispan.cache;
+@@ -20,9 +20,9 @@ package org.kie.kogito.persistence.infinispan.cache;
import java.util.Optional;
@@ -4287,10 +4464,10 @@ index 0dfdecaba..34d30f7ee 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
-index dcefbb87a..386fc0f26 100644
+index ed1101d20..357694e2e 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageService.java
-@@ -17,11 +17,11 @@ package org.kie.kogito.persistence.infinispan.cache;
+@@ -20,11 +20,11 @@ package org.kie.kogito.persistence.infinispan.cache;
import java.util.Optional;
@@ -4307,10 +4484,10 @@ index dcefbb87a..386fc0f26 100644
import org.infinispan.client.hotrod.DataFormat;
import org.infinispan.client.hotrod.RemoteCache;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
-index 363822f1f..070a41391 100644
+index a18994b5c..784187ccf 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/JsonDataFormatMarshaller.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.persistence.infinispan.cache;
+@@ -21,8 +21,8 @@ package org.kie.kogito.persistence.infinispan.cache;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -4322,11 +4499,11 @@ index 363822f1f..070a41391 100644
import org.infinispan.commons.dataconversion.MediaType;
import org.infinispan.commons.io.ByteBuffer;
diff --git a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
-index cb4722bca..7edc18a92 100644
+index 8e42cfda2..4f2d6768e 100644
--- a/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
+++ b/persistence-commons/persistence-commons-infinispan/src/main/java/org/kie/kogito/persistence/infinispan/cache/ProtobufCacheService.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.persistence.infinispan.cache;
-import javax.enterprise.context.ApplicationScoped;
@@ -4337,10 +4514,10 @@ index cb4722bca..7edc18a92 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
-index e3a717627..636d8631e 100644
+index 4eee6b1fe..8b79bba80 100644
--- a/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
+++ b/persistence-commons/persistence-commons-infinispan/src/test/java/org/kie/kogito/persistence/infinispan/cache/InfinispanStorageIT.java
-@@ -21,7 +21,7 @@ import java.util.List;
+@@ -23,7 +23,7 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -4350,11 +4527,11 @@ index e3a717627..636d8631e 100644
import org.infinispan.client.hotrod.DefaultTemplate;
import org.infinispan.client.hotrod.RemoteCache;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
-index 89ef57e98..432a232f1 100644
+index 4a918da36..6e0af17de 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/client/MongoClientManager.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.persistence.mongodb.client;
-import javax.enterprise.context.ApplicationScoped;
@@ -4365,10 +4542,10 @@ index 89ef57e98..432a232f1 100644
import org.bson.Document;
import org.eclipse.microprofile.config.ConfigProvider;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
-index b0556974c..dea98ebf7 100644
+index eb379b3bd..173eb3f5f 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexManager.java
-@@ -25,11 +25,11 @@ import java.util.concurrent.ConcurrentHashMap;
+@@ -27,11 +27,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -4386,10 +4563,10 @@ index b0556974c..dea98ebf7 100644
import org.bson.Document;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
-index 03a92c616..375c51e74 100644
+index d68648d11..248ef1863 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/index/IndexSchemaAcceptor.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.mongodb.index;
+@@ -20,7 +20,7 @@ package org.kie.kogito.persistence.mongodb.index;
import java.util.Optional;
@@ -4399,11 +4576,11 @@ index 03a92c616..375c51e74 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.api.schema.SchemaAcceptor;
diff --git a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
-index f25664dcd..a2d5a7e03 100644
+index d51d0aba5..00297442b 100644
--- a/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
+++ b/persistence-commons/persistence-commons-mongodb/src/main/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManager.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.persistence.mongodb.storage;
-import javax.enterprise.context.ApplicationScoped;
@@ -4414,11 +4591,11 @@ index f25664dcd..a2d5a7e03 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
-index 24e0010b3..ec800d27f 100644
+index 737e0e587..2594c363f 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/client/MongoClientManagerIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.mongodb.client;
-import javax.inject.Inject;
@@ -4427,10 +4604,10 @@ index 24e0010b3..ec800d27f 100644
import org.bson.Document;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
-index 1c3f29ed4..c840956be 100644
+index 4a6021ba5..c9fab141a 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/index/IndexManagerIT.java
-@@ -27,7 +27,7 @@ import java.util.UUID;
+@@ -29,7 +29,7 @@ import java.util.UUID;
import java.util.stream.IntStream;
import java.util.stream.StreamSupport;
@@ -4440,11 +4617,11 @@ index 1c3f29ed4..c840956be 100644
import org.bson.Document;
import org.bson.conversions.Bson;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
-index f9182c865..be769e1bd 100644
+index 98e9f2984..0279ad54b 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockMongoModelService.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.mongodb.mock;
-import javax.enterprise.context.ApplicationScoped;
@@ -4453,10 +4630,10 @@ index f9182c865..be769e1bd 100644
import org.kie.kogito.persistence.mongodb.model.MongoEntityMapper;
import org.kie.kogito.persistence.mongodb.storage.MongoModelService;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
-index 1b75ed21a..66b397ee0 100644
+index 40a2dc61d..f5b5848e5 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/mock/MockProcessIndexEventListener.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.persistence.mongodb.mock;
+@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.mongodb.mock;
import java.util.Map;
@@ -4468,10 +4645,10 @@ index 1b75ed21a..66b397ee0 100644
import org.kie.kogito.persistence.mongodb.index.ProcessIndexEvent;
import org.mockito.Mockito;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
-index d0f7a6684..0a666417f 100644
+index 19289b04d..7c42b22d1 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/query/MongoQueryIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.mongodb.query;
+@@ -20,7 +20,7 @@ package org.kie.kogito.persistence.mongodb.query;
import java.util.List;
@@ -4481,11 +4658,11 @@ index d0f7a6684..0a666417f 100644
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
-index 5de327573..c3ee8ce1a 100644
+index 92a69676b..15a20d147 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.mongodb.storage;
-import javax.inject.Inject;
@@ -4494,11 +4671,11 @@ index 5de327573..c3ee8ce1a 100644
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
-index b3c8a6f5c..a238ac804 100644
+index e3bad6d69..c21664241 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/MongoStorageManagerIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.mongodb.storage;
-import javax.inject.Inject;
@@ -4507,11 +4684,11 @@ index b3c8a6f5c..a238ac804 100644
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
-index 8cbae2fe6..f38726810 100644
+index 58e39d4d9..4dcb7f437 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageListenerIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.mongodb.storage;
-import javax.inject.Inject;
@@ -4520,10 +4697,10 @@ index 8cbae2fe6..f38726810 100644
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
-index bb5b74de6..16cdab97b 100644
+index 36ffc7325..3191c32ce 100644
--- a/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
+++ b/persistence-commons/persistence-commons-mongodb/src/test/java/org/kie/kogito/persistence/mongodb/storage/StorageUtilsIT.java
-@@ -21,7 +21,7 @@ import java.util.concurrent.ConcurrentHashMap;
+@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -4533,10 +4710,10 @@ index bb5b74de6..16cdab97b 100644
import org.bson.Document;
import org.junit.jupiter.api.AfterEach;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
-index 5ab54e90a..d52ea5eb6 100644
+index 507ad8acd..45b33bc1f 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleQuery.java
-@@ -134,7 +134,7 @@ public class OracleQuery<T> implements Query<T> {
+@@ -137,7 +137,7 @@ public class OracleQuery<T> implements Query<T> {
}
LOGGER.debug("Executing Oracle query: {}", queryString);
@@ -4546,11 +4723,11 @@ index 5ab54e90a..d52ea5eb6 100644
.unwrap(NativeQuery.class)
.addScalar("json_value", new JsonBlobType(type));
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
-index fbc8c9916..7f8946ae8 100644
+index e577e7e40..853cdb29c 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/OracleStorageService.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.persistence.oracle;
-import javax.enterprise.context.ApplicationScoped;
@@ -4561,10 +4738,10 @@ index fbc8c9916..7f8946ae8 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
-index a1c98da33..7cbf7ce42 100644
+index 2a215f6a1..996177bfc 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntity.java
-@@ -18,13 +18,13 @@ package org.kie.kogito.persistence.oracle.model;
+@@ -20,13 +20,13 @@ package org.kie.kogito.persistence.oracle.model;
import java.util.Objects;
@@ -4586,11 +4763,11 @@ index a1c98da33..7cbf7ce42 100644
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
diff --git a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
-index 488d2dad3..c503ebc58 100644
+index 12eba177c..73500e84a 100644
--- a/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
+++ b/persistence-commons/persistence-commons-oracle/src/main/java/org/kie/kogito/persistence/oracle/model/CacheEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.oracle.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -4599,10 +4776,10 @@ index 488d2dad3..c503ebc58 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
-index 55b6b539e..4190ad22f 100644
+index 41134f0ff..60548c5de 100644
--- a/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
+++ b/persistence-commons/persistence-commons-oracle/src/test/java/org/kie/kogito/persistence/oracle/OracleStorageServiceIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.persistence.oracle;
+@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.oracle;
import java.util.List;
@@ -4614,10 +4791,10 @@ index 55b6b539e..4190ad22f 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
-index b17b3b19b..e01355e78 100644
+index 61605f336..cd6ab38b2 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresQuery.java
-@@ -133,7 +133,7 @@ public class PostgresQuery<T> implements Query<T> {
+@@ -136,7 +136,7 @@ public class PostgresQuery<T> implements Query<T> {
}
LOGGER.debug("Executing PostgreSQL query: {}", queryString);
@@ -4627,11 +4804,11 @@ index b17b3b19b..e01355e78 100644
if (limit != null) {
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
-index 066a04b31..86d09568c 100644
+index 4d5e60407..2517cc088 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/PostgresStorageService.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.persistence.postgresql;
-import javax.enterprise.context.ApplicationScoped;
@@ -4642,10 +4819,10 @@ index 066a04b31..86d09568c 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
-index 7e124c839..111e79ee5 100644
+index 1887cfc0f..0f58963f9 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntity.java
-@@ -18,13 +18,13 @@ package org.kie.kogito.persistence.postgresql.model;
+@@ -20,13 +20,13 @@ package org.kie.kogito.persistence.postgresql.model;
import java.util.Objects;
@@ -4667,11 +4844,11 @@ index 7e124c839..111e79ee5 100644
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
-index fea2b8f8f..e3cf4a46a 100644
+index 41eb084f8..d10a53a86 100644
--- a/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
+++ b/persistence-commons/persistence-commons-postgresql/src/main/java/org/kie/kogito/persistence/postgresql/model/CacheEntityRepository.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.postgresql.model;
-import javax.enterprise.context.ApplicationScoped;
@@ -4680,10 +4857,10 @@ index fea2b8f8f..e3cf4a46a 100644
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
diff --git a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
-index cb8f73be0..bb80385c6 100644
+index eb1c1cb7e..458bf5c04 100644
--- a/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
+++ b/persistence-commons/persistence-commons-postgresql/src/test/java/org/kie/kogito/persistence/postgresql/PostgresStorageServiceIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.persistence.postgresql;
+@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.postgresql;
import java.util.List;
@@ -4695,10 +4872,10 @@ index cb8f73be0..bb80385c6 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
-index 340e7bbfe..67f65e391 100644
+index 12ba72ae3..70f32eadf 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufMonitorService.java
-@@ -35,9 +35,9 @@ import java.util.concurrent.Executors;
+@@ -38,9 +38,9 @@ import java.util.concurrent.Executors;
import java.util.function.Consumer;
import java.util.stream.Stream;
@@ -4712,10 +4889,10 @@ index 340e7bbfe..67f65e391 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.slf4j.Logger;
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
-index bba5d16e8..b01a5d40d 100644
+index 723bc2f8d..3dbd6ba87 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/ProtobufService.java
-@@ -20,10 +20,10 @@ import java.util.Map;
+@@ -23,10 +23,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
@@ -4731,10 +4908,10 @@ index bba5d16e8..b01a5d40d 100644
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
diff --git a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
-index a7a89e9aa..8635a0643 100644
+index 3cec63c8e..dfb044c08 100644
--- a/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
+++ b/persistence-commons/persistence-commons-protobuf/src/main/java/org/kie/kogito/persistence/protobuf/domain/ProtoDomainModelProducer.java
-@@ -19,10 +19,10 @@ import java.util.List;
+@@ -22,10 +22,10 @@ import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -4750,11 +4927,11 @@ index a7a89e9aa..8635a0643 100644
import org.infinispan.protostream.descriptors.Descriptor;
import org.infinispan.protostream.descriptors.FieldDescriptor;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
-index 668880411..a4ae276c0 100644
+index 85177fe2e..03cdcfeaf 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtoDomainModelProducerTest.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.protobuf;
-import javax.enterprise.event.Event;
@@ -4763,11 +4940,11 @@ index 668880411..a4ae276c0 100644
import org.infinispan.protostream.FileDescriptorSource;
import org.infinispan.protostream.SerializationContext;
diff --git a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
-index 19d541998..1ca4e5cff 100644
+index 7d2ece432..ec696700d 100644
--- a/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
+++ b/persistence-commons/persistence-commons-protobuf/src/test/java/org/kie/kogito/persistence/protobuf/ProtobufServiceTest.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.persistence.protobuf;
-import javax.enterprise.event.Event;
@@ -4776,11 +4953,11 @@ index 19d541998..1ca4e5cff 100644
import org.infinispan.protostream.FileDescriptorSource;
import org.junit.jupiter.api.BeforeEach;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
-index 823cb487c..b89036a15 100644
+index 7ff1c43b9..edce31420 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisCacheManager.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.persistence.redis;
-import javax.enterprise.context.ApplicationScoped;
@@ -4791,10 +4968,10 @@ index 823cb487c..b89036a15 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
-index e16434998..092abee71 100644
+index b66a40e2a..7bf6c212d 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/RedisClientManager.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.redis;
+@@ -20,7 +20,7 @@ package org.kie.kogito.persistence.redis;
import java.net.URL;
@@ -4804,10 +4981,10 @@ index e16434998..092abee71 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
-index 855af8be9..fd51754fb 100644
+index a56f6f5a6..c0670c91b 100644
--- a/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
+++ b/persistence-commons/persistence-commons-redis/src/main/java/org/kie/kogito/persistence/redis/index/RedisIndexManager.java
-@@ -21,8 +21,8 @@ import java.util.List;
+@@ -23,8 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -4819,10 +4996,10 @@ index 855af8be9..fd51754fb 100644
import org.kie.kogito.persistence.redis.RedisClientManager;
import org.slf4j.Logger;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
-index f7d2e0146..5637a7c9a 100644
+index 4fb44daba..e7b433759 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/api/BaseMappingsApiV1.java
-@@ -19,7 +19,7 @@ import java.util.List;
+@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -4832,10 +5009,10 @@ index f7d2e0146..5637a7c9a 100644
import org.kie.kogito.persistence.reporting.database.DatabaseManager;
import org.kie.kogito.persistence.reporting.database.sqlbuilders.Context;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
-index 26e4c3206..2a45c8a59 100644
+index 26aaf9a90..1e36e9f8d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/main/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImpl.java
-@@ -21,7 +21,7 @@ import java.util.Map;
+@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -4845,10 +5022,10 @@ index 26e4c3206..2a45c8a59 100644
import org.kie.kogito.event.cloudevents.utils.CloudEventUtils;
import org.kie.kogito.persistence.reporting.database.sqlbuilders.ApplyMappingSqlBuilder;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
-index 6449043e5..1de12a454 100644
+index 87fe34377..d39bbd9ef 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-api/src/test/java/org/kie/kogito/persistence/reporting/database/BaseDatabaseManagerImplTest.java
-@@ -19,8 +19,8 @@ import java.util.Collections;
+@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -4860,10 +5037,10 @@ index 6449043e5..1de12a454 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
-index 9cf889b92..bec0dffab 100644
+index ac33ad148..6e221d6b0 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresBootstrapLoaderImpl.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
+@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
import java.io.InputStream;
import java.util.function.Supplier;
@@ -4873,10 +5050,10 @@ index 9cf889b92..bec0dffab 100644
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
-index bad13f86f..363ca75e7 100644
+index 5a11b721e..f0c29b19e 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/bootstrap/PostgresStartupHandlerImpl.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.persistence.postgresql.reporting.bootstrap;
@@ -4890,10 +5067,10 @@ index bad13f86f..363ca75e7 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.persistence.postgresql.reporting.database.BasePostgresDatabaseManagerImpl;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
-index ea180a3b5..c06e847b0 100644
+index 2a5a0f2d2..9bd51c5ec 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/BasePostgresDatabaseManagerImpl.java
-@@ -19,15 +19,15 @@ import java.util.List;
+@@ -22,15 +22,15 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -4919,10 +5096,10 @@ index ea180a3b5..c06e847b0 100644
import org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders.PostgresApplyMappingSqlBuilder;
import org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders.PostgresContext;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
-index da36c8e64..a967354ff 100644
+index 3771d5f51..a1be37f41 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilder.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
+@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
import java.util.List;
import java.util.stream.Collectors;
@@ -4932,10 +5109,10 @@ index da36c8e64..a967354ff 100644
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
-index e3b68c3e0..3fce27fad 100644
+index 6bd72bfa4..de26b8597 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresIndexesSqlBuilder.java
-@@ -19,7 +19,7 @@ import java.util.ArrayList;
+@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -4945,10 +5122,10 @@ index e3b68c3e0..3fce27fad 100644
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
-index 293d3c20c..22df950d1 100644
+index 3a694a96e..e48a86f53 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTableSqlBuilder.java
-@@ -20,7 +20,7 @@ import java.util.List;
+@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -4958,10 +5135,10 @@ index 293d3c20c..22df950d1 100644
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
-index cdd49bad6..38644dec2 100644
+index 20066cde1..7606e345d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerDeleteSqlBuilder.java
-@@ -19,7 +19,7 @@ import java.util.ArrayList;
+@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -4971,10 +5148,10 @@ index cdd49bad6..38644dec2 100644
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
-index dd3083db7..ab4c49ae7 100644
+index 11abb8df0..23ba0a902 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresTriggerInsertSqlBuilder.java
-@@ -22,7 +22,7 @@ import java.util.Objects;
+@@ -25,7 +25,7 @@ import java.util.Objects;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -4984,10 +5161,10 @@ index dd3083db7..ab4c49ae7 100644
import org.kie.kogito.persistence.postgresql.reporting.model.JsonType;
import org.kie.kogito.persistence.postgresql.reporting.model.PostgresField;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
-index 0e6b36ac9..87f6599c7 100644
+index 55e83a500..d4fddb836 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/main/java/org/kie/kogito/persistence/postgresql/reporting/service/PostgresMappingServiceImpl.java
-@@ -20,9 +20,9 @@ import java.util.Collections;
+@@ -23,9 +23,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -5001,10 +5178,10 @@ index 0e6b36ac9..87f6599c7 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.postgresql.PostgresStorageService;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
-index c68d7ea06..ee09897f0 100644
+index 6d91ed383..0eb57ab35 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-base/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/BaseSqlBuilderImplTest.java
-@@ -19,7 +19,7 @@ import java.util.List;
+@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -5014,10 +5191,10 @@ index c68d7ea06..ee09897f0 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
-index be8c522c8..cb03bc519 100644
+index 842750fea..ea32d382a 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1.java
-@@ -17,16 +17,16 @@ package org.kie.kogito.persistence.postgresql.reporting.api;
+@@ -20,16 +20,16 @@ package org.kie.kogito.persistence.postgresql.reporting.api;
import java.util.List;
@@ -5045,10 +5222,10 @@ index be8c522c8..cb03bc519 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
-index 7fb123fd6..dbc5e4f50 100644
+index 04b7b3e63..3aefb08bf 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/main/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImpl.java
-@@ -17,9 +17,9 @@ package org.kie.kogito.persistence.postgresql.reporting.database;
+@@ -20,9 +20,9 @@ package org.kie.kogito.persistence.postgresql.reporting.database;
import java.util.Objects;
@@ -5062,10 +5239,10 @@ index 7fb123fd6..dbc5e4f50 100644
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders.PostgresApplyMappingSqlBuilder;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
-index 506f0a72e..2bb42e2e8 100644
+index 275847a5b..72d39d221 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/BasicTypeMappingIT.java
-@@ -17,14 +17,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
+@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
import java.util.List;
@@ -5089,10 +5266,10 @@ index 506f0a72e..2bb42e2e8 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
-index c3b154c94..f7845cb99 100644
+index 68f8b41fb..d8e3ec81d 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/ComplexHierarchicalTypeMappingIT.java
-@@ -17,14 +17,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
+@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
import java.util.List;
@@ -5116,10 +5293,10 @@ index c3b154c94..f7845cb99 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
-index 90c0ce6d4..bdb6abf50 100644
+index 75143892e..8af6b9d1f 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/HierarchicalTypeMappingIT.java
-@@ -17,14 +17,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
+@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting;
import java.util.List;
@@ -5143,10 +5320,10 @@ index 90c0ce6d4..bdb6abf50 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
-index c78ff8beb..00aaf50b8 100644
+index c41816090..be090a04b 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/api/PostgresMappingsApiV1Test.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.postgresql.reporting.api;
+@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.postgresql.reporting.api;
import java.util.Collection;
import java.util.List;
@@ -5156,10 +5333,10 @@ index c78ff8beb..00aaf50b8 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
-index be8c17354..48631933e 100644
+index c6ed8a0fa..31a64a437 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/GenericPostgresDatabaseManagerImplTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.persistence.postgresql.reporting.database;
@@ -5169,10 +5346,10 @@ index be8c17354..48631933e 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
-index bef611620..6f53a51c8 100644
+index d685ff1bf..7de319f57 100644
--- a/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
+++ b/persistence-commons/persistence-commons-reporting-parent/persistence-commons-reporting-postgresql-generic/src/test/java/org/kie/kogito/persistence/postgresql/reporting/database/sqlbuilders/PostgresApplyMappingSqlBuilderIT.java
-@@ -17,14 +17,14 @@ package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
+@@ -20,14 +20,14 @@ package org.kie.kogito.persistence.postgresql.reporting.database.sqlbuilders;
import java.util.List;
@@ -5196,10 +5373,10 @@ index bef611620..6f53a51c8 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
-index bd503cd4b..514d67fd6 100644
+index e5dcfc806..adf8e901c 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/pom.xml
-@@ -98,7 +98,7 @@
+@@ -118,7 +118,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
@@ -5209,10 +5386,10 @@ index bd503cd4b..514d67fd6 100644
<executions>
<execution>
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
-index 9d6b1f1b1..4677b67e1 100644
+index 96a0cde27..2a3a7dc67 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/FormsService.java
-@@ -18,23 +18,23 @@ package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms;
+@@ -20,23 +20,23 @@ package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms;
import java.io.FileNotFoundException;
@@ -5248,10 +5425,10 @@ index 9d6b1f1b1..4677b67e1 100644
@Path("/forms")
public class FormsService {
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
-index c4ce69407..dae460e11 100644
+index 6a37f9014..ecd1c17c0 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverter.java
-@@ -20,8 +20,8 @@ import java.util.Collections;
+@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.StringTokenizer;
import java.util.stream.Collectors;
@@ -5263,10 +5440,10 @@ index c4ce69407..dae460e11 100644
import org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model.FormFilter;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
-index 6b50c9438..8ac56f9c8 100644
+index 9104f319b..f63af8b16 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/converter/FormFilterParamConverterProvider.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.converter;
+@@ -21,9 +21,9 @@ package org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.converter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -5280,10 +5457,10 @@ index 6b50c9438..8ac56f9c8 100644
import org.kie.kogito.runtime.tools.quarkus.extension.runtime.forms.model.FormFilter;
diff --git a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
-index 11812e67f..442b2dc84 100644
+index 5f1b2cf03..a3ba9df62 100644
--- a/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
+++ b/runtime-tools-quarkus-extension-parent/runtime-tools-quarkus-extension/src/main/java/org/kie/kogito/runtime/tools/quarkus/extension/runtime/forms/impl/FormsStorageImpl.java
-@@ -32,7 +32,7 @@ import java.util.Map;
+@@ -34,7 +34,7 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.stream.Collectors;
@@ -5293,10 +5470,10 @@ index 11812e67f..442b2dc84 100644
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
diff --git a/security-commons/src/main/java/org/kie/kogito/security/UserResource.java b/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
-index e9cfce2af..8c1be8fdc 100644
+index 149df3547..9cede72b8 100644
--- a/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
+++ b/security-commons/src/main/java/org/kie/kogito/security/UserResource.java
-@@ -18,11 +18,11 @@ package org.kie.kogito.security;
+@@ -21,11 +21,11 @@ package org.kie.kogito.security;
import java.util.Collections;
import java.util.Set;
@@ -5314,10 +5491,10 @@ index e9cfce2af..8c1be8fdc 100644
import org.jboss.resteasy.annotations.cache.NoCache;
diff --git a/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java b/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
-index 7c257523f..f4ed226ad 100644
+index a6540fbee..7635125d0 100644
--- a/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
+++ b/task-console/src/main/java/org/kie/kogito/task/console/VertxRouter.java
-@@ -15,9 +15,8 @@
+@@ -18,9 +18,8 @@
*/
package org.kie.kogito.task.console;
@@ -5329,7 +5506,7 @@ index 7c257523f..f4ed226ad 100644
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -28,6 +27,7 @@ import io.vertx.core.http.HttpHeaders;
+@@ -31,6 +30,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.StaticHandler;
@@ -5338,10 +5515,10 @@ index 7c257523f..f4ed226ad 100644
@ApplicationScoped
public class VertxRouter {
diff --git a/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java b/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
-index c31e40da8..008174207 100644
+index ea181adfa..39d094906 100644
--- a/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
+++ b/task-console/src/test/java/org/kie/kogito/task/console/NativeStaticContentTestIT.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.task.console;
@@ -5354,10 +5531,10 @@ index c31e40da8..008174207 100644
// Execute the same tests but in native mode.
diff --git a/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java b/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
-index 301bc2ed3..bd153605d 100644
+index 4f7cb7e07..87b37272a 100644
--- a/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
+++ b/trusty-ui/src/main/java/org/kie/kogito/trusty/ui/VertxRouter.java
-@@ -15,9 +15,8 @@
+@@ -18,9 +18,8 @@
*/
package org.kie.kogito.trusty.ui;
@@ -5369,7 +5546,7 @@ index 301bc2ed3..bd153605d 100644
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@@ -28,6 +27,7 @@ import io.vertx.core.http.HttpHeaders;
+@@ -31,6 +30,7 @@ import io.vertx.core.http.HttpHeaders;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.StaticHandler;
@@ -5378,10 +5555,10 @@ index 301bc2ed3..bd153605d 100644
@ApplicationScoped
public class VertxRouter {
diff --git a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
-index 3f4642f92..c0b6ad9a7 100644
+index b0a7e0c04..cbfdfba23 100644
--- a/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
+++ b/trusty-ui/src/test/java/org/kie/kogito/trusty/ui/NativeStaticContentTestIT.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
*/
package org.kie.kogito.trusty.ui;
@@ -5394,10 +5571,10 @@ index 3f4642f92..c0b6ad9a7 100644
// Execute the same tests but in native mode.
}
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
-index 4eaa660e0..b925128a2 100644
+index 7bcda7da0..24dc09230 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/requests/CounterfactualRequest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.trusty.service.common.requests;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.requests;
import java.util.List;
import java.util.Objects;
@@ -5407,10 +5584,10 @@ index 4eaa660e0..b925128a2 100644
import org.kie.kogito.explainability.api.CounterfactualSearchDomain;
import org.kie.kogito.explainability.api.NamedTypedValue;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
-index e9efcb1f2..1eaf7ad54 100644
+index ba283d697..a6aa0cca6 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualRequestResponse.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.trusty.service.common.responses;
+@@ -20,7 +20,7 @@ package org.kie.kogito.trusty.service.common.responses;
import java.util.Objects;
@@ -5420,10 +5597,10 @@ index e9efcb1f2..1eaf7ad54 100644
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
-index 3accd19e1..3a00c3f31 100644
+index 3998ed525..82bdf6dc1 100644
--- a/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
+++ b/trusty/trusty-service/trusty-service-api/src/main/java/org/kie/kogito/trusty/service/common/responses/CounterfactualResultsResponse.java
-@@ -19,8 +19,8 @@ import java.util.Collection;
+@@ -22,8 +22,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -5435,10 +5612,10 @@ index 3accd19e1..3a00c3f31 100644
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
-index 2967daa85..d858fd33c 100644
+index 24f9f0b16..9ad7dede6 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/TrustyServiceImpl.java
-@@ -25,8 +25,8 @@ import java.util.Objects;
+@@ -27,8 +27,8 @@ import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -5450,10 +5627,10 @@ index 2967daa85..d858fd33c 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
-index f81bdc207..9419d7ad0 100644
+index 84f79a4b3..a50d84b2c 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/DecisionsApiV1.java
-@@ -18,12 +18,12 @@ package org.kie.kogito.trusty.service.common.api;
+@@ -20,12 +20,12 @@ package org.kie.kogito.trusty.service.common.api;
import java.util.Optional;
@@ -5473,10 +5650,10 @@ index f81bdc207..9419d7ad0 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
-index e28a06dbb..df4999c8f 100644
+index c31a31bb8..afbfb2071 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExecutionsApiV1.java
-@@ -27,13 +27,13 @@ import java.util.ArrayList;
+@@ -29,13 +29,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -5498,10 +5675,10 @@ index e28a06dbb..df4999c8f 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
-index 5195f0b3a..0f4ecd2a8 100644
+index 5e42440b6..5d7d9067b 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1.java
-@@ -20,14 +20,14 @@ import java.util.List;
+@@ -22,14 +22,14 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@@ -5525,10 +5702,10 @@ index 5195f0b3a..0f4ecd2a8 100644
import org.eclipse.microprofile.openapi.annotations.Operation;
import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
-index cc6600358..788eeba79 100644
+index d4068a31a..35725a8d2 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerDuplicates.java
-@@ -19,8 +19,8 @@ import java.util.ArrayList;
+@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -5540,10 +5717,10 @@ index cc6600358..788eeba79 100644
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
import org.kie.kogito.persistence.api.Storage;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
-index 4c7ad9a7b..2d62ec170 100644
+index b0a361ae5..09fdd44f8 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainabilityResultsManagerSlidingWindow.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.trusty.service.common.handlers;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.handlers;
import java.util.ArrayList;
import java.util.List;
@@ -5553,10 +5730,10 @@ index 4c7ad9a7b..2d62ec170 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
-index c29df8e1d..2138e8cec 100644
+index 0c0c73026..3199a033e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/CounterfactualExplainerServiceHandler.java
-@@ -19,8 +19,8 @@ import java.util.Collections;
+@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -5568,10 +5745,10 @@ index c29df8e1d..2138e8cec 100644
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
-index d3b5bcf52..404043c06 100644
+index ea0a1a2f9..cd2654a92 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistry.java
-@@ -17,10 +17,10 @@ package org.kie.kogito.trusty.service.common.handlers;
+@@ -20,10 +20,10 @@ package org.kie.kogito.trusty.service.common.handlers;
import java.util.Optional;
@@ -5587,10 +5764,10 @@ index d3b5bcf52..404043c06 100644
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
-index 38bfb8a09..dda4e58a9 100644
+index 19471f3db..10d60d457 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMEExplainerServiceHandler.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.service.common.handlers;
@@ -5602,10 +5779,10 @@ index 38bfb8a09..dda4e58a9 100644
import org.kie.kogito.explainability.api.BaseExplainabilityResult;
import org.kie.kogito.explainability.api.LIMEExplainabilityResult;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
-index cc364079d..26db25345 100644
+index af3cc0d2c..e111fe77e 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/handlers/LIMESaliencyConverter.java
-@@ -21,8 +21,8 @@ import java.util.Map;
+@@ -24,8 +24,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -5617,10 +5794,10 @@ index cc364079d..26db25345 100644
import org.kie.kogito.explainability.api.LIMEExplainabilityResult;
import org.kie.kogito.explainability.api.SaliencyModel;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
-index 36f77f0a7..d33333c09 100644
+index 7d238766e..81c5aaf71 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumer.java
-@@ -19,8 +19,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
+@@ -21,8 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -5632,10 +5809,10 @@ index 36f77f0a7..d33333c09 100644
import org.eclipse.microprofile.context.ManagedExecutor;
import org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
-index aff5e9d22..7b262c794 100644
+index c1518e8fa..ffcf871c5 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/ModelEventConsumer.java
-@@ -19,8 +19,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
+@@ -21,8 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -5647,10 +5824,10 @@ index aff5e9d22..7b262c794 100644
import org.eclipse.microprofile.context.ManagedExecutor;
import org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
-index 8787049b8..dffbc8295 100644
+index 24ef1da19..cd0419710 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/incoming/TraceEventConsumer.java
-@@ -19,8 +19,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
+@@ -21,8 +21,8 @@ package org.kie.kogito.trusty.service.common.messaging.incoming;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
@@ -5662,10 +5839,10 @@ index 8787049b8..dffbc8295 100644
import org.eclipse.microprofile.context.ManagedExecutor;
import org.eclipse.microprofile.reactive.messaging.Incoming;
diff --git a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
-index d48b84ec4..b031c22bd 100644
+index 87bd4862f..879931c81 100644
--- a/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
+++ b/trusty/trusty-service/trusty-service-common/src/main/java/org/kie/kogito/trusty/service/common/messaging/outgoing/ExplainabilityRequestProducer.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.trusty.service.common.messaging.outgoing;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.messaging.outgoing;
import java.net.URI;
import java.util.Optional;
@@ -5675,10 +5852,10 @@ index d48b84ec4..b031c22bd 100644
import org.eclipse.microprofile.reactive.messaging.Outgoing;
import org.kie.kogito.event.cloudevents.utils.CloudEventUtils;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
-index 52838d192..a0dcd53d4 100644
+index df11cf48a..0783967a5 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/AbstractTrustyServiceIT.java
-@@ -24,7 +24,7 @@ import java.util.Collection;
+@@ -26,7 +26,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -5688,11 +5865,11 @@ index 52838d192..a0dcd53d4 100644
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
-index e72955d17..afceb90b0 100644
+index adcb55291..607d21bcc 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/CacheManagerServiceMock.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.trusty.service.common;
-import javax.enterprise.context.ApplicationScoped;
@@ -5701,10 +5878,10 @@ index e72955d17..afceb90b0 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.StorageService;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
-index 68ecd7164..13c562803 100644
+index bf99e6d1d..9a8797bd1 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/StorageExceptionsProviderMock.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.service.common;
@@ -5714,10 +5891,10 @@ index 68ecd7164..13c562803 100644
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
-index e059b2d52..c95990070 100644
+index df6a168f1..16a27996a 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/TrustyServiceTest.java
-@@ -25,7 +25,7 @@ import java.util.UUID;
+@@ -27,7 +27,7 @@ import java.util.UUID;
import java.util.stream.IntStream;
import java.util.stream.Stream;
@@ -5727,10 +5904,10 @@ index e059b2d52..c95990070 100644
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
-index a4fc6f610..f3de72b2d 100644
+index d9b6e4cff..f1868a817 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1IT.java
-@@ -24,7 +24,7 @@ import java.util.List;
+@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -5740,10 +5917,10 @@ index a4fc6f610..f3de72b2d 100644
import org.apache.commons.lang3.builder.CompareToBuilder;
import org.junit.jupiter.api.Test;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
-index 3c1b6d508..0e1b5af8c 100644
+index 851ec1f1d..57848b88e 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/api/ExplainabilityApiV1Test.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.trusty.service.common.api;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.api;
import java.util.Collections;
import java.util.List;
@@ -5753,10 +5930,10 @@ index 3c1b6d508..0e1b5af8c 100644
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
-index 7cf08439c..0181f25a6 100644
+index b4a3614be..d7a4a5204 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/handlers/ExplainerServiceHandlerRegistryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.trusty.service.common.handlers;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.handlers;
import java.util.List;
import java.util.stream.Stream;
@@ -5766,11 +5943,11 @@ index 7cf08439c..0181f25a6 100644
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
-index e55366c27..fa91bf4ff 100644
+index a3abced09..ab482651c 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractModelEventConsumerIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.trusty.service.common.messaging.incoming;
-import javax.inject.Inject;
@@ -5779,11 +5956,11 @@ index e55366c27..fa91bf4ff 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.AfterEach;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
-index 2fe3711b3..87f957feb 100644
+index 2cab3ca97..5f7c2c970 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/AbstractTraceEventConsumerIT.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.trusty.service.common.messaging.incoming;
-import javax.inject.Inject;
@@ -5792,10 +5969,10 @@ index 2fe3711b3..87f957feb 100644
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.json.JSONException;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
-index 2a02320ba..1147c1c80 100644
+index ac7ead7d3..8e6c9b2f8 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/messaging/incoming/ExplainabilityResultConsumerTest.java
-@@ -20,7 +20,7 @@ import java.net.URI;
+@@ -22,7 +22,7 @@ import java.net.URI;
import java.time.Duration;
import java.util.stream.Stream;
@@ -5805,10 +5982,10 @@ index 2a02320ba..1147c1c80 100644
import org.apache.commons.lang3.builder.CompareToBuilder;
import org.awaitility.Awaitility;
diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
-index 041bbc809..14094c3bb 100644
+index a045439cb..c32b031fa 100644
--- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
+++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/mocks/StorageImplMock.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.trusty.service.common.mocks;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.service.common.mocks;
import java.util.HashMap;
import java.util.Map;
@@ -5818,10 +5995,10 @@ index 041bbc809..14094c3bb 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.query.Query;
diff --git a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
-index d50fa5075..b32d42d2b 100644
+index ea32a4820..69d2cd0de 100644
--- a/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
+++ b/trusty/trusty-service/trusty-service-infinispan/src/test/java/org/kie/kogito/trusty/service/infinispan/NativeInfinispanTrustyServiceIT.java
-@@ -19,12 +19,12 @@ import org.junit.jupiter.api.Test;
+@@ -22,12 +22,12 @@ import org.junit.jupiter.api.Test;
import org.kie.kogito.testcontainers.quarkus.InfinispanQuarkusTestResource;
import io.quarkus.test.common.QuarkusTestResource;
@@ -5837,10 +6014,10 @@ index d50fa5075..b32d42d2b 100644
public class NativeInfinispanTrustyServiceIT {
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
-index b29953d32..2e5602a8e 100644
+index 0adc748c4..76674607f 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/Execution.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.trusty.storage.api.model;
+@@ -20,7 +20,7 @@ package org.kie.kogito.trusty.storage.api.model;
import java.util.Objects;
@@ -5850,10 +6027,10 @@ index b29953d32..2e5602a8e 100644
import org.kie.kogito.ModelDomain;
import org.kie.kogito.trusty.storage.api.model.decision.Decision;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
-index ab95bde83..2ac07a8be 100644
+index 0e2f88c30..0d685d034 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/decision/Decision.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.trusty.storage.api.model.decision;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.storage.api.model.decision;
import java.util.Collection;
import java.util.List;
@@ -5863,10 +6040,10 @@ index ab95bde83..2ac07a8be 100644
import org.kie.kogito.ModelDomain;
import org.kie.kogito.trusty.storage.api.model.Execution;
diff --git a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
-index 053a6866c..a1fc58ec1 100644
+index 3dd0d6d2c..c6b63b4a7 100644
--- a/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
+++ b/trusty/trusty-storage/trusty-storage-api/src/main/java/org/kie/kogito/trusty/storage/api/model/process/Process.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.trusty.storage.api.model.process;
+@@ -21,7 +21,7 @@ package org.kie.kogito.trusty.storage.api.model.process;
import java.util.Collection;
import java.util.List;
@@ -5876,11 +6053,11 @@ index 053a6866c..a1fc58ec1 100644
import org.kie.kogito.ModelDomain;
import org.kie.kogito.trusty.storage.api.model.Execution;
diff --git a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
-index cfb7b8340..02f496677 100644
+index 5b466b32c..1062295ad 100644
--- a/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
+++ b/trusty/trusty-storage/trusty-storage-common/src/main/java/org/kie/kogito/trusty/storage/common/TrustyStorageServiceImpl.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.trusty.storage.common;
-import javax.enterprise.context.ApplicationScoped;
@@ -5891,11 +6068,11 @@ index cfb7b8340..02f496677 100644
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
-index 155b627f8..6276f244b 100644
+index 4019b0015..f9d5eed48 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/InfinispanStorageExceptionsProviderImpl.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.trusty.storage.infinispan;
-import javax.enterprise.context.ApplicationScoped;
@@ -5904,10 +6081,10 @@ index 155b627f8..6276f244b 100644
import org.infinispan.client.hotrod.exceptions.HotRodClientException;
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
diff --git a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
-index fdf4ff346..e28c27e21 100644
+index 46d7c5993..0fd3f3c45 100644
--- a/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
+++ b/trusty/trusty-storage/trusty-storage-infinispan/src/main/java/org/kie/kogito/trusty/storage/infinispan/ProtostreamProducer.java
-@@ -18,9 +18,9 @@ package org.kie.kogito.trusty.storage.infinispan;
+@@ -20,9 +20,9 @@ package org.kie.kogito.trusty.storage.infinispan;
import java.io.IOException;
@@ -5921,10 +6098,10 @@ index fdf4ff346..e28c27e21 100644
import org.infinispan.protostream.FileDescriptorSource;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
-index 298ef70fe..964e084da 100644
+index 34d80b0ca..bdc667512 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/BaseTransactionalStorage.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.trusty.storage.postgresql;
+@@ -20,7 +20,7 @@ package org.kie.kogito.trusty.storage.postgresql;
import java.util.Map;
@@ -5934,10 +6111,10 @@ index 298ef70fe..964e084da 100644
import org.kie.kogito.persistence.api.Storage;
import org.kie.kogito.persistence.api.query.Query;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
-index d1205858c..c5575e207 100644
+index 5d864d679..557a3fd60 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualRequestsStorage.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
@@ -5949,10 +6126,10 @@ index d1205858c..c5575e207 100644
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
-index 5d426ce29..a80bef55d 100644
+index 5d32a751d..bfecf64ff 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/CounterfactualResultsStorage.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
@@ -5964,10 +6141,10 @@ index 5d426ce29..a80bef55d 100644
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
-index c90f6527f..f5338c094 100644
+index d65c93d5b..b82edfa73 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DMNModelWithMetadataStorage.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
@@ -5979,10 +6156,10 @@ index c90f6527f..f5338c094 100644
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.kie.kogito.trusty.storage.api.model.decision.DMNModelWithMetadata;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
-index c92a9a5ed..32aa0e5f1 100644
+index 088ac2254..ec0e3ef40 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/DecisionsStorage.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
@@ -5994,10 +6171,10 @@ index c92a9a5ed..32aa0e5f1 100644
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
import org.kie.kogito.trusty.storage.api.model.decision.Decision;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
-index 7e94f6ca6..843707bc1 100644
+index 4a9682177..26f9859c5 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/LIMEResultsStorage.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
@@ -6009,10 +6186,10 @@ index 7e94f6ca6..843707bc1 100644
import org.kie.kogito.explainability.api.LIMEExplainabilityResult;
import org.kie.kogito.persistence.postgresql.model.CacheEntityRepository;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
-index a39b272a8..b88041da3 100644
+index 84708d27b..3ac411891 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgreSQLStorageExceptionsProviderImpl.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
*/
package org.kie.kogito.trusty.storage.postgresql;
@@ -6022,11 +6199,11 @@ index a39b272a8..b88041da3 100644
import org.hibernate.exception.JDBCConnectionException;
import org.kie.kogito.trusty.storage.api.StorageExceptionsProvider;
diff --git a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
-index 951905e11..ee4e19533 100644
+index 7e78902a8..6e174a82a 100644
--- a/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
+++ b/trusty/trusty-storage/trusty-storage-postgresql/src/main/java/org/kie/kogito/trusty/storage/postgresql/PostgresStorageService.java
-@@ -16,8 +16,8 @@
-
+@@ -18,8 +18,8 @@
+ */
package org.kie.kogito.trusty.storage.postgresql;
-import javax.enterprise.context.ApplicationScoped;
@@ -6037,11 +6214,11 @@ index 951905e11..ee4e19533 100644
import org.kie.kogito.explainability.api.CounterfactualExplainabilityRequest;
import org.kie.kogito.explainability.api.CounterfactualExplainabilityResult;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
-index 143ffd40f..0796d5d1f 100644
+index c27f0f914..a4e939c89 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/IndexProvider.java
-@@ -16,10 +16,10 @@
-
+@@ -18,10 +18,10 @@
+ */
package org.kie.kogito.trusty.storage.redis;
-import javax.annotation.PostConstruct;
@@ -6055,11 +6232,11 @@ index 143ffd40f..0796d5d1f 100644
import org.kie.kogito.persistence.redis.index.RedisCreateIndexEvent;
import org.kie.kogito.persistence.redis.index.RedisIndexManager;
diff --git a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
-index 8483d46ed..60ab013d1 100644
+index a76720612..a5433220a 100644
--- a/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
+++ b/trusty/trusty-storage/trusty-storage-redis/src/main/java/org/kie/kogito/trusty/storage/redis/RedisStorageExceptionsProviderImpl.java
-@@ -16,7 +16,7 @@
-
+@@ -18,7 +18,7 @@
+ */
package org.kie.kogito.trusty.storage.redis;
-import javax.enterprise.context.ApplicationScoped;
diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml
index 46b5569fe..d3a1ebfbd 100644
--- a/.ci/environments/quarkus-3/quarkus3.yml
+++ b/.ci/environments/quarkus-3/quarkus3.yml
@@ -1,34 +1,16 @@
-#
-# 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.
-#
-
name: io.quarkus.openrewrite.Quarkus
description: Update Quarkus version and refactor imports and resources if needed.
type: specs.openrewrite.org/v1beta/recipe
recipeList:
- org.openrewrite.maven.ChangePropertyValue: {
key: version.io.quarkus,
- newValue: 3.0.0.Final
+ newValue: 3.2.9.Final
}
- org.openrewrite.maven.ChangePropertyValue: {
key: version.org.optaplanner,
newValue: 9.44.0.Final
}
+- org.kie.kogito-apps.Quarkus3Migration
- org.kie.ManagedDependencies
- io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse
- org.openrewrite.java.migrate.jakarta.JavaxActivationMigrationToJakartaActivation
@@ -81,9 +63,18 @@ tags: [
quarkus
]
---
-description: Update all managed dependencies based on dependency updates from Quarkus.
+type: specs.openrewrite.org/v1beta/recipe
+name: org.kie.kogito-apps.Quarkus3Migration
+displayName: All Quarkus 3 Migration for Kogito-Apps project
+recipeList:
+- org.openrewrite.maven.ChangePropertyValue: {
+ newValue: 1.5.5.Final,
+ key: version.org.mapstruct
+ }
+---
name: org.kie.ManagedDependencies
-displayName: Update Managed Dependencies
+description: Update all managed dependencies based on dependency updates from Quarkus.
+type: specs.openrewrite.org/v1beta/recipe
recipeList:
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: {
oldGroupId: javax.activation,
@@ -468,7 +459,7 @@ recipeList:
newGroupId: org.keycloak,
newArtifactId: keycloak-admin-client-jakarta
}
-type: specs.openrewrite.org/v1beta/recipe
+displayName: Update Managed Dependencies
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.updates.core.quarkus30.UpgradeQuarkiverse
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org