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:13 UTC

(incubator-kie-kogito-runtimes) branch q3lts created (now c24f3ccbe6)

This is an automated email from the ASF dual-hosted git repository.

mariofusco pushed a change to branch q3lts
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git


      at c24f3ccbe6 wip

This branch includes the following new commits:

     new 4c14480806 Bump to Quarkus 3.2.9.Final
     new 6d01db12a6 [Quarkus 3] Updated rewrite data
     new 5bb12cc41f fixed quarkus3 patches
     new 7502f6b171 Apply patches
     new 0c56856225 wip : fix jakarta.validation-api version
     new 025211769e wip
     new c24f3ccbe6 wip

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 05/07: wip : fix jakarta.validation-api version

Posted by ma...@apache.org.
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-runtimes.git

commit 0c56856225982fea4cdf254453b17b915f6ebf9b
Author: mariofusco <ma...@gmail.com>
AuthorDate: Wed Nov 22 15:36:36 2023 +0100

    wip : fix jakarta.validation-api version
---
 .ci/environments/quarkus-3/patches/0001_before_sh.patch | 1 -
 kogito-codegen-modules/kogito-codegen-processes/pom.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
index 146c57d058..dbfc77f131 100644
--- a/.ci/environments/quarkus-3/patches/0001_before_sh.patch
+++ b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
@@ -588,7 +588,6 @@ index 6029d9bae8..ae1e860a0b 100644
 +      <groupId>jakarta.validation</groupId>
 +      <artifactId>jakarta.validation-api</artifactId>
        <scope>test</scope>
-+      <version>3.0.2.redhat-00005</version>
      </dependency>
    </dependencies>
  
diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml
index ae1e860a0b..38bdd0522d 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml
+++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml
@@ -120,7 +120,6 @@
       <groupId>jakarta.validation</groupId>
       <artifactId>jakarta.validation-api</artifactId>
       <scope>test</scope>
-      <version>3.0.2.redhat-00005</version>
     </dependency>
   </dependencies>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 03/07: fixed quarkus3 patches

Posted by ma...@apache.org.
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-runtimes.git

commit 5bb12cc41f2cb445af45e12529e9787c382e9f93
Author: Toshiya Kobayashi <to...@gmail.com>
AuthorDate: Wed Nov 22 17:46:23 2023 +0900

    fixed quarkus3 patches
---
 .../patches/0002_javax.ws_to_jakarta.ws.patch      | 50 ++-----------------
 .../0003_javax.inject_to_jakarta.inject.patch      | 57 ----------------------
 ...04_javax.enterprise_to_jakarta.enterprise.patch | 51 +------------------
 ...05_javax.annotation_to_jakarta.annotation.patch | 13 -----
 ...5_javax.inject_to_jakarta.inject-api.deps.patch |  6 +--
 .../patches/0016_update_dependencies_version.patch | 20 ++++----
 6 files changed, 18 insertions(+), 179 deletions(-)

diff --git a/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch b/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch
index e8b8af0475..52aba1d51a 100644
--- a/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch
+++ b/.ci/environments/quarkus-3/patches/0002_javax.ws_to_jakarta.ws.patch
@@ -34,8 +34,7 @@ diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/
 index 7f07766c1c..d983b515cf 100644
 --- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
 +++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
-@@ -17,14 +17,14 @@ package org.kie.dmn.kogito.quarkus.example;
- 
+@@ -23,14 +23,14 @@ package org.kie.dmn.kogito.quarkus.example;
  import java.util.stream.Collectors;
  
 -import javax.ws.rs.Consumes;
@@ -54,7 +53,8 @@ index 7f07766c1c..d983b515cf 100644
 +import jakarta.ws.rs.core.MediaType;
 +import jakarta.ws.rs.core.Response;
 +import jakarta.ws.rs.core.Response.ResponseBuilder;
- 
+
+ import org.kie.dmn.feel.codegen.feel11.CodegenStringUtil;
  import org.kie.kogito.Application;
  import org.kie.kogito.dmn.rest.DMNEvaluationErrorException;
 @@ -82,7 +82,7 @@ public class DMNRestResourceTemplate {
@@ -214,7 +214,7 @@ diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/
 index c9611d5a32..bf7aff2b2e 100644
 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
 +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
-@@ -1,8 +1,8 @@
+@@ -19,8 +19,8 @@
  import javax.enterprise.context.ApplicationScoped;
 -import javax.ws.rs.GET;
 -import javax.ws.rs.Path;
@@ -227,48 +227,6 @@ index c9611d5a32..bf7aff2b2e 100644
  
  import org.eclipse.microprofile.openapi.annotations.tags.Tag;
  
-diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java
-index 39b86127ef..10cfcda88f 100644
---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java
-+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryJavaTemplate.java
-@@ -18,11 +18,11 @@ package com.myspace.demo;
- import java.util.List;
- import java.util.Map;
- 
--import javax.ws.rs.Consumes;
--import javax.ws.rs.POST;
--import javax.ws.rs.Path;
--import javax.ws.rs.Produces;
--import javax.ws.rs.core.MediaType;
-+import jakarta.ws.rs.Consumes;
-+import jakarta.ws.rs.POST;
-+import jakarta.ws.rs.Path;
-+import jakarta.ws.rs.Produces;
-+import jakarta.ws.rs.core.MediaType;
- 
- import org.drools.ruleunits.api.RuleUnit;
- import org.drools.ruleunits.api.RuleUnitInstance;
-diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java
-index 3447ad6f97..4bfc800f1a 100644
---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java
-+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java
-@@ -18,11 +18,11 @@ package com.myspace.demo;
- import java.util.List;
- import java.util.Map;
- 
--import javax.ws.rs.Consumes;
--import javax.ws.rs.POST;
--import javax.ws.rs.Path;
--import javax.ws.rs.Produces;
--import javax.ws.rs.core.MediaType;
-+import jakarta.ws.rs.Consumes;
-+import jakarta.ws.rs.POST;
-+import jakarta.ws.rs.Path;
-+import jakarta.ws.rs.Produces;
-+import jakarta.ws.rs.core.MediaType;
- 
- import org.drools.ruleunits.api.RuleUnit;
- import org.drools.ruleunits.api.RuleUnitInstance;
 diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java
 index 7fdbefde91..8920575b8a 100644
 --- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java
diff --git a/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch b/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch
index 810fc5b089..7606b2be78 100644
--- a/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch
+++ b/.ci/environments/quarkus-3/patches/0003_javax.inject_to_jakarta.inject.patch
@@ -36,37 +36,6 @@ index c15aa39596..bd1e412b4f 100644
  
      protected QuarkusKogitoBuildContext(QuarkusKogitoBuildContextBuilder builder) {
          super(builder, new CDIDependencyInjectionAnnotator(), new CDIRestAnnotator(), CONTEXT_NAME);
-diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-index ec8ccb9839..54cef037a5 100644
---- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-+++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-@@ -44,7 +44,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public <T extends NodeWithAnnotations<?>> T withNamed(T node, String name) {
--        node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.inject.Named"), new StringLiteralExpr(name)));
-+        node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.inject.Named"), new StringLiteralExpr(name)));
-         return node;
-     }
- 
-@@ -61,7 +61,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public <T extends NodeWithAnnotations<?>> T withSingletonComponent(T node) {
--        node.addAnnotation("javax.inject.Singleton");
-+        node.addAnnotation("jakarta.inject.Singleton");
-         return node;
-     }
- 
-@@ -72,7 +72,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public <T extends NodeWithAnnotations<?>> T withInjection(T node, boolean lazy) {
--        node.addAnnotation("javax.inject.Inject");
-+        node.addAnnotation("jakarta.inject.Inject");
-         return node;
-     }
- 
 diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
 index c1b9d1cdc1..64bd6d374c 100644
 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
@@ -296,32 +265,6 @@ index 2606d530d8..2897c9829e 100644
  
  import org.kie.kogito.eventdriven.rules.AbstractEventDrivenQueryExecutor;
  import org.drools.ruleunits.api.RuleUnit;
-diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java
-index 606b30f790..fe0f357f40 100644
---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java
-+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/KogitoObjectMapperQuarkusTemplate.java
-@@ -21,7 +21,7 @@ import java.io.IOException;
- import java.util.List;
- 
- import com.fasterxml.jackson.databind.JavaType;
--import javax.inject.Singleton;
-+import jakarta.inject.Singleton;
- 
- import com.fasterxml.jackson.core.JsonParser;
- import com.fasterxml.jackson.databind.ObjectMapper;
-diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java
-index 4bfc800f1a..56ce0d01d1 100644
---- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java
-+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RestQueryQuarkusTemplate.java
-@@ -32,7 +32,7 @@ import static java.util.stream.Collectors.toList;
- @Path("/$endpointName$")
- public class $unit$Query$name$Endpoint {
- 
--    @javax.inject.Inject
-+    @jakarta.inject.Inject
-     RuleUnit<$UnitType$> ruleUnit;
- 
-     public $unit$Query$name$Endpoint() { }
 diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java
 index 829d4c5ada..aa8fa8a753 100644
 --- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java
diff --git a/.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch b/.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch
index 6a10e67976..0cd980d35b 100644
--- a/.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch
+++ b/.ci/environments/quarkus-3/patches/0004_javax.enterprise_to_jakarta.enterprise.patch
@@ -20,55 +20,6 @@ index ae862535a4..a8ad497c5d 100644
          }
      });
  ----
-diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-index f06c26e151..27eb8803ca 100644
---- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-+++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/impl/CDIDependencyInjectionAnnotator.java
-@@ -35,7 +35,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public <T extends NodeWithAnnotations<?>> T withProduces(T node, boolean isDefault) {
--        node.addAndGetAnnotation("javax.enterprise.inject.Produces");
-+        node.addAndGetAnnotation("jakarta.enterprise.inject.Produces");
-         if (isDefault) {
-             node.addAndGetAnnotation("io.quarkus.arc.DefaultBean");
-         }
-@@ -50,7 +50,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public <T extends NodeWithAnnotations<?>> T withApplicationComponent(T node) {
--        node.addAnnotation("javax.enterprise.context.ApplicationScoped");
-+        node.addAnnotation("jakarta.enterprise.context.ApplicationScoped");
-         return node;
-     }
- 
-@@ -106,7 +106,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public String optionalInstanceInjectionType() {
--        return "javax.enterprise.inject.Instance";
-+        return "jakarta.enterprise.inject.Instance";
-     }
- 
-     @Override
-@@ -133,7 +133,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public String applicationComponentType() {
--        return "javax.enterprise.context.ApplicationScoped";
-+        return "jakarta.enterprise.context.ApplicationScoped";
-     }
- 
-     @Override
-@@ -173,7 +173,7 @@ public class CDIDependencyInjectionAnnotator implements DependencyInjectionAnnot
- 
-     @Override
-     public <T extends NodeWithAnnotations<?>> T withFactoryMethod(T node) {
--        node.addAnnotation("javax.enterprise.inject.Produces");
-+        node.addAnnotation("jakarta.enterprise.inject.Produces");
-         return node;
-     }
- 
 diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
 index 64bd6d374c..023cf9e482 100644
 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
@@ -212,7 +163,7 @@ diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/
 index bf7aff2b2e..5baf698463 100644
 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
 +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
-@@ -1,4 +1,4 @@
+@@ -19,4 +19,4 @@
 -import javax.enterprise.context.ApplicationScoped;
 +import jakarta.enterprise.context.ApplicationScoped;
  import jakarta.ws.rs.GET;
diff --git a/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch b/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch
index 330d262015..ecf893d034 100644
--- a/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch
+++ b/.ci/environments/quarkus-3/patches/0005_javax.annotation_to_jakarta.annotation.patch
@@ -17,19 +17,6 @@ index a8ad497c5d..909d7a2b31 100644
      public void init() {
          this.activate();
      }
-diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java
-index 29ebcf1a4d..fa2fcbce68 100644
---- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java
-+++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/di/DependencyInjectionAnnotator.java
-@@ -179,7 +179,7 @@ public interface DependencyInjectionAnnotator {
-                 rolesExpr.add(new StringLiteralExpr(role.trim()));
-             }
- 
--            node.addAnnotation(new SingleMemberAnnotationExpr(new Name("javax.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr))));
-+            node.addAnnotation(new SingleMemberAnnotationExpr(new Name("jakarta.annotation.security.RolesAllowed"), new ArrayInitializerExpr(NodeList.nodeList(rolesExpr))));
-         }
-         return node;
-     }
 diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java
 index b4593ab904..94041b4d11 100644
 --- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java
diff --git a/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch b/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch
index 555fb03148..ea7f72dee4 100644
--- a/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch
+++ b/.ci/environments/quarkus-3/patches/0015_javax.inject_to_jakarta.inject-api.deps.patch
@@ -2,15 +2,15 @@ diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-
 index 244c1c4a8f..a244f76be0 100644
 --- a/kogito-build/kogito-dependencies-bom/pom.xml
 +++ b/kogito-build/kogito-dependencies-bom/pom.xml
-@@ -45,7 +45,7 @@
-     <version.com.sun.activation>2.0.0</version.com.sun.activation>
+@@ -48,7 +48,7 @@
+     <version.com.sun.activation>2.0.1</version.com.sun.activation>
      <version.javax.annotation>1.3.2</version.javax.annotation>
      <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
 -    <version.javax.inject>1</version.javax.inject>
 +    <version.javax.inject>2.0.1</version.javax.inject>
      <version.javax.validation>2.0.1.Final</version.javax.validation>
      <version.javax.xml.bind>2.3.1</version.javax.xml.bind>
-     <version.org.eclipse.microprofile.openapi>3.1</version.org.eclipse.microprofile.openapi>
+     <version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
 @@ -545,8 +545,8 @@
          <version>3.0.2</version>
        </dependency>
diff --git a/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch b/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch
index 58588eaece..24d68aa01f 100644
--- a/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch
+++ b/.ci/environments/quarkus-3/patches/0016_update_dependencies_version.patch
@@ -10,18 +10,18 @@ index 37608a0de9..b7087b7e44 100644
 +    <version.com.oracle.database.jdbc>21.5.0.0</version.com.oracle.database.jdbc>
      <version.com.sun.xml.bind.core>2.3.0.1</version.com.sun.xml.bind.core>
      <version.com.sun.xml.bind.impl>2.3.5</version.com.sun.xml.bind.impl>
-     <version.com.sun.activation>2.0.0</version.com.sun.activation>
+     <version.com.sun.activation>2.0.1</version.com.sun.activation>
 @@ -57,8 +57,8 @@
      <version.io.cloudevents>2.3.0</version.io.cloudevents>
-     <version.io.fabric8.kubernetes-client>6.5.1</version.io.fabric8.kubernetes-client>
-     <version.io.micrometer>1.10.5</version.io.micrometer>
+     <version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client>
+     <version.io.micrometer>1.11.1</version.io.micrometer>
 -    <version.org.flywaydb>9.8.3</version.org.flywaydb>
 -    <version.org.postgresql>42.5.1</version.org.postgresql>
 +    <version.org.flywaydb>9.16.3</version.org.flywaydb>
 +    <version.org.postgresql>42.6.0</version.org.postgresql>
-     <version.io.serverlessworkflow>4.0.4.Final</version.io.serverlessworkflow>
+     <version.io.serverlessworkflow>4.0.5.Final</version.io.serverlessworkflow>
      <!-- Aligned with Quarkus 2.7 (LTS) - see https://issues.redhat.com/browse/KOGITO-7971 -->
-     <version.io.smallrye-open-api>3.3.2</version.io.smallrye-open-api>
+     <version.io.smallrye-open-api>3.4.0</version.io.smallrye-open-api>
 @@ -87,7 +87,7 @@
      <version.org.keycloak>21.0.1</version.org.keycloak>
      <!-- It seems that the confluent kafka cannot replace wurstmeister/kafka so easily. See FAI-729 -->
@@ -31,23 +31,23 @@ index 37608a0de9..b7087b7e44 100644
      <version.org.mongo-image>4.4.14</version.org.mongo-image>
      <version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino>
      <version.org.redis>2.0.4</version.org.redis>
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
      <version.org.assertj>3.22.0</version.org.assertj>
      <version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj>
      <version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests -->
 -    <version.org.junit.minor>8.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
 +    <version.org.junit.minor>9.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
      <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
-     <version.org.junit.jupiter>5.9.2</version.org.junit.jupiter>
-     <version.org.junit.vintage>5.9.2</version.org.junit.vintage>
-@@ -112,13 +112,13 @@
+     <version.org.junit.jupiter>5.9.3</version.org.junit.jupiter>
+     <version.org.junit.vintage>5.9.3</version.org.junit.vintage>
+@@ -113,13 +113,13 @@
      <version.org.mvel>2.5.0.Final</version.org.mvel>
      <version.org.reactivestreams>1.0.4</version.org.reactivestreams>
      <version.org.reflections>0.10.2</version.org.reflections>
 -    <version.org.slf4j>1.7.36</version.org.slf4j>
 +    <version.org.slf4j>2.0.6</version.org.slf4j>
  
-     <version.maven>3.9.1</version.maven>
+     <version.maven>3.9.3</version.maven>
      <version.maven.plugin>3.7.1</version.maven.plugin>
      <version.maven.invoker>3.2.0</version.maven.invoker>
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 06/07: wip

Posted by ma...@apache.org.
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-runtimes.git

commit 025211769e8542bb2aee6b599444d3ffe6ce36f8
Author: mariofusco <ma...@gmail.com>
AuthorDate: Thu Dec 14 11:26:12 2023 +0100

    wip
---
 .../kogito/jobs/api/JobCallbackResourceDef.java    |  8 ++++----
 .../jobs/api/JobCallbackResourceDefTest.java       |  6 +++---
 .../AbstractDiscoveredEndpointCaller.java          |  5 ++---
 .../workitems/DiscoveredEndpointCallerTest.java    |  4 ++--
 .../jbpm/bpmn2/structureref/StructureRefTest.java  |  6 +++---
 .../command/GetProcessInstanceVariableCommand.java | 10 +++++-----
 .../command/MigrateProcessInstanceCommand.java     | 12 ++++++------
 .../command/ResumeProcessInstanceCommand.java      | 12 ++++++------
 .../command/SuspendProcessInstanceCommand.java     | 12 ++++++------
 .../instance/command/UpdateProcessCommand.java     | 12 ++++++------
 .../camel/runtime/CamelCustomWorkItemHandler.java  | 10 +++++-----
 .../runtime/CamelCustomWorkItemHandlerConfig.java  |  6 +++---
 .../messaging/MessageDecoratorProvider.java        |  6 +++---
 .../http/CloudEventHttpOutgoingDecorator.java      |  4 ++--
 .../http/CloudEventHttpOutgoingDecoratorTest.java  |  6 +++---
 .../QuarkusEventDrivenDecisionController.java      |  6 +++---
 .../mongodb/QuarkusMongoDBEventPublisher.java      |  8 ++++----
 .../kie/kogito/events/mongodb/MockMongoClient.java |  4 ++--
 .../events/mongodb/MockTransactionManager.java     |  4 ++--
 .../mongodb/QuarkusMongoDBEventPublisherTest.java  |  4 ++--
 .../QuarkusEventDrivenPredictionsController.java   |  6 +++---
 .../process/ReactiveMessagingEventPublisher.java   | 10 +++++-----
 .../rules/QuarkusEventDrivenRulesController.java   |  6 +++---
 .../QuarkusExplainableResourceIT.java              |  6 +++---
 .../explainability/QuarkusExplainableResource.java | 10 +++++-----
 .../catalog/Fabric8KubernetesServiceCatalog.java   |  6 +++---
 .../k8s/service/catalog/KnativeClientProducer.java |  6 +++---
 .../service/catalog/KnativeServiceDiscovery.java   |  6 +++---
 .../catalog/KubernetesResourceDiscovery.java       |  6 +++---
 .../catalog/OpenShiftResourceDiscovery.java        |  6 +++---
 .../k8s/service/catalog/DeploymentUtilsTest.java   |  4 ++--
 .../Fabric8KubernetesServiceCatalogTest.java       |  6 +++---
 .../k8s/service/catalog/IngressUtilsTest.java      |  4 ++--
 .../catalog/KnativeServiceDiscoveryTest.java       |  4 ++--
 .../catalog/KubernetesResourceDiscoveryTest.java   |  4 ++--
 .../catalog/OpenShiftServiceDiscoveryTest.java     |  4 ++--
 .../fabric8/k8s/service/catalog/PodUtilsTest.java  |  4 ++--
 .../k8s/service/catalog/StatefulSetUtilsTest.java  |  4 ++--
 .../common/CallbackJobsServiceResource.java        | 16 ++++++++--------
 .../common/CallbackJobsServiceResourceTest.java    |  6 +++---
 .../quarkus/KnativeEventingJobsService.java        |  6 +++---
 .../quarkus/KnativeEventingJobsServiceTest.java    |  4 ++--
 .../quarkus/AddonObjectMapperCustomizer.java       |  4 ++--
 .../jobs/management/quarkus/VertxJobsService.java  | 12 ++++++------
 .../management/quarkus/VertxJobsServiceTest.java   |  4 ++--
 .../quarkus/ReactiveMessagingJobsService.java      |  6 +++---
 .../KogitoProcessKnativeEventingProcessorTest.java |  3 ++-
 .../eventing/KSinkInjectionHealthCheck.java        |  4 ++--
 .../KnativeWorkItemHandlerConfig.java              |  6 +++---
 .../KnativeWorkItemHandlerProducer.java            |  6 +++---
 .../serving/customfunctions/WebClientProducer.java |  6 +++---
 .../quarkus/kubernetes/KubernetesAddOnTest.java    |  4 ++--
 .../kie/kogito/addons/quarkus/kubernetes/Foo.java  |  4 ++--
 .../addons/quarkus/k8s/EndpointCallerProducer.java | 10 +++++-----
 .../quarkus/k8s/EndpointDiscoveryProducer.java     | 12 ++++++------
 .../k8s/KnativeRouteEndpointDiscoveryTest.java     |  4 ++--
 .../KubernetesServiceEndpointDiscoveryTest.java    |  6 +++---
 .../KubeDiscoveryConfigCacheUpdaterTest.java       |  6 +++---
 .../org/kie/kogito/mail/QuarkusMailSender.java     |  6 +++---
 .../org/kie/kogito/mail/QuarkusMailSenderTest.java |  4 ++--
 .../common/AbstractQuarkusCloudEventEmitter.java   |  4 ++--
 .../common/BackpressureKogitoEmitter.java          |  4 ++--
 .../common/BackpressurePublisherDecorator.java     |  6 +++---
 .../messaging/common/EventMarshallerProducer.java  |  8 ++++----
 .../common/EventUnmarshallerProducer.java          |  8 ++++----
 .../common/QuarkusEventExecutorServiceFactory.java |  6 +++---
 .../common/QuarkusKogitoExtensionInitializer.java  |  6 +++---
 .../messaging/common/QuarkusMessageConsumer.java   |  4 ++--
 .../messaging/common/QuarkusTopicDiscovery.java    |  6 +++---
 .../common/QuarkusTopicsInformationResource.java   | 10 +++++-----
 .../QuarkusDefaultCloudEventReceiver.java          |  8 ++++----
 .../catalog/MicroProfileConfigServiceCatalog.java  |  4 ++--
 .../MicroProfileConfigServiceCatalogTest.java      |  4 ++--
 .../core/quarkus/QuarkusEventListenerFactory.java  |  8 ++++----
 .../core/quarkus/QuarkusMetricsFilterRegister.java | 14 +++++++-------
 .../core/quarkus/QuarkusMetricsInterceptor.java    |  4 ++--
 .../QuarkusSystemMetricsCollectorProvider.java     |  8 ++++----
 .../quarkus/QuarkusMetricsFilterRegisterTest.java  |  6 +++---
 .../quarkus/QuarkusMetricsInterceptorTest.java     |  8 ++++----
 .../quarkus/QuarkusElasticRegistryProvider.java    |  6 +++---
 .../quarkus/FileSystemProcessInstancesFactory.java |  6 +++---
 .../infinispan/health/InfinispanHealthCheck.java   |  6 +++---
 .../infinispan/health/InfinispanHealthCheckIT.java |  8 ++++----
 .../quarkus/InfinispanProcessInstancesFactory.java |  6 +++---
 .../quarkus/JDBCProcessInstancesFactory.java       |  5 +++--
 .../quarkus/JDBCorrelationServiceProducer.java     |  3 ++-
 .../persistence/KafkaProcessInstancesFactory.java  |  8 ++++----
 .../kafka/KafkaStreamsStateListener.java           |  8 ++++----
 .../kafka/KafkaStreamsTopologyProducer.java        |  4 ++--
 .../quarkus/MongoDBProcessInstancesFactory.java    |  6 +++---
 .../quarkus/MongoDBTransactionManager.java         |  6 +++---
 .../quarkus/PostgresqlProcessInstancesFactory.java |  6 +++---
 .../RocksDbProcessInstancesFactoryProducer.java    | 12 ++++++------
 .../definitions/ProcessDefinitionsResource.java    | 22 +++++++++++-----------
 .../ProcessInstanceManagementResource.java         |  6 +++---
 .../ProcessInstanceManagementResourceTest.java     | 14 +++++++-------
 .../svg/dataindex/QuarkusDataIndexClient.java      |  8 ++++----
 .../kie/kogito/svg/rest/ProcessSvgResource.java    | 10 +++++-----
 .../svg/service/QuarkusProcessSvgService.java      |  6 +++---
 .../InvalidLifeCyclePhaseExceptionMapper.java      |  4 ++--
 .../InvalidTransitionExceptionMapper.java          |  4 ++--
 .../NodeInstanceNotFoundExceptionMapper.java       |  4 ++--
 .../exceptions/NodeNotFoundExceptionMapper.java    |  4 ++--
 .../exceptions/NotAuthorizedExceptionMapper.java   |  4 ++--
 .../ProcessInstanceDuplicatedExceptionMapper.java  |  4 ++--
 .../ProcessInstanceExecutionExceptionMapper.java   |  4 ++--
 .../ProcessInstanceNotFoundExceptionMapper.java    |  4 ++--
 .../VariableViolationExceptionMapper.java          |  4 ++--
 .../WorkItemExecutionExceptionMapper.java          |  4 ++--
 .../WorkItemNotFoundExceptionMapper.java           |  4 ++--
 .../resource/exceptions/ExceptionsHandlerTest.java | 12 ++++++------
 .../addon/source/files/SourceFilesRecorder.java    |  4 ++--
 .../addon/source/files/SourceFilesResource.java    |  4 ++--
 .../source/files/SourceFilesResourceTest.java      |  4 ++--
 .../task/management/TaskManagementResource.java    | 16 ++++++++--------
 .../quarkus/NotificationEventPublisher.java        |  6 +++---
 .../decision/QuarkusDecisionTracingCollector.java  |  6 +++---
 .../decision/QuarkusDecisionTracingListener.java   |  6 +++---
 .../tracing/decision/QuarkusModelEventEmitter.java |  6 +++---
 .../decision/QuarkusStartupModelPublisher.java     |  8 ++++----
 .../tracing/decision/QuarkusTraceEventEmitter.java |  4 ++--
 .../org/kie/kogito/quarkus/dmn/CustomEndpoint.java | 12 ++++++------
 .../quarkus/support/QuarkusDecisionIdFactory.java  |  4 ++--
 .../quarkus/support/QuarkusDecisionService.java    | 10 +++++-----
 .../common/deployment/KogitoAssetsProcessor.java   |  6 +++---
 .../quarkus/auth/QuarkusIdentityProvider.java      |  8 ++++----
 .../org/kie/kogito/quarkus/config/ConfigBean.java  |  6 +++---
 .../registry/ProcessDefinitionRegistration.java    | 10 +++++-----
 .../runtime/SSLWebClientOptionsProducer.java       |  6 +++---
 .../org/kie/kogito/quarkus/jbpm/ProcessIT.java     |  6 +++---
 .../application/quarkus/QuarkusAppRoot.java        |  8 ++++----
 .../quarkus/QuarkusInternalObjectMapper.java       |  4 ++--
 .../kie/kogito/quarkus/pmml/CustomEndpoint.java    | 14 +++++++-------
 .../quarkus/support/QuarkusPredictionIds.java      |  4 ++--
 .../quarkus/support/QuarkusPredictionService.java  | 10 +++++-----
 .../src/main/java/org/acme/GreetingResource.java   | 18 +++++++++---------
 .../java/org/acme/StatefulProcessResourceTest.java |  4 ++--
 .../quarkus/support/QuarkusHumanTaskService.java   | 10 +++++-----
 .../quarkus/support/QuarkusProcessIdFactory.java   |  4 ++--
 .../support/QuarkusStatefulProcessService.java     | 10 +++++-----
 .../QuarkusStraightThroughProcessService.java      | 10 +++++-----
 .../kie/kogito/quarkus/drools/AnotherService.java  |  6 +++---
 .../kie/kogito/quarkus/drools/CustomEndpoint.java  | 12 ++++++------
 .../RuleUnitMetaDataContextSerializationTest.java  |  4 ++--
 .../drools/StatefulRuleUnitServiceTest.java        |  4 ++--
 .../quarkus/support/DataSourceProvider.java        |  6 +++---
 .../quarkus/support/QuarkusDataSourceService.java  | 10 +++++-----
 .../quarkus/support/QuarkusRuleUnitIdFactory.java  |  4 ++--
 .../quarkus/support/QuarkusRuleUnitService.java    | 10 +++++-----
 .../support/QuarkusStatefulRuleUnitService.java    | 10 +++++-----
 .../support/RuleUnitDataObjectCustomizer.java      |  4 ++--
 .../deployment/livereload/LiveReloadProcessor.java |  4 ++--
 .../openapi/WorkflowOpenApiHandlerGenerator.java   |  6 +++---
 .../workflow/rpc/WorkflowRPCHandlerGenerator.java  |  6 +++---
 .../workflow/io/QuarkusResourceCache.java          |  7 +++----
 .../kogito/workflows/services/GreetResource.java   |  6 +++---
 .../services/JavaSerializationProducer.java        | 10 +++++-----
 .../services/NodeInstanceTriggerEventListener.java |  4 ++--
 .../services/RPCCustomWorkItemHandler.java         |  4 ++--
 .../services/RPCCustomWorkItemHandlerConfig.java   |  6 +++---
 .../kie/kogito/quarkus/workflows/SubFlowsIT.java   |  4 ++--
 .../TokenPropagationExternalServicesMock.java      |  4 ++--
 .../quarkus/workflows/TokenPropagationIT.java      |  4 ++--
 .../org/kie/kogito/expr/jq/JqQuarkusExtension.java |  3 +--
 .../secret/QuarkusConfigResolverRegister.java      |  3 ++-
 .../ServerlessWorkflowWorkItemHandlerConfig.java   | 10 +++++-----
 .../workflow/mapper/ObjectMapperConfig.java        |  4 ++--
 .../workflow/openapi/OpenApiWorkItemHandler.java   |  8 ++++----
 .../quarkus/workflow/KogitoBeanProducer.java       |  8 ++++----
 .../devservices/DataIndexEventPublisher.java       |  6 +++---
 .../jobs/QuarkusScheduledExecutorService.java      |  6 +++---
 .../integrationtests/InjectDecisionModels.java     |  4 ++--
 .../org/kie/kogito/legacy/rules/TmsEndpoint.java   |  8 ++++----
 .../kogito/quarkus/dmn/TrafficViolationTest.java   |  4 ++--
 .../org/kie/kogito/quarkus/drools/HelloTest.java   |  4 ++--
 .../org/kie/kogito/quarkus/jbpm/ProcessTest.java   |  6 +++---
 .../kogito/quarkus/pmml/PMMLRegressionTest.java    |  4 ++--
 .../src/main/java/org/kie/kogito/HelloService.java |  4 ++--
 .../kogito/NodeInstanceTriggerEventListener.java   |  4 ++--
 .../main/java/org/kie/kogito/wih/WIHRegister.java  |  4 ++--
 .../src/main/java/org/acme/WIHRegister.java        |  4 ++--
 .../kogito/integrationtests/ApprovalResource.java  |  6 +++---
 .../kie/kogito/integrationtests/HelloService.java  |  6 +++---
 .../kogito/integrationtests/InjectProcesses.java   |  4 ++--
 .../NodeInstanceTriggerEventListener.java          |  4 ++--
 .../UnitOfWorkTestEventListener.java               |  4 ++--
 .../kogito/integrationtests/quarkus/TaskIT.java    |  4 ++--
 .../kogito/integrationtests/InjectRuleUnits.java   |  4 ++--
 .../kie/kogito/examples/CalculationService.java    |  4 ++--
 .../resources/ConditionalQuarkusTestResource.java  |  3 ++-
 .../ConditionalQuarkusTestResourceTest.java        |  3 ++-
 .../SpringBootEventDrivenDecisionController.java   |  3 ++-
 .../mongodb/SpringbootMongoDBEventPublisher.java   |  3 ++-
 ...SpringBootEventDrivenPredictionsController.java |  3 ++-
 .../springboot/SpringRestJobsService.java          |  5 +++--
 .../SpringBootKogitoExtensionInitializer.java      |  3 ++-
 .../spring/SpringKafkaCloudEventReceiver.java      |  3 ++-
 .../springboot/SpringbootMetricsInterceptor.java   |  6 +++---
 .../SpringbootSystemMetricsCollectorProvider.java  |  3 ++-
 .../springboot/SpringMetricsInterceptorTest.java   |  6 +++---
 .../SpringbootElasticRegistryProvider.java         |  5 +++--
 .../svg/dataindex/SpringBootDataIndexClient.java   |  3 ++-
 .../decision/SpringBootModelEventEmitter.java      |  3 ++-
 .../test/springboot/kafka/KafkaTestClient.java     |  3 ++-
 .../springboot/KeycloakSpringBootTestResource.java |  2 --
 205 files changed, 643 insertions(+), 631 deletions(-)

diff --git a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
index 6db25dad1d..38b07a5d67 100644
--- a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
+++ b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
@@ -20,9 +20,6 @@ package org.kie.kogito.jobs.api;
 
 import java.time.temporal.ChronoUnit;
 
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
 import org.kie.kogito.jobs.service.api.TemporalUnit;
 import org.kie.kogito.jobs.service.api.recipient.http.HttpRecipient;
@@ -32,6 +29,9 @@ import org.kie.kogito.jobs.service.api.schedule.timer.TimerSchedule;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 /**
  * Common definitions for add-ons implementations based on the Jobs Service to Runtime rest callback pattern.
  */
@@ -120,4 +120,4 @@ public class JobCallbackResourceDef {
         }
         return repeatLimit;
     }
-}
\ No newline at end of file
+}
diff --git a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
index 99f1add2b7..ee9b7aec67 100644
--- a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
+++ b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
@@ -20,9 +20,6 @@ package org.kie.kogito.jobs.api;
 
 import java.net.URI;
 
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.jobs.ExactExpirationTime;
 import org.kie.kogito.jobs.ExpirationTime;
@@ -33,6 +30,9 @@ import org.kie.kogito.jobs.service.api.serlialization.SerializationUtils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 class JobCallbackResourceDefTest {
diff --git a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
index d775e7eacb..d91626eb84 100644
--- a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
+++ b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
@@ -26,9 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import jakarta.ws.rs.HttpMethod;
-import jakarta.ws.rs.core.MediaType;
-
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.kogito.addons.k8s.Endpoint;
 import org.kie.kogito.addons.k8s.EndpointDiscovery;
@@ -37,6 +34,8 @@ import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.core.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
diff --git a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
index 5eb93c71d2..8c245ca5d4 100644
--- a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
+++ b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
@@ -20,12 +20,12 @@ package org.kie.kogito.addons.k8s.workitems;
 
 import java.util.Map;
 
-import jakarta.ws.rs.HttpMethod;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.process.workitems.impl.KogitoWorkItemImpl;
 
+import jakarta.ws.rs.HttpMethod;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(TargetEndpointsMockServerExtension.class)
diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
index a3288e3c8c..45f04b90d8 100755
--- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
+++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
@@ -22,9 +22,6 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-
 import org.jbpm.bpmn2.JbpmBpmn2TestCase;
 import org.jbpm.bpmn2.objects.Person;
 import org.jbpm.bpmn2.objects.TestWorkItemHandler;
@@ -33,6 +30,9 @@ import org.jbpm.process.core.datatype.impl.coverter.TypeConverterRegistry;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.fail;
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
index 4bb7c5e332..9db510c92f 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
@@ -18,11 +18,6 @@
  */
 package org.jbpm.process.instance.command;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlSchemaType;
-
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
 import org.kie.api.runtime.KieSession;
@@ -31,6 +26,11 @@ import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcessInstance;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+
 @XmlAccessorType(XmlAccessType.NONE)
 public class GetProcessInstanceVariableCommand implements ExecutableCommand<Object>, KogitoProcessInstanceIdCommand {
 
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
index 79e342bd84..bd12831690 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
@@ -21,12 +21,6 @@ package org.jbpm.process.instance.command;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlSchemaType;
-
 import org.drools.core.common.InternalKnowledgeRuntime;
 import org.jbpm.workflow.core.impl.NodeImpl;
 import org.jbpm.workflow.instance.NodeInstanceContainer;
@@ -40,6 +34,12 @@ import org.kie.api.runtime.process.NodeInstance;
 import org.kie.internal.command.RegistryContext;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+
 @XmlRootElement(name = "get-completed-tasks-command")
 @XmlAccessorType(XmlAccessType.NONE)
 public class MigrateProcessInstanceCommand implements ExecutableCommand<Void>, KogitoProcessInstanceIdCommand {
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
index 6cc16653bf..7e737c3f8e 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
@@ -18,12 +18,6 @@
  */
 package org.jbpm.process.instance.command;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlSchemaType;
-
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
 import org.kie.api.runtime.KieSession;
@@ -31,6 +25,12 @@ import org.kie.internal.command.RegistryContext;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+
 @XmlRootElement(name = "get-completed-tasks-command")
 @XmlAccessorType(XmlAccessType.NONE)
 public class ResumeProcessInstanceCommand implements ExecutableCommand<Object>, KogitoProcessInstanceIdCommand {
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
index 2f2d069a4d..40217c3c9f 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
@@ -18,12 +18,6 @@
  */
 package org.jbpm.process.instance.command;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlAttribute;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlSchemaType;
-
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
 import org.kie.api.runtime.KieSession;
@@ -31,6 +25,12 @@ import org.kie.internal.command.RegistryContext;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+
 @XmlRootElement(name = "suspend-process-instance-command")
 @XmlAccessorType(XmlAccessType.NONE)
 public class SuspendProcessInstanceCommand implements ExecutableCommand<Object>, KogitoProcessInstanceIdCommand {
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
index b5f8b6d6cb..7aa140a0aa 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
@@ -18,12 +18,6 @@
  */
 package org.jbpm.process.instance.command;
 
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlSchemaType;
-
 import org.jbpm.process.instance.impl.ProcessInstanceImpl;
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
@@ -31,6 +25,12 @@ import org.kie.api.runtime.KieSession;
 import org.kie.internal.command.RegistryContext;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+
 @XmlRootElement(name = "update-process-command")
 @XmlAccessorType(XmlAccessType.NONE)
 public class UpdateProcessCommand implements ExecutableCommand<Void>, KogitoProcessInstanceIdCommand {
diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
index f3a7c073bd..e61efe10e3 100644
--- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
+++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
@@ -21,11 +21,6 @@ package org.kie.kogito.addons.quarkus.camel.runtime;
 import java.util.Collections;
 import java.util.Map;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
@@ -36,6 +31,11 @@ import org.slf4j.LoggerFactory;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import static org.kie.kogito.addons.quarkus.camel.runtime.CamelConstants.BODY;
 import static org.kie.kogito.addons.quarkus.camel.runtime.CamelConstants.HEADERS;
 
diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
index e8858be001..c5b11187cc 100644
--- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
+++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.addons.quarkus.camel.runtime;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 
 import jakarta.annotation.PostConstruct;
-import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class CamelCustomWorkItemHandlerConfig extends CachedWorkItemHandlerConfig {
diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
index 6d3c573c6b..c8b6ddb9ed 100644
--- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
+++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
@@ -21,13 +21,13 @@ package org.kie.kogito.addon.quarkus.common.reactive.messaging;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
+import org.eclipse.microprofile.reactive.messaging.Message;
+
+import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
-import jakarta.annotation.PostConstruct;
-import org.eclipse.microprofile.reactive.messaging.Message;
-
 /**
  * Provides a {@link MessageDecorator} instance. Ideally should not be used outside the {@link MessageFactory}.
  */
diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
index ec9a557dbc..2aed174548 100644
--- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
+++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
@@ -18,13 +18,13 @@
  */
 package org.kie.kogito.addon.quarkus.common.reactive.messaging.http;
 
-import jakarta.ws.rs.core.HttpHeaders;
-
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator;
 
 import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata;
 
+import jakarta.ws.rs.core.HttpHeaders;
+
 /**
  * Decorators for Http CloudEvents outgoing messages
  */
diff --git a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
index 56d82c3462..acc435f7f4 100644
--- a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
+++ b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
@@ -21,9 +21,6 @@ package org.kie.kogito.addon.quarkus.messaging.common.message.http;
 import java.util.Collections;
 import java.util.Optional;
 
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
@@ -32,6 +29,9 @@ import org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHtt
 import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata;
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusTest
diff --git a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
index fbd6dd44a9..fe73dbfcb4 100644
--- a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
+++ b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
@@ -18,9 +18,6 @@
  */
 package org.kie.kogito.eventdriven.decision;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.decision.DecisionModels;
 import org.kie.kogito.event.EventEmitter;
@@ -28,6 +25,9 @@ import org.kie.kogito.event.EventReceiver;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 @Startup
 public class QuarkusEventDrivenDecisionController extends EventDrivenDecisionController {
 
diff --git a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
index da585bf0b1..26a0cb6199 100644
--- a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
+++ b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
 import com.mongodb.client.MongoClient;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class QuarkusMongoDBEventPublisher extends MongoDBEventPublisher {
 
diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
index 67a270cb3e..2889353a58 100644
--- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
+++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
@@ -20,8 +20,6 @@ package org.kie.kogito.events.mongodb;
 
 import java.util.List;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.bson.Document;
 import org.bson.conversions.Bson;
 
@@ -37,6 +35,8 @@ import com.mongodb.connection.ClusterDescription;
 
 import io.quarkus.test.Mock;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
index ad81feee51..308a8ad6ee 100644
--- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
+++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
 import com.mongodb.client.ClientSession;
 
 import io.quarkus.test.Mock;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @Mock
 @ApplicationScoped
 public class MockTransactionManager extends AbstractTransactionManager {
diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
index 733fa74cfc..b511659be1 100644
--- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
+++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
@@ -18,8 +18,6 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
@@ -28,6 +26,8 @@ import com.mongodb.client.MongoClient;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectSpy;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.mockito.ArgumentMatchers.eq;
diff --git a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
index bb8854515d..33ee21e702 100644
--- a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
+++ b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
@@ -18,9 +18,6 @@
  */
 package org.kie.kogito.eventdriven.predictions;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
 import org.kie.kogito.event.EventReceiver;
@@ -28,6 +25,9 @@ import org.kie.kogito.prediction.PredictionModels;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 @Startup
 public class QuarkusEventDrivenPredictionsController extends EventDrivenPredictionsController {
 
diff --git a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
index e5510c58bc..1b2b56ada1 100644
--- a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
+++ b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
@@ -22,11 +22,6 @@ import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
@@ -41,6 +36,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.smallrye.reactive.messaging.MutinyEmitter;
 import io.smallrye.reactive.messaging.providers.locals.ContextAwareMessage;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class ReactiveMessagingEventPublisher implements EventPublisher {
 
diff --git a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
index 1f261d8900..ddc8946264 100644
--- a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
+++ b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.eventdriven.rules;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
 import org.kie.kogito.event.EventReceiver;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 @Startup
 public class QuarkusEventDrivenRulesController extends EventDrivenRulesController {
 
diff --git a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
index dd02b78b17..d5366c6faa 100644
--- a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
+++ b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
@@ -22,9 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import jakarta.inject.Singleton;
-import jakarta.ws.rs.core.Response;
-
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.config.ConfigBean;
@@ -36,6 +33,9 @@ import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.restassured.common.mapper.TypeRef;
 import io.restassured.http.ContentType;
 
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.core.Response;
+
 import static io.restassured.RestAssured.given;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
index 1b3205e834..94baff9a47 100644
--- a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
+++ b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
@@ -20,6 +20,11 @@ package org.kie.kogito.explainability;
 
 import java.util.List;
 
+import org.kie.kogito.Application;
+import org.kie.kogito.explainability.model.PredictInput;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
@@ -28,11 +33,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.Application;
-import org.kie.kogito.explainability.model.PredictInput;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @Path("/predict")
 public class QuarkusExplainableResource {
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
index 1ed2dc4ae9..37fbdfe3b1 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
@@ -24,12 +24,12 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 final class Fabric8KubernetesServiceCatalog implements KubernetesServiceCatalog {
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
index 9660edf455..6998e84b6f 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
@@ -18,13 +18,13 @@
  */
 package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 
+import io.fabric8.knative.client.KnativeClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 
-import io.fabric8.knative.client.KnativeClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
-
 final class KnativeClientProducer {
 
     private final KubernetesClient kubernetesClient;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
index 0220c39da1..9bb8515bf2 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
@@ -21,15 +21,15 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.knative.client.KnativeClient;
 import io.fabric8.knative.serving.v1.Service;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 class KnativeServiceDiscovery extends AbstractResourceDiscovery {
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
index 9e53d7c6f9..5a21b1cff0 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
@@ -22,14 +22,14 @@ import java.net.URI;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 class KubernetesResourceDiscovery extends AbstractResourceDiscovery {
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
index 7f7ae2f66f..d93acaa473 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
@@ -23,9 +23,6 @@ import java.net.URI;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +30,9 @@ import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.client.OpenShiftClient;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 class OpenShiftResourceDiscovery extends AbstractResourceDiscovery {
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
index bd4d2c29b5..a3d2707ee7 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.ContainerPortBuilder;
@@ -37,6 +35,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
index 844cb509b8..54bc48295f 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
@@ -18,8 +18,6 @@
  */
 package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
 
@@ -28,6 +26,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil.createServiceIfNotExists;
 
 @QuarkusTest
@@ -48,4 +48,4 @@ class Fabric8KubernetesServiceCatalogTest extends KubernetesServiceCatalogTest {
     Fabric8KubernetesServiceCatalogTest(Fabric8KubernetesServiceCatalog fabric8KubernetesServiceCatalog) {
         super(fabric8KubernetesServiceCatalog);
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
index 44e9b1bb88..7542569f57 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
@@ -31,6 +29,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
index 45b8fd3fa9..c048fed5a3 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil;
 
@@ -31,6 +29,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 @QuarkusTest
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
index cd6c673e05..01f250e0b5 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.knative.client.KnativeClient;
@@ -32,6 +30,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
index 08ca9997a9..e27d9107c0 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.Pod;
@@ -35,6 +33,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.OpenShiftTestServer;
 import io.quarkus.test.kubernetes.client.WithOpenShiftTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
index 1f4d34a4e4..bacdf675d0 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
@@ -22,8 +22,6 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.api.model.Pod;
@@ -33,6 +31,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
index d424d629af..c39d6eccbb 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -37,6 +35,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
index 22fa2c4b4c..3e6a19286b 100644
--- a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
+++ b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
@@ -18,6 +18,14 @@
  */
 package org.kie.kogito.jobs.quarkus.common;
 
+import org.kie.kogito.Application;
+import org.kie.kogito.jobs.api.JobCallbackPayload;
+import org.kie.kogito.process.Process;
+import org.kie.kogito.process.Processes;
+import org.kie.kogito.services.jobs.impl.TriggerJobCommand;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
@@ -30,14 +38,6 @@ import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
 
-import org.kie.kogito.Application;
-import org.kie.kogito.jobs.api.JobCallbackPayload;
-import org.kie.kogito.process.Process;
-import org.kie.kogito.process.Processes;
-import org.kie.kogito.services.jobs.impl.TriggerJobCommand;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import static org.kie.kogito.jobs.api.JobCallbackResourceDef.JOBS_CALLBACK_POST_URI;
 import static org.kie.kogito.jobs.api.JobCallbackResourceDef.JOBS_CALLBACK_URI;
 import static org.kie.kogito.jobs.api.JobCallbackResourceDef.LIMIT;
diff --git a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
index e65c671c84..87417cf1a1 100644
--- a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
+++ b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
@@ -20,9 +20,6 @@ package org.kie.kogito.jobs.quarkus.common;
 
 import java.util.Optional;
 
-import jakarta.enterprise.inject.Instance;
-import jakarta.ws.rs.core.Response;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -38,6 +35,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.enterprise.inject.Instance;
+import jakarta.ws.rs.core.Response;
+
 import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
 import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
 import static jakarta.ws.rs.core.Response.Status.OK;
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
index 07796c390f..f445b3bf8a 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
+++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
@@ -20,9 +20,6 @@ package org.kie.kogito.jobs.knative.eventing.quarkus;
 
 import java.net.URI;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
@@ -32,6 +29,9 @@ import org.kie.kogito.jobs.messaging.quarkus.AbstractReactiveMessagingJobsServic
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class KnativeEventingJobsService extends AbstractReactiveMessagingJobsService {
 
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
index c37446e07e..d68e2b1a1f 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
+++ b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
@@ -22,8 +22,6 @@ import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.ws.rs.core.HttpHeaders;
-
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.jobs.messaging.quarkus.AbstractReactiveMessagingJobsServiceTest;
@@ -32,6 +30,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.reactivemessaging.http.runtime.OutgoingHttpMetadata;
 
+import jakarta.ws.rs.core.HttpHeaders;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 import static org.kie.kogito.addon.quarkus.common.reactive.messaging.http.CloudEventHttpOutgoingDecorator.CLOUD_EVENTS_CONTENT_TYPE;
diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
index 7216595018..f9aaff7604 100644
--- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
+++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.jobs.management.quarkus;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.jackson.ObjectMapperCustomizer;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import static org.kie.kogito.jobs.service.api.serlialization.SerializationUtils.registerDescriptors;
 
 @ApplicationScoped
diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
index 1dd1ffb971..a7989885d0 100644
--- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
+++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
@@ -20,11 +20,6 @@ package org.kie.kogito.jobs.management.quarkus;
 
 import java.net.URI;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
 import org.kie.kogito.jobs.ProcessJobDescription;
@@ -42,6 +37,11 @@ import io.vertx.core.json.jackson.DatabindCodec;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 import static org.kie.kogito.jobs.service.api.serlialization.SerializationUtils.registerDescriptors;
 
 @ApplicationScoped
@@ -130,4 +130,4 @@ public class VertxJobsService extends RestJobsService {
         registerDescriptors(mapper);
         mapper.findAndRegisterModules();
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
index 8dd932b3b3..578d7f954c 100644
--- a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
+++ b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
@@ -18,8 +18,6 @@
  */
 package org.kie.kogito.jobs.management.quarkus;
 
-import jakarta.enterprise.inject.Instance;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
@@ -38,6 +36,8 @@ import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.web.client.HttpRequest;
 import io.vertx.ext.web.client.WebClient;
 
+import jakarta.enterprise.inject.Instance;
+
 import static org.mockito.ArgumentCaptor.forClass;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
index 75a64911a2..53107cf829 100644
--- a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
+++ b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
@@ -20,15 +20,15 @@ package org.kie.kogito.jobs.messaging.quarkus;
 
 import java.net.URI;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class ReactiveMessagingJobsService extends AbstractReactiveMessagingJobsService {
 
diff --git a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java
index 4b6a386a81..d5a87d21b9 100644
--- a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java
+++ b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java
@@ -109,7 +109,8 @@ class KogitoProcessKnativeEventingProcessorTest {
         final MockKogitoKnativeMetadataProducer metadata = new MockKogitoKnativeMetadataProducer();
         final KubernetesResourceMetadataBuildItem kubernetesResourceMetadataBuildItem = new KubernetesResourceMetadataBuildItem("kubernetes", "apps", "v1", "Deployment", "name");
         final List<KubernetesResourceMetadataBuildItem> kubernetesMetaBuildItems = singletonList(kubernetesResourceMetadataBuildItem);
-        final List<KubernetesDeploymentTargetBuildItem> deploymentTargets = singletonList(new KubernetesDeploymentTargetBuildItem("kubernetes", "Deployment", "apps", "v1", DeployStrategy.CreateOrUpdate));
+        final List<KubernetesDeploymentTargetBuildItem> deploymentTargets =
+                singletonList(new KubernetesDeploymentTargetBuildItem("kubernetes", "Deployment", "apps", "v1", DeployStrategy.CreateOrUpdate));
         final List<KogitoCloudEventsBuildItem> extendedCloudEventsBuildItems = singletonList(new KogitoCloudEventsBuildItem(Set.of(EXTENDED_CLOUD_EVENT1, EXTENDED_CLOUD_EVENT2)));
 
         doCallRealMethod().when(processor).buildMetadata(singletonList(containerGeneratorBuildItem), extendedCloudEventsBuildItems, deploymentTargets, kubernetesMetaBuildItems, metadata);
diff --git a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
index 61ab1bee5a..66064308d2 100644
--- a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
+++ b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
@@ -23,8 +23,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
@@ -32,6 +30,8 @@ import org.eclipse.microprofile.health.Liveness;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import static org.kie.kogito.addons.quarkus.knative.eventing.KnativeEventingConfigSource.K_SINK;
 
 /**
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
index 71f9b5abc4..efc157146e 100644
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
 import jakarta.annotation.PostConstruct;
-import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 final class KnativeWorkItemHandlerConfig extends DefaultWorkItemHandlerConfig {
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
index 9a3b12dbf0..3734a916a3 100644
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
@@ -18,9 +18,6 @@
  */
 package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
 
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 import org.kogito.workitem.rest.RestWorkItemHandlerUtils;
 
@@ -28,6 +25,9 @@ import io.vertx.ext.web.client.WebClientOptions;
 import io.vertx.mutiny.core.Vertx;
 import io.vertx.mutiny.ext.web.client.WebClient;
 
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 public final class KnativeWorkItemHandlerProducer {
 
     @Inject
diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
index dfa401d862..be645faa28 100644
--- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
+++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
@@ -18,13 +18,13 @@
  */
 package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
 
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
 import io.vertx.ext.web.client.WebClientOptions;
 import io.vertx.mutiny.core.Vertx;
 import io.vertx.mutiny.ext.web.client.WebClient;
 
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 public class WebClientProducer {
 
     @Inject
diff --git a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
index 84fa677456..3bb8b1988f 100644
--- a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
+++ b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
@@ -18,8 +18,6 @@
  */
 package org.kie.kogito.addons.quarkus.kubernetes;
 
-import jakarta.inject.Inject;
-
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
@@ -29,6 +27,8 @@ import org.kie.kogito.addons.k8s.workitems.AbstractDiscoveredEndpointCaller;
 
 import io.quarkus.test.QuarkusUnitTest;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class KubernetesAddOnTest {
diff --git a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
index ddc14ab45d..3ec9da9d56 100644
--- a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
+++ b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.addons.quarkus.kubernetes;
 
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
 @Path("/foo")
 @Produces(MediaType.TEXT_PLAIN)
 public class Foo {
diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
index 3260bfb14b..c434ccea08 100644
--- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
+++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.addons.quarkus.k8s;
 
+import org.kie.kogito.addons.k8s.EndpointDiscovery;
+import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Default;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
-import org.kie.kogito.addons.k8s.EndpointDiscovery;
-import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 @ApplicationScoped
 public class EndpointCallerProducer {
 
diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
index ec3a3050fd..504b84fab4 100644
--- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
+++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
@@ -18,6 +18,12 @@
  */
 package org.kie.kogito.addons.quarkus.k8s;
 
+import org.kie.kogito.addons.k8s.KnativeRouteEndpointDiscovery;
+import org.kie.kogito.addons.k8s.KubernetesServiceEndpointDiscovery;
+import org.kie.kogito.addons.k8s.ServiceAndThenRouteEndpointDiscovery;
+
+import io.fabric8.kubernetes.client.KubernetesClient;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Default;
 import jakarta.enterprise.inject.Produces;
@@ -25,12 +31,6 @@ import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 
-import org.kie.kogito.addons.k8s.KnativeRouteEndpointDiscovery;
-import org.kie.kogito.addons.k8s.KubernetesServiceEndpointDiscovery;
-import org.kie.kogito.addons.k8s.ServiceAndThenRouteEndpointDiscovery;
-
-import io.fabric8.kubernetes.client.KubernetesClient;
-
 @ApplicationScoped
 public class EndpointDiscoveryProducer {
 
diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
index e3979a210a..8bb2ccc044 100644
--- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
+++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
@@ -25,8 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addons.k8s.Endpoint;
@@ -40,6 +38,8 @@ import io.fabric8.kubernetes.client.KubernetesClient;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
index 9ccb178844..98c38f833d 100644
--- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
+++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
@@ -26,9 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addons.k8s.Endpoint;
 import org.kie.kogito.addons.k8s.EndpointDiscovery;
@@ -42,6 +39,9 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
index 291f36b1d9..f19c12b145 100644
--- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
+++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
@@ -20,8 +20,6 @@ package org.kie.kogito.addons.quarkus.k8s.config;
 
 import java.net.URI;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
@@ -31,6 +29,8 @@ import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kubernetes.client.KubernetesTestServer;
 import io.quarkus.test.kubernetes.client.WithKubernetesTestServer;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil.createServiceIfNotExists;
 
@@ -65,4 +65,4 @@ class KubeDiscoveryConfigCacheUpdaterTest {
         assertThat(kubeDiscoveryConfigCacheUpdater.update("knative:services.v1.serving.knative.dev/test/serverless-workflow-greeting-quarkus"))
                 .hasValue(URI.create(remoteServiceUrl));
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
index f776accfdd..57581812cf 100644
--- a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
+++ b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
@@ -20,9 +20,6 @@ package org.kie.kogito.mail;
 
 import java.util.Arrays;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
 import org.slf4j.Logger;
@@ -31,6 +28,9 @@ import org.slf4j.LoggerFactory;
 import io.quarkus.mailer.Mail;
 import io.quarkus.mailer.reactive.ReactiveMailer;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusMailSender {
 
diff --git a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
index 8b6d4e02e8..00eb0fe4bc 100644
--- a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
+++ b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
@@ -22,8 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
@@ -33,6 +31,8 @@ import io.quarkus.mailer.Mail;
 import io.quarkus.mailer.MockMailbox;
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
index 31890f8776..2b87934702 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
@@ -23,8 +23,6 @@ import java.io.UncheckedIOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
 import org.kie.kogito.event.CloudEventMarshaller;
@@ -34,6 +32,8 @@ import org.kie.kogito.event.EventMarshaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.inject.Inject;
+
 public abstract class AbstractQuarkusCloudEventEmitter<M> implements EventEmitter {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractQuarkusCloudEventEmitter.class);
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
index a3ee7b4f1e..c25b4dddd4 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
@@ -22,10 +22,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import io.vertx.core.impl.ConcurrentHashSet;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class BackpressureKogitoEmitter implements QuarkusEmitterController {
 
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
index a8ff460ec6..4aa9ac5e1d 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
@@ -18,9 +18,6 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +28,9 @@ import io.smallrye.mutiny.operators.multi.MultiOperatorProcessor;
 import io.smallrye.mutiny.subscription.MultiSubscriber;
 import io.smallrye.reactive.messaging.providers.PublisherDecorator;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class BackpressurePublisherDecorator implements PublisherDecorator {
 
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
index e7a795bf2a..4aa6f126ff 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
@@ -18,10 +18,6 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.event.CloudEventMarshaller;
 import org.kie.kogito.event.EventMarshaller;
 import org.kie.kogito.event.impl.ByteArrayCloudEventMarshaller;
@@ -35,6 +31,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.arc.DefaultBean;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class EventMarshallerProducer {
 
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
index 5dfaa6901c..b5cfa8d7c8 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
@@ -18,10 +18,6 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
 import org.kie.kogito.event.EventUnmarshaller;
 import org.kie.kogito.event.impl.ByteArrayCloudEventUnmarshallerFactory;
@@ -33,6 +29,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.arc.DefaultBean;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class EventUnmarshallerProducer {
 
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
index 9e19b484f2..e7e0d41a51 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
@@ -20,15 +20,15 @@ package org.kie.kogito.addon.quarkus.messaging.common;
 
 import java.util.concurrent.ExecutorService;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.event.EventExecutorServiceFactory;
 import org.kie.kogito.event.KogitoEventStreams;
 
 import io.quarkus.arc.DefaultBean;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 @DefaultBean
 public class QuarkusEventExecutorServiceFactory implements EventExecutorServiceFactory {
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
index 48d018ba79..cf535df32c 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
@@ -18,9 +18,6 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.event.cloudevents.extension.KogitoExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension;
@@ -33,6 +30,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.cloudevents.jackson.JsonFormat;
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 /**
  * The goal of this bean is to register the Kogito CloudEvent extension
  * that allows the system to correctly parse Kogito extension attributes.
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
index b0867bc46a..1f3be268b3 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
@@ -21,8 +21,6 @@ package org.kie.kogito.addon.quarkus.messaging.common;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
-import jakarta.inject.Inject;
-
 import org.kie.kogito.Application;
 import org.kie.kogito.Model;
 import org.kie.kogito.event.EventExecutorServiceFactory;
@@ -31,6 +29,8 @@ import org.kie.kogito.event.impl.AbstractMessageConsumer;
 import org.kie.kogito.process.Process;
 import org.kie.kogito.process.ProcessService;
 
+import jakarta.inject.Inject;
+
 public abstract class QuarkusMessageConsumer<M extends Model, D> extends AbstractMessageConsumer<M, D> {
 
     @Inject
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
index 17076ecabd..b4a6535310 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
@@ -22,14 +22,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
-import jakarta.annotation.Priority;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.kie.kogito.addon.cloudevents.AbstractTopicDiscovery;
 import org.kie.kogito.event.ChannelType;
 import org.kie.kogito.event.Topic;
 
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 @Priority(0)
 public class QuarkusTopicDiscovery extends AbstractTopicDiscovery {
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
index 98249088ef..b37c1ba470 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
@@ -18,6 +18,11 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
+import org.kie.kogito.addon.cloudevents.AbstractTopicsInformationResource;
+import org.kie.kogito.event.TopicDiscovery;
+import org.kie.kogito.event.cloudevents.CloudEventMeta;
+
+import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
@@ -26,11 +31,6 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
-import jakarta.annotation.PostConstruct;
-import org.kie.kogito.addon.cloudevents.AbstractTopicsInformationResource;
-import org.kie.kogito.event.TopicDiscovery;
-import org.kie.kogito.event.cloudevents.CloudEventMeta;
-
 @Path("/messaging/topics")
 @ApplicationScoped()
 public class QuarkusTopicsInformationResource extends AbstractTopicsInformationResource {
diff --git a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
index 16474d1f42..d09f7db6d1 100644
--- a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
+++ b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
@@ -18,10 +18,6 @@
  */
 package org.kie.kogito.addon.messaging;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
@@ -29,6 +25,10 @@ import org.kie.kogito.event.EventUnmarshaller;
 
 import io.quarkus.arc.DefaultBean;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @DefaultBean
 @ApplicationScoped
 public class QuarkusDefaultCloudEventReceiver extends AbstractQuarkusCloudEventReceiver<Object> {
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
index ff698f32f0..fcb7e3e1b2 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
@@ -21,12 +21,12 @@ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class MicroProfileConfigServiceCatalog implements KubernetesServiceCatalog {
 
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
index 08c6e2e0d5..c9240b924f 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
 
-import jakarta.inject.Inject;
-
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 @QuarkusTest
 public class MicroProfileConfigServiceCatalogTest extends KubernetesServiceCatalogTest {
 
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
index 9654aec7f3..3d14b5ecd5 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
@@ -18,10 +18,6 @@
  */
 package org.kie.kogito.monitoring.core.quarkus;
 
-import jakarta.enterprise.context.Dependent;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.drools.core.config.DefaultRuleEventListenerConfig;
@@ -35,6 +31,10 @@ import org.slf4j.LoggerFactory;
 import io.micrometer.core.instrument.Metrics;
 import io.quarkus.arc.properties.IfBuildProperty;
 
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 @Dependent
 public class QuarkusEventListenerFactory {
 
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
index 0ed27048e7..2bb4ec6136 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
@@ -18,13 +18,6 @@
  */
 package org.kie.kogito.monitoring.core.quarkus;
 
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.container.DynamicFeature;
-import jakarta.ws.rs.container.ResourceInfo;
-import jakarta.ws.rs.core.FeatureContext;
-import jakarta.ws.rs.ext.Provider;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
@@ -34,6 +27,13 @@ import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollect
 
 import io.micrometer.core.instrument.Metrics;
 
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.DynamicFeature;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.FeatureContext;
+import jakarta.ws.rs.ext.Provider;
+
 @Provider
 public class QuarkusMetricsFilterRegister implements DynamicFeature {
 
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
index 1501904a6e..de7b60ff97 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
@@ -20,12 +20,12 @@ package org.kie.kogito.monitoring.core.quarkus;
 
 import java.util.List;
 
+import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
+
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerResponseContext;
 import jakarta.ws.rs.container.ContainerResponseFilter;
 
-import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
-
 public class QuarkusMetricsInterceptor implements ContainerResponseFilter {
 
     private final MetricsInterceptor metricsInterceptor;
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
index c87d17e8fd..616a0ce20e 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
@@ -18,10 +18,6 @@
  */
 package org.kie.kogito.monitoring.core.quarkus;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector;
@@ -30,6 +26,10 @@ import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollect
 import io.micrometer.core.instrument.Metrics;
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 @Startup
 public class QuarkusSystemMetricsCollectorProvider implements SystemMetricsCollectorProvider {
diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
index cc74d0bb0d..58b6767501 100644
--- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
+++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
@@ -20,13 +20,13 @@ package org.kie.kogito.monitoring.core.quarkus;
 
 import java.util.List;
 
-import jakarta.enterprise.inject.Instance;
-import jakarta.ws.rs.core.FeatureContext;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.monitoring.core.common.mock.MockedConfigBean;
 import org.mockito.ArgumentCaptor;
 
+import jakarta.enterprise.inject.Instance;
+import jakarta.ws.rs.core.FeatureContext;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
index 87b6340558..5814542b85 100644
--- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
+++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
@@ -22,15 +22,15 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.jupiter.api.Test;
+import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
+import org.mockito.ArgumentCaptor;
+
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.container.ContainerResponseContext;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriInfo;
 
-import org.junit.jupiter.api.Test;
-import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
-import org.mockito.ArgumentCaptor;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
index af3679c91e..10b5fea409 100644
--- a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
+++ b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
@@ -20,9 +20,6 @@ package org.kie.kogito.monitoring.elastic.quarkus;
 
 import java.util.Optional;
 
-import jakarta.enterprise.event.Observes;
-import jakarta.inject.Singleton;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory;
 import org.kie.kogito.monitoring.elastic.common.ElasticRegistry;
@@ -30,6 +27,9 @@ import org.kie.kogito.monitoring.elastic.common.KogitoElasticConfig;
 
 import io.quarkus.runtime.StartupEvent;
 
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class QuarkusElasticRegistryProvider extends ElasticRegistry {
 
diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
index 49ebd0dd73..edc9037092 100644
--- a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.persistence.filesystem.AbstractProcessInstancesFactory;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class FileSystemProcessInstancesFactory extends AbstractProcessInstancesFactory {
 
diff --git a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
index 1a3eb9199c..803f1ed141 100644
--- a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
+++ b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
@@ -24,8 +24,6 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import jakarta.enterprise.inject.Instance;
-
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.infinispan.client.hotrod.RemoteCacheManager;
@@ -36,6 +34,8 @@ import org.infinispan.client.hotrod.impl.operations.PingOperation;
 import org.infinispan.client.hotrod.impl.operations.PingResponse;
 import org.infinispan.client.hotrod.impl.transport.netty.ChannelFactory;
 
+import jakarta.enterprise.inject.Instance;
+
 /**
  * This is a health check implementation for Infinispan Hot Rod Server, based on client and
  * {@link RemoteCacheManager}. Basically it executes a ping operation to all nodes and if all are down it responds as
@@ -99,4 +99,4 @@ public class InfinispanHealthCheck implements HealthCheck {
     private PingOperation invokePingOperation(ChannelFactory channelFactory, OperationsFactory operationsFactory, SocketAddress server) {
         return channelFactory.fetchChannelAndInvoke(server, operationsFactory.newPingOperation(true));
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
index 460341686d..8012fdad3d 100644
--- a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
+++ b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
@@ -18,10 +18,6 @@
  */
 package org.kie.kogito.infinispan.health;
 
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.Resource;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.junit.jupiter.api.Test;
@@ -30,6 +26,10 @@ import org.kie.kogito.testcontainers.quarkus.InfinispanQuarkusTestResource;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.annotation.Resource;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusTest
diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
index 222d287c54..da761d600a 100644
--- a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
@@ -20,13 +20,13 @@ package org.kie.kogito.persistence.quarkus;
 
 import java.util.Optional;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.kie.kogito.infinispan.AbstractProcessInstancesFactory;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class InfinispanProcessInstancesFactory extends AbstractProcessInstancesFactory {
 
diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
index 384eb6ac09..2d7a4d98e1 100644
--- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
@@ -18,13 +18,14 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 import javax.sql.DataSource;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.persistence.jdbc.AbstractProcessInstancesFactory;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class JDBCProcessInstancesFactory extends AbstractProcessInstancesFactory {
 
diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
index b73095c95d..8bbcc59412 100644
--- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
+++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
@@ -21,7 +21,6 @@ package org.kie.kogito.persistence.quarkus;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import jakarta.enterprise.inject.Produces;
 import javax.sql.DataSource;
 
 import org.kie.kogito.correlation.CorrelationService;
@@ -31,6 +30,8 @@ import org.kie.kogito.persistence.jdbc.correlation.JDBCCorrelationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.enterprise.inject.Produces;
+
 public class JDBCorrelationServiceProducer {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JDBCorrelationServiceProducer.class);
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
index d5bf80a692..892e44fc55 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
@@ -20,10 +20,6 @@ package org.kie.kogito.persistence;
 
 import java.util.Map;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PreDestroy;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.kafka.common.serialization.StringSerializer;
@@ -36,6 +32,10 @@ import org.slf4j.LoggerFactory;
 
 import io.smallrye.common.annotation.Identifier;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class KafkaProcessInstancesFactory implements ProcessInstancesFactory {
 
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
index 052f652d7b..77b229715d 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
@@ -22,16 +22,16 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PreDestroy;
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StoreQueryParameters;
 import org.apache.kafka.streams.state.QueryableStoreTypes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import static org.kie.kogito.persistence.kafka.KafkaPersistenceUtils.storeName;
 
 @ApplicationScoped
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
index a4710f9471..fb40606bba 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.persistence.kafka;
 
+import org.apache.kafka.streams.Topology;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;
 
-import org.apache.kafka.streams.Topology;
-
 import static org.kie.kogito.persistence.kafka.KafkaPersistenceUtils.createTopologyForProcesses;
 
 @ApplicationScoped
diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
index 43b005f712..19f4ad110a 100644
--- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.mongodb.AbstractProcessInstancesFactory;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
 import com.mongodb.client.MongoClient;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class MongoDBProcessInstancesFactory extends AbstractProcessInstancesFactory {
 
diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
index 0979fa9f36..a56052b84f 100644
--- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
+++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
 import com.mongodb.client.MongoClient;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class MongoDBTransactionManager extends AbstractTransactionManager {
 
diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
index b0688f0402..b4cc079d25 100644
--- a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.persistence.postgresql.AbstractProcessInstancesFactory;
 
 import io.vertx.pgclient.PgPool;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class PostgresqlProcessInstancesFactory extends AbstractProcessInstancesFactory {
 
diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
index 0b9c49ae20..8d9a14b874 100644
--- a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
+++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
@@ -18,12 +18,6 @@
  */
 package org.kie.kogito.persistence.quarkus.rocksdb;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import org.kie.kogito.persistence.rocksdb.RocksDBProcessInstancesFactory;
 import org.kie.kogito.process.ProcessInstancesFactory;
 import org.rocksdb.Options;
@@ -32,6 +26,12 @@ import org.rocksdb.RocksDBException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class RocksDbProcessInstancesFactoryProducer {
 
diff --git a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
index 84dd1d05b3..5e8022f4e9 100644
--- a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
+++ b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
@@ -18,11 +18,20 @@
  */
 package org.kie.kogito.process.definitions;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.io.StringReader;
 
+import org.kie.kogito.process.ProcessInstancesFactory;
+import org.kie.kogito.serverless.workflow.executor.StaticWorkflowApplication;
+import org.kie.kogito.serverless.workflow.models.JsonNodeModel;
+import org.kie.kogito.serverless.workflow.models.JsonNodeModelInput;
+import org.kie.kogito.serverless.workflow.utils.ServerlessWorkflowUtils;
+import org.kie.kogito.serverless.workflow.utils.WorkflowFormat;
+
+import com.fasterxml.jackson.databind.node.NullNode;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
@@ -33,15 +42,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.process.ProcessInstancesFactory;
-import org.kie.kogito.serverless.workflow.executor.StaticWorkflowApplication;
-import org.kie.kogito.serverless.workflow.models.JsonNodeModel;
-import org.kie.kogito.serverless.workflow.models.JsonNodeModelInput;
-import org.kie.kogito.serverless.workflow.utils.ServerlessWorkflowUtils;
-import org.kie.kogito.serverless.workflow.utils.WorkflowFormat;
-
-import com.fasterxml.jackson.databind.node.NullNode;
-
 @Path("/")
 public class ProcessDefinitionsResource {
 
diff --git a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
index fd71154a44..80c160c2bc 100644
--- a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
+++ b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
@@ -18,6 +18,9 @@
  */
 package org.kie.kogito.process.management;
 
+import org.kie.kogito.Application;
+import org.kie.kogito.process.Processes;
+
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DELETE;
@@ -30,9 +33,6 @@ import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
 
-import org.kie.kogito.Application;
-import org.kie.kogito.process.Processes;
-
 @Path("/management/processes/")
 public class ProcessInstanceManagementResource extends BaseProcessInstanceManagementResource<Response> {
 
diff --git a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
index 9a1f266bcb..0a40abf59a 100644
--- a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
+++ b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
@@ -20,13 +20,6 @@ package org.kie.kogito.process.management;
 
 import java.util.Optional;
 
-import jakarta.enterprise.inject.Instance;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.ResponseBuilder;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.Response.StatusType;
-import jakarta.ws.rs.ext.RuntimeDelegate;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -46,6 +39,13 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.stubbing.Answer;
 
+import jakarta.enterprise.inject.Instance;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.StatusType;
+import jakarta.ws.rs.ext.RuntimeDelegate;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
index 1d476c8628..063c285ada 100644
--- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
+++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
@@ -23,10 +23,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.svg.ProcessSVGException;
 import org.slf4j.Logger;
@@ -39,6 +35,10 @@ import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonMap;
 import static java.util.Objects.nonNull;
diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
index c18ee17d72..4f4494d7cb 100644
--- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
+++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
@@ -20,6 +20,11 @@ package org.kie.kogito.svg.rest;
 
 import java.util.Optional;
 
+import org.kie.kogito.svg.ProcessSvgService;
+
+import io.quarkus.security.credential.TokenCredential;
+import io.quarkus.security.identity.SecurityIdentity;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DefaultValue;
@@ -30,11 +35,6 @@ import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.svg.ProcessSvgService;
-
-import io.quarkus.security.credential.TokenCredential;
-import io.quarkus.security.identity.SecurityIdentity;
-
 @ApplicationScoped
 @Path("/svg")
 public class ProcessSvgResource {
diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
index 05618b33e1..9ce481f86d 100644
--- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
+++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
@@ -20,13 +20,13 @@ package org.kie.kogito.svg.service;
 
 import java.util.Optional;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.svg.AbstractProcessSvgService;
 import org.kie.kogito.svg.dataindex.DataIndexClient;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusProcessSvgService extends AbstractProcessSvgService {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
index 976baa4bfc..2f9e0f6a2a 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.workitem.InvalidLifeCyclePhaseException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.workitem.InvalidLifeCyclePhaseException;
-
 @Provider
 public class InvalidLifeCyclePhaseExceptionMapper extends BaseExceptionMapper<InvalidLifeCyclePhaseException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
index ef21f6b61b..c5d8785ab6 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.workitem.InvalidTransitionException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.workitem.InvalidTransitionException;
-
 @Provider
 public class InvalidTransitionExceptionMapper extends BaseExceptionMapper<InvalidTransitionException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
index f1f131945e..698a1155e7 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.NodeInstanceNotFoundException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.NodeInstanceNotFoundException;
-
 @Provider
 public class NodeInstanceNotFoundExceptionMapper extends BaseExceptionMapper<NodeInstanceNotFoundException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
index 4ac3965b2c..182e1df839 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.NodeNotFoundException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.NodeNotFoundException;
-
 @Provider
 public class NodeNotFoundExceptionMapper extends BaseExceptionMapper<NodeNotFoundException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
index 29e5056652..99b030fc07 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.workitem.NotAuthorizedException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.workitem.NotAuthorizedException;
-
 @Provider
 public class NotAuthorizedExceptionMapper extends BaseExceptionMapper<NotAuthorizedException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
index 59bec8b102..ed9bb35c96 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.ProcessInstanceDuplicatedException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.ProcessInstanceDuplicatedException;
-
 @Provider
 public class ProcessInstanceDuplicatedExceptionMapper extends BaseExceptionMapper<ProcessInstanceDuplicatedException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
index 4d450420eb..9e3f41ef95 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.ProcessInstanceExecutionException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.ProcessInstanceExecutionException;
-
 @Provider
 public class ProcessInstanceExecutionExceptionMapper extends BaseExceptionMapper<ProcessInstanceExecutionException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
index 27391a3a31..46b511d6b3 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.ProcessInstanceNotFoundException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.ProcessInstanceNotFoundException;
-
 @Provider
 public class ProcessInstanceNotFoundExceptionMapper extends BaseExceptionMapper<ProcessInstanceNotFoundException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
index ce80911352..85ab766ee4 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.VariableViolationException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.VariableViolationException;
-
 @Provider
 public class VariableViolationExceptionMapper extends BaseExceptionMapper<VariableViolationException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
index 201c6180cc..53f97d5163 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.process.workitem.WorkItemExecutionException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.process.workitem.WorkItemExecutionException;
-
 @Provider
 public class WorkItemExecutionExceptionMapper extends BaseExceptionMapper<WorkItemExecutionException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
index 0b0f3ff03a..1d24e26b21 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.resource.exceptions;
 
+import org.kie.kogito.internal.process.runtime.WorkItemNotFoundException;
+
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.Provider;
 
-import org.kie.kogito.internal.process.runtime.WorkItemNotFoundException;
-
 @Provider
 public class WorkItemNotFoundExceptionMapper extends BaseExceptionMapper<WorkItemNotFoundException> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
index ce16cc01af..028a91a91b 100644
--- a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
+++ b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.RuntimeDelegate;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.RuntimeDelegate;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
@@ -97,4 +97,4 @@ class ExceptionsHandlerTest {
         tested.forbidden(body);
         assertRequest(Response.Status.FORBIDDEN);
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
index 8866e3c887..4cadb22c29 100644
--- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
+++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.addon.source.files;
 
-import jakarta.enterprise.inject.spi.CDI;
-
 import io.quarkus.runtime.annotations.Recorder;
 
+import jakarta.enterprise.inject.spi.CDI;
+
 @Recorder
 public class SourceFilesRecorder {
 
diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
index da618e2728..a347cf8293 100644
--- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
+++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
@@ -23,6 +23,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
+import org.kie.kogito.resource.exceptions.ExceptionsHandler;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
@@ -33,8 +35,6 @@ import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.resource.exceptions.ExceptionsHandler;
-
 @ApplicationScoped
 @Path("/management/processes/")
 public final class SourceFilesResource {
diff --git a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
index 82414cb6ea..234b555d94 100644
--- a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
+++ b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
@@ -20,14 +20,14 @@ package org.kie.kogito.addon.source.files;
 
 import java.util.Optional;
 
-import jakarta.ws.rs.core.Response;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.ws.rs.core.Response;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
index 624c19a504..923933b186 100644
--- a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
+++ b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
@@ -18,9 +18,16 @@
  */
 package org.kie.kogito.task.management;
 
-import jakarta.annotation.PostConstruct;
 import java.util.List;
 
+import org.kie.kogito.process.ProcessConfig;
+import org.kie.kogito.process.Processes;
+import org.kie.kogito.process.workitem.Policies;
+import org.kie.kogito.task.management.service.TaskInfo;
+import org.kie.kogito.task.management.service.TaskManagementOperations;
+import org.kie.kogito.task.management.service.TaskManagementService;
+
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
@@ -33,13 +40,6 @@ import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.process.ProcessConfig;
-import org.kie.kogito.process.Processes;
-import org.kie.kogito.process.workitem.Policies;
-import org.kie.kogito.task.management.service.TaskInfo;
-import org.kie.kogito.task.management.service.TaskManagementOperations;
-import org.kie.kogito.task.management.service.TaskManagementService;
-
 @Path("/management/processes")
 public class TaskManagementResource {
 
diff --git a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
index 287af70636..1984f5cded 100644
--- a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
+++ b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
@@ -20,9 +20,6 @@ package org.kie.kogito.task.notification.quarkus;
 
 import java.util.Collection;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.kie.kogito.event.DataEvent;
@@ -30,6 +27,9 @@ import org.kie.kogito.event.EventPublisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class NotificationEventPublisher implements EventPublisher {
 
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
index 20d98853d7..bc155ee162 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
@@ -20,9 +20,6 @@ package org.kie.kogito.tracing.decision;
 
 import java.util.function.BiFunction;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
 import org.kie.kogito.Application;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.tracing.decision.event.evaluate.EvaluateEvent;
@@ -30,6 +27,9 @@ import org.kie.kogito.tracing.decision.modelsupplier.ApplicationModelSupplier;
 
 import io.quarkus.vertx.ConsumeEvent;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class QuarkusDecisionTracingCollector {
 
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
index 586cd9df64..86fbe96f9d 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
@@ -18,13 +18,13 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import io.vertx.core.eventbus.EventBus;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 /**
  * This class must always extend <code>org.kie.kogito.tracing.decision.DecisionTracingListener</code>
  * for code generation plugins to correctly detect if this addon is enabled.
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
index 7f071d497c..6c999fec15 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
@@ -18,9 +18,6 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
 import java.util.concurrent.Flow.Publisher;
 
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
@@ -28,6 +25,9 @@ import org.kie.kogito.decision.DecisionModelResourcesProvider;
 
 import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class QuarkusModelEventEmitter extends BaseModelEventEmitter {
 
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
index 12d3750759..7b3022bcc8 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
@@ -18,16 +18,16 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import jakarta.enterprise.event.Observes;
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.quarkus.runtime.Startup;
 import io.quarkus.runtime.StartupEvent;
 
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 @Startup
 public class QuarkusStartupModelPublisher {
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
index 32c240f73c..d2c76b4f3e 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
@@ -18,8 +18,6 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import jakarta.inject.Singleton;
-
 import java.util.concurrent.Flow.Publisher;
 
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
@@ -27,6 +25,8 @@ import org.kie.kogito.tracing.EventEmitter;
 
 import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor;
 
+import jakarta.inject.Singleton;
+
 @Singleton
 public class QuarkusTraceEventEmitter implements EventEmitter {
 
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
index 86ce83223a..89505fac8a 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
@@ -20,6 +20,12 @@ package org.kie.kogito.quarkus.dmn;
 
 import java.util.Map;
 
+import org.kie.kogito.incubation.application.AppRoot;
+import org.kie.kogito.incubation.common.DataContext;
+import org.kie.kogito.incubation.common.MapDataContext;
+import org.kie.kogito.incubation.decisions.DecisionIds;
+import org.kie.kogito.incubation.decisions.services.DecisionService;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
@@ -27,12 +33,6 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
-import org.kie.kogito.incubation.application.AppRoot;
-import org.kie.kogito.incubation.common.DataContext;
-import org.kie.kogito.incubation.common.MapDataContext;
-import org.kie.kogito.incubation.decisions.DecisionIds;
-import org.kie.kogito.incubation.decisions.services.DecisionService;
-
 @Path("/custom")
 public class CustomEndpoint {
 
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
index 0880e67b40..cd21f5a692 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.core.decision.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.incubation.decisions.DecisionIds;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 class QuarkusDecisionIdFactory extends DecisionIds {
 }
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
index 5955532e49..8014de426d 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.core.decision.incubation.quarkus.support;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.decision.DecisionModels;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
 import org.kie.kogito.incubation.common.LocalId;
 import org.kie.kogito.incubation.decisions.services.DecisionService;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusDecisionService implements DecisionService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
index ac27b0fac9..c4c6079bd3 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
@@ -31,9 +31,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
 import org.drools.codegen.common.DroolsModelBuildContext;
 import org.drools.codegen.common.GeneratedFile;
 import org.drools.codegen.common.GeneratedFileType;
@@ -70,6 +67,9 @@ import io.quarkus.maven.dependency.ResolvedDependency;
 import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
 import io.quarkus.vertx.http.deployment.spi.AdditionalStaticResourceBuildItem;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 import static org.drools.codegen.common.GeneratedFileType.COMPILED_CLASS;
 import static org.drools.quarkus.util.deployment.DroolsQuarkusResourceUtils.compileGeneratedSources;
 import static org.drools.quarkus.util.deployment.DroolsQuarkusResourceUtils.makeBuildItems;
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
index 5ec28db8f0..dde1f4803d 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
@@ -22,15 +22,15 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 
+import org.kie.kogito.auth.IdentityProvider;
+
+import io.quarkus.security.identity.SecurityIdentity;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.control.ActivateRequestContext;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
-import org.kie.kogito.auth.IdentityProvider;
-
-import io.quarkus.security.identity.SecurityIdentity;
-
 @ApplicationScoped
 public class QuarkusIdentityProvider implements IdentityProvider {
 
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
index 24be9f3449..375a1121db 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
@@ -20,13 +20,13 @@ package org.kie.kogito.quarkus.config;
 
 import java.util.Optional;
 
+import org.kie.kogito.KogitoGAV;
+import org.kie.kogito.config.StaticConfigBean;
+
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
-import org.kie.kogito.KogitoGAV;
-import org.kie.kogito.config.StaticConfigBean;
-
 @Singleton
 public class ConfigBean extends StaticConfigBean {
 
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
index 0a03ee61e8..a9bc0fa236 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
@@ -18,11 +18,6 @@
  */
 package org.kie.kogito.quarkus.registry;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.event.Observes;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.Application;
 import org.kie.kogito.process.Processes;
 import org.kie.kogito.quarkus.config.KogitoRuntimeConfig;
@@ -30,6 +25,11 @@ import org.kie.kogito.services.registry.ProcessDefinitionEventRegistry;
 
 import io.quarkus.runtime.StartupEvent;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class ProcessDefinitionRegistration {
 
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
index 9d3e90724f..8b8da9f306 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.quarkus.runtime;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-
 import io.quarkus.arc.DefaultBean;
 import io.vertx.ext.web.client.WebClientOptions;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+
 import static org.kogito.workitem.rest.RestWorkItemHandlerUtils.sslWebClientOptions;
 
 @ApplicationScoped
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
index c12bae9814..5b92a76977 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
@@ -21,9 +21,6 @@ package org.kie.kogito.quarkus.jbpm;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.Model;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
@@ -32,6 +29,9 @@ import org.kie.kogito.process.ProcessInstance;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
index 9cd782e06d..b9dbb7e77e 100644
--- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
+++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
@@ -18,13 +18,13 @@
  */
 package org.kie.kogito.incubation.application.quarkus;
 
+import org.kie.kogito.incubation.application.AppRoot;
+import org.kie.kogito.incubation.common.ComponentRoot;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
-import org.kie.kogito.incubation.application.AppRoot;
-import org.kie.kogito.incubation.common.ComponentRoot;
-
 @ApplicationScoped
 public class QuarkusAppRoot extends AppRoot {
     @Inject
@@ -38,4 +38,4 @@ public class QuarkusAppRoot extends AppRoot {
     public <T extends ComponentRoot> T get(Class<T> providerId) {
         return componentRoots.select(providerId).get();
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
index 1145293a40..1e6e245afc 100644
--- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
+++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
@@ -20,8 +20,6 @@ package org.kie.kogito.incubation.common.objectmapper.quarkus;
 
 import java.util.Map;
 
-import jakarta.enterprise.inject.spi.CDI;
-
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
 import org.kie.kogito.incubation.common.MapDataContext;
@@ -30,6 +28,8 @@ import org.kie.kogito.incubation.common.objectmapper.InternalObjectMapper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.enterprise.inject.spi.CDI;
+
 /**
  * This class bridges CDI to non-CDI classes by using <code>CDI.current().select()</code>
  */
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
index 904bb0f277..5cae3b7a65 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
@@ -20,6 +20,12 @@ package org.kie.kogito.quarkus.pmml;
 
 import java.util.Map;
 
+import org.kie.kogito.incubation.application.AppRoot;
+import org.kie.kogito.incubation.common.DataContext;
+import org.kie.kogito.incubation.common.MapDataContext;
+import org.kie.kogito.incubation.predictions.PredictionIds;
+import org.kie.kogito.incubation.predictions.services.PredictionService;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
@@ -27,12 +33,6 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
-import org.kie.kogito.incubation.application.AppRoot;
-import org.kie.kogito.incubation.common.DataContext;
-import org.kie.kogito.incubation.common.MapDataContext;
-import org.kie.kogito.incubation.predictions.PredictionIds;
-import org.kie.kogito.incubation.predictions.services.PredictionService;
-
 @Path("/custom")
 public class CustomEndpoint {
 
@@ -51,4 +51,4 @@ public class CustomEndpoint {
         return svc.evaluate(id, MapDataContext.from(payload));
     }
 
-}
\ No newline at end of file
+}
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
index bdea4a5b87..303535ab95 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.core.prediction.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.incubation.predictions.PredictionIds;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 class QuarkusPredictionIds extends PredictionIds {
 }
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
index c2c727b1f3..f0d3faeef1 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.core.prediction.incubation.quarkus.support;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
 import org.kie.kogito.incubation.common.LocalId;
 import org.kie.kogito.incubation.predictions.services.PredictionService;
 import org.kie.kogito.prediction.PredictionModels;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusPredictionService implements PredictionService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
index 6b0f0863ce..2fe0982edc 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
@@ -20,6 +20,14 @@ package org.acme;
 
 import java.util.Map;
 
+import org.kie.kogito.Model;
+import org.kie.kogito.incubation.application.AppRoot;
+import org.kie.kogito.incubation.common.DataContext;
+import org.kie.kogito.incubation.common.MapDataContext;
+import org.kie.kogito.incubation.processes.ProcessIds;
+import org.kie.kogito.incubation.processes.services.StraightThroughProcessService;
+import org.kie.kogito.process.Process;
+
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.ws.rs.Consumes;
@@ -30,14 +38,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.Model;
-import org.kie.kogito.incubation.application.AppRoot;
-import org.kie.kogito.incubation.common.DataContext;
-import org.kie.kogito.incubation.common.MapDataContext;
-import org.kie.kogito.incubation.processes.ProcessIds;
-import org.kie.kogito.incubation.processes.services.StraightThroughProcessService;
-import org.kie.kogito.process.Process;
-
 @Path("/hello")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
@@ -65,4 +65,4 @@ public class GreetingResource {
         return Response.ok(Map.of("version", approvalProcess.version())).build();
     }
 
-}
\ No newline at end of file
+}
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
index f0c911c32d..87625b9c09 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
@@ -21,8 +21,6 @@ package org.acme;
 import java.util.List;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.incubation.application.AppRoot;
 import org.kie.kogito.incubation.common.*;
@@ -40,6 +38,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
index e50d19ccd6..d1e07cbe39 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
@@ -18,11 +18,6 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.Application;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
@@ -32,6 +27,11 @@ import org.kie.kogito.incubation.processes.services.humantask.HumanTaskService;
 import org.kie.kogito.process.Processes;
 import org.kie.kogito.process.impl.ProcessServiceImpl;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusHumanTaskService implements HumanTaskService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
index dac1728920..9ee4e8e45c 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.incubation.processes.ProcessIds;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class QuarkusProcessIdFactory extends ProcessIds {
 
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
index 0e2d7dff0d..201dc8c16e 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
@@ -18,11 +18,6 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.Application;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
@@ -31,6 +26,11 @@ import org.kie.kogito.incubation.processes.services.StatefulProcessService;
 import org.kie.kogito.process.Processes;
 import org.kie.kogito.process.impl.ProcessServiceImpl;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusStatefulProcessService implements StatefulProcessService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
index 0875bfbc3c..bb776f9444 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
@@ -18,16 +18,16 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.Id;
 import org.kie.kogito.incubation.processes.services.StraightThroughProcessService;
 import org.kie.kogito.process.Processes;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusStraightThroughProcessService implements StraightThroughProcessService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
index 5ab246a52d..403b60fda4 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.quarkus.drools;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.drools.ruleunits.api.DataStore;
 import org.drools.ruleunits.api.RuleUnitData;
 import org.kie.kogito.incubation.common.ReferenceContext;
 
 import io.quarkus.arc.Unremovable;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 @Unremovable // temporary workaround to allow injecting RuleUnitInstance<AnotherService>
              // without injecting AnotherService directly (otherwise Quarkus ArC will ignore this)
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
index a6d15cf7e8..10c813280b 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
@@ -21,6 +21,12 @@ package org.kie.kogito.quarkus.drools;
 import java.util.Map;
 import java.util.Optional;
 
+import org.kie.kogito.incubation.application.AppRoot;
+import org.kie.kogito.incubation.common.DataContext;
+import org.kie.kogito.incubation.common.MapDataContext;
+import org.kie.kogito.incubation.rules.RuleUnitIds;
+import org.kie.kogito.incubation.rules.services.RuleUnitService;
+
 import jakarta.inject.Inject;
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.POST;
@@ -28,12 +34,6 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 
-import org.kie.kogito.incubation.application.AppRoot;
-import org.kie.kogito.incubation.common.DataContext;
-import org.kie.kogito.incubation.common.MapDataContext;
-import org.kie.kogito.incubation.rules.RuleUnitIds;
-import org.kie.kogito.incubation.rules.services.RuleUnitService;
-
 @Path("/custom")
 public class CustomEndpoint {
 
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
index 3673790aad..a68e57d881 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
@@ -20,8 +20,6 @@ package org.kie.kogito.quarkus.drools;
 
 import java.util.Map;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.incubation.common.EmptyDataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
@@ -34,6 +32,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
index 6b273c673e..8347135d1d 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
@@ -22,8 +22,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jakarta.inject.Inject;
-
 import org.drools.ruleunits.api.DataSource;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.incubation.application.AppRoot;
@@ -42,6 +40,8 @@ import org.kie.kogito.incubation.rules.services.contexts.RuleUnitMetaDataContext
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
index 50c0b4724a..d2b144a6e3 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
@@ -18,13 +18,13 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-
 import org.drools.ruleunits.api.DataSource;
 import org.drools.ruleunits.api.DataStore;
 import org.drools.ruleunits.api.DataStream;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+
 @ApplicationScoped
 public class DataSourceProvider {
     @Produces
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
index d5cc44b16e..3b23e58776 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.LocalId;
 import org.kie.kogito.incubation.rules.data.DataId;
 import org.kie.kogito.incubation.rules.services.DataSourceService;
 import org.kie.kogito.rules.RuleUnits;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusDataSourceService implements DataSourceService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
index 6ec9b87446..3b190b39ff 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.incubation.rules.RuleUnitIds;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 class QuarkusRuleUnitIdFactory extends RuleUnitIds {
 }
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
index 5fe045b532..bfd1eb2776 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
@@ -20,16 +20,16 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
 
 import java.util.stream.Stream;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.drools.ruleunits.api.RuleUnits;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.Id;
 import org.kie.kogito.incubation.rules.services.RuleUnitService;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusRuleUnitService implements RuleUnitService {
 
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
index 0019bdad1e..10b23577d8 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
@@ -20,11 +20,6 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
 
 import java.util.stream.Stream;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
 import org.kie.kogito.incubation.common.ExtendedReferenceContext;
 import org.kie.kogito.incubation.common.LocalId;
@@ -32,6 +27,11 @@ import org.kie.kogito.incubation.common.MetaDataContext;
 import org.kie.kogito.incubation.rules.services.StatefulRuleUnitService;
 import org.kie.kogito.rules.RuleUnits;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class QuarkusStatefulRuleUnitService implements StatefulRuleUnitService {
     @Inject
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
index 05071bef84..45945048c2 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.jackson.ObjectMapperCustomizer;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 /**
  * Wraps and configures a custom ObjectMapper for DataSources
  */
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
index 765cbcf449..550fb9d128 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
@@ -30,8 +30,6 @@ import java.util.ServiceLoader;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jakarta.inject.Inject;
-
 import org.drools.codegen.common.GeneratedFile;
 import org.drools.codegen.common.GeneratedFileType;
 import org.drools.quarkus.util.deployment.DroolsQuarkusResourceUtils;
@@ -67,6 +65,8 @@ import io.quarkus.paths.PathTree;
 import io.quarkus.runtime.configuration.ConfigUtils;
 import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 
+import jakarta.inject.Inject;
+
 /**
  * This class adds live reload support for {@link io.quarkus.deployment.CodeGenProvider} objects.
  */
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
index 3479fdbf6d..214abfcd26 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
@@ -22,9 +22,6 @@ import java.lang.annotation.Annotation;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.ws.rs.core.Response;
-
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
@@ -56,6 +53,9 @@ import io.quarkiverse.openapi.generator.annotations.GeneratedClass;
 import io.quarkiverse.openapi.generator.annotations.GeneratedMethod;
 import io.quarkiverse.openapi.generator.annotations.GeneratedParam;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.core.Response;
+
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
 
 public class WorkflowOpenApiHandlerGenerator extends ClassAnnotatedWorkflowHandlerGenerator {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
index e6144f96c4..cad673ba39 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
@@ -22,9 +22,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.jandex.IndexView;
 import org.kie.kogito.codegen.api.context.KogitoBuildContext;
@@ -49,6 +46,9 @@ import com.github.javaparser.ast.stmt.ReturnStmt;
 import io.grpc.Channel;
 import io.quarkus.grpc.GrpcClient;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
 
 public class WorkflowRPCHandlerGenerator implements WorkflowHandlerGenerator {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
index 881d80ea18..310dedb1d6 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
@@ -21,14 +21,13 @@ package org.kie.kogito.serverless.workflow.io;
 import java.net.URI;
 import java.util.function.Function;
 
-import jakarta.inject.Inject;
-
 import io.quarkus.cache.Cache;
-
-import jakarta.annotation.PostConstruct;
 import io.quarkus.cache.CacheName;
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 @Startup
 public class QuarkusResourceCache {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
index 12f949e1c3..9f97d68aea 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
@@ -20,6 +20,9 @@ package org.kie.kogito.workflows.services;
 
 import java.util.Map;
 
+import org.kie.kogito.Model;
+import org.kie.kogito.process.Process;
+
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.ws.rs.GET;
@@ -28,9 +31,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.Model;
-import org.kie.kogito.process.Process;
-
 @Path("/greetdetails")
 public class GreetResource {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
index 5e4db1e3bc..0331552e79 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
@@ -18,16 +18,16 @@
  */
 package org.kie.kogito.workflows.services;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 import org.kie.kogito.addon.quarkus.messaging.common.ChannelFormat;
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 @ApplicationScoped
 public class JavaSerializationProducer {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
index 419aa07937..26e6c0e98d 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.workflows.services;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
 import org.kie.kogito.internal.process.runtime.KogitoNodeInstance;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import static java.lang.String.format;
 
 @ApplicationScoped
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
index 2851f80580..b49a276508 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
@@ -20,11 +20,11 @@ package org.kie.kogito.workflows.services;
 
 import java.util.Map;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
 import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class RPCCustomWorkItemHandler extends WorkflowWorkItemHandler {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
index a33e0658d6..317cb16279 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.workflows.services;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
+import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 
 import jakarta.annotation.PostConstruct;
-import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class RPCCustomWorkItemHandlerConfig extends CachedWorkItemHandlerConfig {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
index 8457c1846f..57ab33832d 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
@@ -21,14 +21,14 @@ package org.kie.kogito.quarkus.workflows;
 import java.time.Duration;
 import java.util.UUID;
 
-import jakarta.ws.rs.core.MediaType;
-
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 
+import jakarta.ws.rs.core.MediaType;
+
 import static io.restassured.RestAssured.given;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.is;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
index 0c42b4214a..acc2c88be5 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
@@ -21,12 +21,12 @@ package org.kie.kogito.quarkus.workflows;
 import java.util.Collections;
 import java.util.Map;
 
-import jakarta.ws.rs.core.HttpHeaders;
-
 import com.github.tomakehurst.wiremock.WireMockServer;
 
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
+import jakarta.ws.rs.core.HttpHeaders;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.configureFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
index d7194e46fe..174ce0c6eb 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
@@ -21,8 +21,6 @@ package org.kie.kogito.quarkus.workflows;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.ws.rs.core.HttpHeaders;
-
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -30,6 +28,8 @@ import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.restassured.path.json.JsonPath;
 
+import jakarta.ws.rs.core.HttpHeaders;
+
 import static org.kie.kogito.quarkus.workflows.ExternalServiceMock.SUCCESSFUL_QUERY;
 import static org.kie.kogito.quarkus.workflows.TokenPropagationExternalServicesMock.AUTHORIZATION_TOKEN;
 import static org.kie.kogito.quarkus.workflows.TokenPropagationExternalServicesMock.SERVICE3_AUTHORIZATION_TOKEN;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
index 2ed35472f4..90b1206045 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
@@ -18,11 +18,10 @@
  */
 package org.kie.kogito.expr.jq;
 
-import jakarta.inject.Inject;
-
 import io.quarkus.runtime.Startup;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 import net.thisptr.jackson.jq.Scope;
 
 @Startup
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
index 33fc2e550c..11a8efaf0e 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
@@ -18,11 +18,12 @@
  */
 package org.kie.kogito.secret;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.serverless.workflow.utils.ConfigResolverHolder;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
+
 @Startup
 public class QuarkusConfigResolverRegister {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
index 9d5030bd2f..090787ade4 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
@@ -18,16 +18,16 @@
  */
 package org.kie.kogito.serverless.workflow.config;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 public class ServerlessWorkflowWorkItemHandlerConfig extends DefaultWorkItemHandlerConfig {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
index b6d051eebe..582bbe7ce9 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.serverless.workflow.mapper;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.jackson.utils.JsonNodeFactoryListener;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.quarkus.jackson.ObjectMapperCustomizer;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class ObjectMapperConfig implements ObjectMapperCustomizer {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
index c2929e721b..e8c97f413d 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
@@ -23,10 +23,6 @@ import java.lang.reflect.ParameterizedType;
 import java.util.Collections;
 import java.util.Map;
 
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.client.ClientRequestFilter;
-
 import org.kie.kogito.event.cloudevents.extension.ProcessMeta;
 import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
 import org.kie.kogito.process.workitem.WorkItemExecutionException;
@@ -34,6 +30,10 @@ import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
 
 import io.quarkus.restclient.runtime.RestClientBuilderFactory;
 
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+
 public abstract class OpenApiWorkItemHandler<T> extends WorkflowWorkItemHandler {
 
     @Override
diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
index e9b6c51100..ea7fe04f78 100644
--- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
+++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
@@ -20,10 +20,6 @@ package org.kie.kogito.quarkus.workflow;
 
 import java.util.concurrent.ScheduledExecutorService;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
-import jakarta.enterprise.inject.Produces;
-
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.correlation.CorrelationService;
 import org.kie.kogito.event.correlation.DefaultCorrelationService;
@@ -39,6 +35,10 @@ import org.kie.kogito.uow.UnitOfWorkManager;
 import io.quarkus.arc.DefaultBean;
 import io.quarkus.arc.properties.IfBuildProperty;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+
 @ApplicationScoped
 public class KogitoBeanProducer {
 
diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
index 69b83fc1bd..5d19387b5e 100644
--- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
+++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
@@ -21,9 +21,6 @@ package org.kie.kogito.quarkus.workflow.devservices;
 import java.util.Collection;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
-
-import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.EventPublisher;
@@ -34,6 +31,9 @@ import io.vertx.core.Vertx;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.predicate.ResponsePredicate;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+
 public class DataIndexEventPublisher implements EventPublisher {
 
     public static final String KOGITO_DATA_INDEX = "kogito.data-index.url";
diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
index d8701e2c33..e10d867782 100644
--- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
+++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
@@ -22,14 +22,14 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-
 import org.eclipse.microprofile.context.ThreadContext;
 import org.kie.kogito.services.jobs.impl.InMemoryJobService;
 
 import io.quarkus.arc.DefaultBean;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 @ApplicationScoped
 @DefaultBean
 public class QuarkusScheduledExecutorService extends ScheduledThreadPoolExecutor {
diff --git a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
index 5585554ba5..b0cf418456 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.integrationtests;
 
-import jakarta.inject.Inject;
-
 import org.kie.kogito.Application;
 import org.kie.kogito.decision.DecisionConfig;
 import org.kie.kogito.decision.DecisionModels;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.inject.Inject;
+
 @Startup
 public class InjectDecisionModels {
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
index 5763a15314..2e288d98a7 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.legacy.rules;
 
-import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-import jakarta.ws.rs.*;
-
 import org.kie.api.runtime.KieRuntimeBuilder;
 import org.kie.api.runtime.KieSession;
 import org.kie.api.runtime.rule.FactHandle;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+
 @Path("/test-tms")
 public class TmsEndpoint {
     @Inject
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
index 146f7d6eaa..be9aa7306b 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.quarkus.dmn;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-
 import org.junit.jupiter.api.Test;
 import org.kie.dmn.api.core.DMNResult;
 import org.kie.kogito.decision.DecisionModel;
@@ -30,6 +28,8 @@ import org.kie.kogito.decision.DecisionModels;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusTest
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
index 2235b94b67..3d0be5be33 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
@@ -22,8 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import jakarta.inject.Inject;
-
 import org.drools.ruleunits.api.RuleUnit;
 import org.drools.ruleunits.api.RuleUnitInstance;
 import org.junit.jupiter.api.Test;
@@ -31,6 +29,8 @@ import org.kie.kogito.examples.Hello;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusTest
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
index 2dbbb9ca44..15040a6407 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
@@ -21,9 +21,6 @@ package org.kie.kogito.quarkus.jbpm;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.Model;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
@@ -32,6 +29,9 @@ import org.kie.kogito.process.ProcessInstance;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @QuarkusTest
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
index 54f197106d..d6eb2524f0 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
@@ -21,8 +21,6 @@ package org.kie.kogito.quarkus.pmml;
 import java.util.HashMap;
 import java.util.Map;
 
-import jakarta.inject.Inject;
-
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.Test;
 import org.kie.api.pmml.PMML4Result;
@@ -31,6 +29,8 @@ import org.kie.kogito.prediction.PredictionModels;
 
 import io.quarkus.test.junit.QuarkusTest;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @QuarkusTest
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
index 4e81f33110..c46ca61887 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
@@ -20,11 +20,11 @@ package org.kie.kogito;
 
 import java.io.IOException;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class HelloService {
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
index 91629e1559..29a884df6d 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
 import org.kie.kogito.internal.process.runtime.KogitoNodeInstance;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import static java.lang.String.format;
 
 @ApplicationScoped
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
index 31c65cd8d0..d016292680 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.wih;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class WIHRegister extends DefaultWorkItemHandlerConfig {
     {
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
index 1ea029587c..45332e9c35 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
@@ -18,10 +18,10 @@
  */
 package org.acme;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class WIHRegister extends DefaultWorkItemHandlerConfig {
     {
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
index f8ec56ee6a..e49627146d 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
@@ -20,6 +20,9 @@ package org.kie.kogito.integrationtests;
 
 import java.util.Map;
 
+import org.kie.kogito.Model;
+import org.kie.kogito.process.Process;
+
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.ws.rs.Consumes;
@@ -29,9 +32,6 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 
-import org.kie.kogito.Model;
-import org.kie.kogito.process.Process;
-
 @Path("/approvalsdetails")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
index 026e1caad3..eca48adac1 100755
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
@@ -20,8 +20,6 @@ package org.kie.kogito.integrationtests;
 
 import java.io.IOException;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.integrationtests.excetpion.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +27,8 @@ import org.slf4j.LoggerFactory;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class HelloService {
 
@@ -79,4 +79,4 @@ public class HelloService {
     public String echo(String input) {
         return input;
     }
-}
\ No newline at end of file
+}
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
index 919b2ef874..ef3d768539 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.integrationtests;
 
-import jakarta.inject.Inject;
-
 import org.kie.kogito.Application;
 import org.kie.kogito.process.ProcessConfig;
 import org.kie.kogito.process.Processes;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.inject.Inject;
+
 @Startup
 public class InjectProcesses {
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
index 28a845f88f..509ee17960 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.integrationtests;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
 import org.kie.kogito.internal.process.runtime.KogitoNodeInstance;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 import static java.lang.String.format;
 
 @ApplicationScoped
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
index 818720a584..f01b63a22f 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
@@ -21,13 +21,13 @@ package org.kie.kogito.integrationtests;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.uow.events.UnitOfWorkAbortEvent;
 import org.kie.kogito.uow.events.UnitOfWorkEndEvent;
 import org.kie.kogito.uow.events.UnitOfWorkEventListener;
 import org.kie.kogito.uow.events.UnitOfWorkStartEvent;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class UnitOfWorkTestEventListener implements UnitOfWorkEventListener {
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
index 662b572bf8..b6e9435da8 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
@@ -26,8 +26,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.ws.rs.core.UriBuilder;
-
 import org.acme.travels.Traveller;
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.process.workitem.AttachmentInfo;
@@ -37,6 +35,8 @@ import io.quarkus.test.junit.QuarkusIntegrationTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 
+import jakarta.ws.rs.core.UriBuilder;
+
 import static io.restassured.RestAssured.given;
 import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchema;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
index 74309f3c16..7f3b4392ff 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.integrationtests;
 
-import jakarta.inject.Inject;
-
 import org.kie.kogito.Application;
 import org.kie.kogito.rules.RuleConfig;
 import org.kie.kogito.rules.RuleUnits;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.inject.Inject;
+
 @Startup
 public class InjectRuleUnits {
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
index effee0cf27..6424974f44 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
@@ -20,10 +20,10 @@ package org.kie.kogito.examples;
 
 import java.util.Random;
 
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.examples.demo.Order;
 
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class CalculationService {
 
diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
index 8b6513edf2..81ef0db76e 100644
--- a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
+++ b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 
-import jakarta.annotation.Resource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 import org.testcontainers.containers.Container;
 
@@ -32,6 +31,8 @@ import com.google.common.base.Strings;
 import io.quarkus.test.common.DevServicesContext;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
+import jakarta.annotation.Resource;
+
 /**
  * Quarkus resource to be run if and only if it was enabled.
  */
diff --git a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
index 1f22146992..1990433088 100644
--- a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
+++ b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
@@ -21,7 +21,6 @@ package org.kie.kogito.test.resources;
 import java.util.Collections;
 import java.util.Map;
 
-import jakarta.annotation.Resource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,6 +28,8 @@ import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import jakarta.annotation.Resource;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.Mockito.lenient;
diff --git a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
index 9b38468d83..b48f221fe9 100644
--- a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
+++ b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.eventdriven.decision;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.decision.DecisionModels;
 import org.kie.kogito.event.EventEmitter;
@@ -26,6 +25,8 @@ import org.kie.kogito.event.EventReceiver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringBootEventDrivenDecisionController extends EventDrivenDecisionController {
 
diff --git a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
index e08186b651..5fb16d922f 100644
--- a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
+++ b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,6 +25,8 @@ import org.springframework.stereotype.Component;
 
 import com.mongodb.client.MongoClient;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringbootMongoDBEventPublisher extends MongoDBEventPublisher {
 
diff --git a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
index 14a6d41dfc..c6fc5a3a66 100644
--- a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
+++ b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.eventdriven.predictions;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
 import org.kie.kogito.event.EventReceiver;
@@ -26,6 +25,8 @@ import org.kie.kogito.prediction.PredictionModels;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringBootEventDrivenPredictionsController extends EventDrivenPredictionsController {
 
diff --git a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
index 59eddb3c70..ac20763e55 100644
--- a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
+++ b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.jobs.management.springboot;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
 import org.kie.kogito.jobs.ProcessJobDescription;
 import org.kie.kogito.jobs.management.RestJobsService;
@@ -39,6 +38,8 @@ import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringRestJobsService extends RestJobsService {
 
@@ -116,4 +117,4 @@ public class SpringRestJobsService extends RestJobsService {
         headers.setContentType(MediaType.APPLICATION_JSON);
         return new HttpEntity<>(json, headers);
     }
-}
\ No newline at end of file
+}
diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
index 4264e3fd48..ddcefb65ea 100644
--- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
+++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.addon.cloudevents.spring;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.event.cloudevents.extension.KogitoExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension;
@@ -32,6 +31,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.cloudevents.jackson.JsonFormat;
 
+import jakarta.annotation.PostConstruct;
+
 /**
  * The goal of this bean is to register the Kogito CloudEvent extension
  * that allows the system to correctly parse Kogito extension attributes.
diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
index 5330d48cc8..a009f26c5a 100644
--- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
+++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
@@ -26,7 +26,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
 import org.kie.kogito.event.DataEvent;
@@ -43,6 +42,8 @@ import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Component;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringKafkaCloudEventReceiver implements EventReceiver {
 
diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
index 14b64f3ab4..0140ff0c48 100644
--- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
+++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
@@ -18,14 +18,14 @@
  */
 package org.kie.kogito.monitoring.core.springboot;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SpringbootMetricsInterceptor implements HandlerInterceptor {
 
     private final MetricsInterceptor metricsInterceptor;
diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
index fb29872dcc..2a0e69acad 100644
--- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
+++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.monitoring.core.springboot;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector;
@@ -28,6 +27,8 @@ import org.springframework.stereotype.Component;
 
 import io.micrometer.core.instrument.Metrics;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringbootSystemMetricsCollectorProvider implements SystemMetricsCollectorProvider {
 
diff --git a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
index f1f7063f33..3ac3909d99 100644
--- a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
+++ b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
@@ -20,13 +20,13 @@ package org.kie.kogito.monitoring.core.springboot;
 
 import java.util.List;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
 import org.mockito.ArgumentCaptor;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
diff --git a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
index bbec67fe8c..dcafe29268 100644
--- a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
+++ b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
@@ -18,7 +18,6 @@
  */
 package org.kie.kogito.monitoring.elastic.springboot;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory;
 import org.kie.kogito.monitoring.elastic.common.ElasticRegistry;
 import org.kie.kogito.monitoring.elastic.common.KogitoElasticConfig;
@@ -27,6 +26,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringbootElasticRegistryProvider extends ElasticRegistry {
 
@@ -72,4 +73,4 @@ public class SpringbootElasticRegistryProvider extends ElasticRegistry {
         elasticConfigFactory.withProperty(KogitoElasticConfig.DOCUMENT_TYPE_KEY, documentType);
         super.start(elasticConfigFactory.getElasticConfig(), executor);
     }
-}
\ No newline at end of file
+}
diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
index 69f490e5ce..fa26871214 100644
--- a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
+++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
@@ -21,7 +21,6 @@ package org.kie.kogito.svg.dataindex;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.annotation.PostConstruct;
 import org.keycloak.KeycloakPrincipal;
 import org.kie.kogito.svg.ProcessSVGException;
 import org.slf4j.Logger;
@@ -41,6 +40,8 @@ import org.springframework.web.client.RestTemplate;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.annotation.PostConstruct;
+
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonMap;
 
diff --git a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
index da10bdb18b..1b1d6b11df 100644
--- a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
+++ b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
@@ -18,13 +18,14 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import jakarta.annotation.PostConstruct;
 import org.kie.kogito.decision.DecisionModelResourcesProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Component;
 
+import jakarta.annotation.PostConstruct;
+
 @Component
 public class SpringBootModelEventEmitter extends BaseModelEventEmitter {
 
diff --git a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
index a946de2658..cac8d290cf 100644
--- a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
+++ b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
@@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import jakarta.annotation.PreDestroy;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
@@ -43,6 +42,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
+import jakarta.annotation.PreDestroy;
+
 import static java.lang.String.format;
 import static java.util.Collections.singleton;
 
diff --git a/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java b/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java
index ee05b95511..4f593f5b87 100644
--- a/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java
+++ b/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java
@@ -24,8 +24,6 @@ import java.util.Map;
 import org.kie.kogito.test.resources.ConditionalSpringBootTestResource;
 import org.kie.kogito.testcontainers.KogitoKeycloakContainer;
 
-import static java.util.Collections.singletonMap;
-
 /**
  * Keycloak spring boot resource that works within the test lifecycle.
  *


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 07/07: wip

Posted by ma...@apache.org.
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-runtimes.git

commit c24f3ccbe6ee44937b19b2abd22ee29f7e9e673c
Author: mariofusco <ma...@gmail.com>
AuthorDate: Thu Dec 14 15:21:50 2023 +0100

    wip
---
 .../serverless/workflow/python/PythonWorkItemHandlerConfig.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
index cfc673a546..08d4a34e62 100644
--- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
+++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.quarkus.serverless.workflow.python;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import jakarta.enterprise.context.ApplicationScoped;
-
 import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
 import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 import org.kie.kogito.serverless.workflow.python.PythonScriptWorkItemHandler;
 import org.kie.kogito.serverless.workflow.python.PythonServiceWorkItemHandler;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+
 @ApplicationScoped
 public class PythonWorkItemHandlerConfig extends CachedWorkItemHandlerConfig {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 04/07: Apply patches

Posted by ma...@apache.org.
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-runtimes.git

commit 7502f6b1719dec401e77f8c638ba13c28323f5f0
Author: Toshiya Kobayashi <to...@gmail.com>
AuthorDate: Wed Nov 29 13:51:50 2023 +0900

    Apply patches
---
 README.md                                          |   2 +-
 .../kogito/jobs/api/JobCallbackResourceDef.java    |   4 +-
 .../jobs/api/JobCallbackResourceDefTest.java       |   4 +-
 .../AbstractDiscoveredEndpointCaller.java          |   4 +-
 .../workitems/DiscoveredEndpointCallerTest.java    |   2 +-
 addons/common/persistence/infinispan/pom.xml       |   4 +-
 api/kogito-api/pom.xml                             |   5 +-
 jbpm/jbpm-bpmn2/pom.xml                            |  16 +--
 .../filtered-resources/META-INF/persistence.xml    |   6 +-
 .../test/java/org/jbpm/bpmn2/objects/Address.java  |   2 +-
 .../bpmn2/objects/NotAvailableGoodsReport.java     |   2 +-
 .../test/java/org/jbpm/bpmn2/objects/Person.java   |   2 +-
 .../jbpm/bpmn2/structureref/StructureRefTest.java  |   4 +-
 ...-ServiceProcessWithMvelJaxbTransformation.bpmn2 |   2 +-
 .../org/jbpm/compiler/canonical/ModelMetaData.java |   4 +-
 jbpm/jbpm-flow/pom.xml                             |   5 +-
 .../command/GetProcessInstanceVariableCommand.java |   8 +-
 .../command/MigrateProcessInstanceCommand.java     |  10 +-
 .../command/ResumeProcessInstanceCommand.java      |  10 +-
 .../command/SuspendProcessInstanceCommand.java     |  10 +-
 .../instance/command/UpdateProcessCommand.java     |  10 +-
 kogito-build/kogito-build-no-bom-parent/pom.xml    |   8 +-
 kogito-build/kogito-dependencies-bom/pom.xml       | 134 +++++++++++----------
 kogito-build/kogito-kie-bom/pom.xml                |   2 +-
 kogito-codegen-modules/GUIDELINES.adoc             |  12 +-
 .../context/impl/QuarkusKogitoBuildContext.java    |   4 +-
 .../codegen/api/utils/KogitoCodeGenConstants.java  |   2 +-
 .../ApplicationQuarkusTemplate.java                |   6 +-
 .../config/ApplicationConfigQuarkusTemplate.java   |   6 +-
 .../config/ConfigBeanSpringTemplate.java           |   2 +-
 .../config/GlobalObjectMapperQuarkusTemplate.java  |   4 +-
 .../decision/DecisionRestResourceGenerator.java    |   2 +-
 .../DecisionContainerQuarkusTemplate.java          |   6 +-
 .../DecisionRestResourceQuarkusTemplate.java       |  18 +--
 .../config/DecisionConfigQuarkusTemplate.java      |   6 +-
 .../PMMLRestResourceQuarkusTemplate.java           |  18 +--
 .../PredictionModelsQuarkusTemplate.java           |   2 +-
 .../config/PredictionConfigQuarkusTemplate.java    |   6 +-
 .../config/PredictionConfigGeneratorTest.java      |   8 +-
 .../kogito-codegen-processes/pom.xml               |   5 +-
 .../codegen/process/ProcessResourceGenerator.java  |   4 +-
 .../MessageConsumerQuarkusTemplate.java            |   6 +-
 .../MessageConsumerSpringTemplate.java             |   2 +-
 .../MessageProducerQuarkusTemplate.java            |   4 +-
 .../ProcessContainerQuarkusTemplate.java           |   8 +-
 .../ProcessContainerSpringTemplate.java            |   2 +-
 .../ReactiveRestResourceQuarkusTemplate.java       |  28 ++---
 .../RestResourceQuarkusTemplate.java               |  40 +++---
 .../RestResourceUserTaskQuarkusTemplate.java       |   8 +-
 .../config/ProcessConfigQuarkusTemplate.java       |   6 +-
 .../KafkaStreamsTopologyProducerJavaTemplate.java  |   4 +-
 .../ProcessServiceProducerQuarkusTemplate.java     |   4 +-
 .../org/kie/kogito/codegen/data/HelloModel.java    |   6 +-
 .../src/test/resources/openapi/SimpleResource.java |  10 +-
 .../config/RuleConfigQuarkusTemplate.java          |   6 +-
 .../rules/EventDrivenExecutorQuarkusTemplate.java  |   6 +-
 .../rules/RuleUnitContainerQuarkusTemplate.java    |   4 +-
 .../SampleContainerQuarkusTemplate.java            |   6 +-
 .../SampleRestResourceQuarkusTemplate.java         |  10 +-
 .../SampleRestResourceSpringTemplate.java          |   2 +-
 .../config/SampleConfigQuarkusTemplate.java        |   2 +-
 .../camel/runtime/CamelCustomWorkItemHandler.java  |   8 +-
 .../runtime/CamelCustomWorkItemHandlerConfig.java  |   6 +-
 .../messaging/MessageDecoratorProvider.java        |   8 +-
 .../http/CloudEventHttpOutgoingDecorator.java      |   2 +-
 .../http/CloudEventHttpOutgoingDecoratorTest.java  |   4 +-
 quarkus/addons/events/decisions/runtime/pom.xml    |   2 +-
 .../QuarkusEventDrivenDecisionController.java      |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/events/mongodb/runtime/pom.xml      |   6 +-
 .../mongodb/QuarkusMongoDBEventPublisher.java      |   6 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../kie/kogito/events/mongodb/MockMongoClient.java |   2 +-
 .../events/mongodb/MockTransactionManager.java     |   2 +-
 .../mongodb/QuarkusMongoDBEventPublisherTest.java  |   2 +-
 quarkus/addons/events/predictions/runtime/pom.xml  |   2 +-
 .../QuarkusEventDrivenPredictionsController.java   |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/events/process/runtime/pom.xml      |   6 +-
 .../process/ReactiveMessagingEventPublisher.java   |   8 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/events/rules/runtime/pom.xml        |   2 +-
 .../rules/QuarkusEventDrivenRulesController.java   |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../QuarkusExplainableResourceIT.java              |   4 +-
 quarkus/addons/explainability/runtime/pom.xml      |   2 +-
 .../explainability/QuarkusExplainableResource.java |  14 +--
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../runtime/pom.xml                                |   2 +-
 .../catalog/Fabric8KubernetesServiceCatalog.java   |   4 +-
 .../k8s/service/catalog/KnativeClientProducer.java |   6 +-
 .../service/catalog/KnativeServiceDiscovery.java   |   4 +-
 .../catalog/KubernetesResourceDiscovery.java       |   4 +-
 .../catalog/OpenShiftResourceDiscovery.java        |   4 +-
 .../k8s/service/catalog/DeploymentUtilsTest.java   |  30 ++---
 .../Fabric8KubernetesServiceCatalogTest.java       |   2 +-
 .../k8s/service/catalog/IngressUtilsTest.java      |   8 +-
 .../catalog/KnativeServiceDiscoveryTest.java       |   2 +-
 .../catalog/KubernetesResourceDiscoveryTest.java   |  20 +--
 .../catalog/OpenShiftServiceDiscoveryTest.java     |  20 +--
 .../fabric8/k8s/service/catalog/PodUtilsTest.java  |  18 +--
 .../k8s/service/catalog/StatefulSetUtilsTest.java  |  24 ++--
 .../utils/KnativeResourceDiscoveryTestUtil.java    |   2 +-
 .../common/CallbackJobsServiceResource.java        |  22 ++--
 .../common/CallbackJobsServiceResourceTest.java    |  10 +-
 .../addons/jobs/knative-eventing/runtime/pom.xml   |   2 +-
 .../quarkus/KnativeEventingJobsService.java        |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../quarkus/KnativeEventingJobsServiceTest.java    |   2 +-
 quarkus/addons/jobs/management/runtime/pom.xml     |   2 +-
 .../quarkus/AddonObjectMapperCustomizer.java       |   2 +-
 .../jobs/management/quarkus/VertxJobsService.java  |   8 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../management/quarkus/VertxJobsServiceTest.java   |   2 +-
 quarkus/addons/jobs/messaging/runtime/pom.xml      |   2 +-
 .../quarkus/ReactiveMessagingJobsService.java      |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../KogitoProcessKnativeEventingProcessorTest.java |   3 +-
 quarkus/addons/knative/eventing/runtime/pom.xml    |   2 +-
 .../eventing/KSinkInjectionHealthCheck.java        |   2 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/knative/serving/runtime/pom.xml     |   2 +-
 .../KnativeWorkItemHandlerConfig.java              |   6 +-
 .../KnativeWorkItemHandlerProducer.java            |   4 +-
 .../serving/customfunctions/WebClientProducer.java |   4 +-
 .../quarkus/kubernetes/KubernetesAddOnTest.java    |   2 +-
 .../kie/kogito/addons/quarkus/kubernetes/Foo.java  |  10 +-
 quarkus/addons/kubernetes/runtime/pom.xml          |   2 +-
 .../addons/quarkus/k8s/EndpointCallerProducer.java |  10 +-
 .../quarkus/k8s/EndpointDiscoveryProducer.java     |  12 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../k8s/KnativeRouteEndpointDiscoveryTest.java     |   2 +-
 .../KubernetesServiceEndpointDiscoveryTest.java    |   4 +-
 .../KubeDiscoveryConfigCacheUpdaterTest.java       |   2 +-
 quarkus/addons/mail/runtime/pom.xml                |   2 +-
 .../org/kie/kogito/mail/QuarkusMailSender.java     |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../org/kie/kogito/mail/QuarkusMailSenderTest.java |   2 +-
 quarkus/addons/marshallers/avro/runtime/pom.xml    |   2 +-
 quarkus/addons/messaging/common/pom.xml            |   4 +-
 .../common/AbstractQuarkusCloudEventEmitter.java   |   2 +-
 .../common/BackpressureKogitoEmitter.java          |   2 +-
 .../common/BackpressurePublisherDecorator.java     |   4 +-
 .../quarkus/messaging/common/ChannelFormat.java    |   2 +-
 .../messaging/common/EventMarshallerProducer.java  |   6 +-
 .../common/EventUnmarshallerProducer.java          |   6 +-
 .../common/QuarkusEventExecutorServiceFactory.java |   4 +-
 .../common/QuarkusKogitoExtensionInitializer.java  |   4 +-
 .../messaging/common/QuarkusMessageConsumer.java   |   4 +-
 .../messaging/common/QuarkusTopicDiscovery.java    |   4 +-
 .../common/QuarkusTopicsInformationResource.java   |  20 +--
 .../ChannelQualifierQuarkusTemplate.java           |   2 +-
 .../EventEmitterQuarkusTemplate.java               |   6 +-
 .../EventReceiverQuarkusTemplate.java              |   6 +-
 .../QuarkusCloudEventResource.java                 |   4 +-
 .../QuarkusCloudEventResourceIT.java               |   6 +-
 quarkus/addons/messaging/runtime/pom.xml           |   2 +-
 .../QuarkusDefaultCloudEventReceiver.java          |   6 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../runtime/pom.xml                                |   2 +-
 .../catalog/MicroProfileConfigServiceCatalog.java  |   2 +-
 .../MicroProfileConfigServiceCatalogTest.java      |   2 +-
 .../core/quarkus/QuarkusEventListenerFactory.java  |   6 +-
 .../core/quarkus/QuarkusMetricsFilterRegister.java |  14 +--
 .../core/quarkus/QuarkusMetricsInterceptor.java    |   6 +-
 .../QuarkusSystemMetricsCollectorProvider.java     |   6 +-
 .../quarkus/QuarkusMetricsFilterRegisterTest.java  |   4 +-
 .../quarkus/QuarkusMetricsInterceptorTest.java     |   8 +-
 quarkus/addons/monitoring/elastic/runtime/pom.xml  |   2 +-
 .../quarkus/QuarkusElasticRegistryProvider.java    |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../addons/monitoring/prometheus/runtime/pom.xml   |   2 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../addons/persistence/filesystem/runtime/pom.xml  |   2 +-
 .../quarkus/FileSystemProcessInstancesFactory.java |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../infinispan/health/InfinispanHealthCheck.java   |   2 +-
 .../infinispan/health/InfinispanHealthCheckIT.java |   6 +-
 .../addons/persistence/infinispan/runtime/pom.xml  |   2 +-
 .../quarkus/InfinispanProcessInstancesFactory.java |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/persistence/jdbc/runtime/pom.xml    |   2 +-
 .../quarkus/JDBCProcessInstancesFactory.java       |   4 +-
 .../quarkus/JDBCorrelationServiceProducer.java     |   2 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/persistence/kafka/runtime/pom.xml   |   2 +-
 .../persistence/KafkaProcessInstancesFactory.java  |   6 +-
 .../kafka/KafkaStreamsStateListener.java           |   6 +-
 .../kafka/KafkaStreamsTopologyProducer.java        |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/persistence/mongodb/runtime/pom.xml |   2 +-
 .../quarkus/MongoDBProcessInstancesFactory.java    |   4 +-
 .../quarkus/MongoDBTransactionManager.java         |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../addons/persistence/postgresql/runtime/pom.xml  |   2 +-
 .../quarkus/PostgresqlProcessInstancesFactory.java |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/persistence/rocksdb/runtime/pom.xml |   2 +-
 .../RocksDbProcessInstancesFactoryProducer.java    |  10 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../definitions/ProcessDefinitionsResource.java    |  22 ++--
 quarkus/addons/process-management/runtime/pom.xml  |   7 +-
 .../ProcessInstanceManagementResource.java         |  22 ++--
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../ProcessInstanceManagementResourceTest.java     |  12 +-
 quarkus/addons/process-svg/runtime/pom.xml         |   6 +-
 .../svg/dataindex/QuarkusDataIndexClient.java      |   6 +-
 .../kie/kogito/svg/rest/ProcessSvgResource.java    |  18 +--
 .../svg/service/QuarkusProcessSvgService.java      |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../python/PythonWorkItemHandlerConfig.java        |   6 +-
 quarkus/addons/rest-exception-handler/pom.xml      |   9 +-
 .../resource/exceptions/BaseExceptionMapper.java   |   4 +-
 .../resource/exceptions/ExceptionsHandler.java     |   6 +-
 .../exceptions/IllegalArgumentExceptionMapper.java |   4 +-
 .../InvalidLifeCyclePhaseExceptionMapper.java      |   4 +-
 .../InvalidTransitionExceptionMapper.java          |   4 +-
 .../NodeInstanceNotFoundExceptionMapper.java       |   4 +-
 .../exceptions/NodeNotFoundExceptionMapper.java    |   4 +-
 .../exceptions/NotAuthorizedExceptionMapper.java   |   4 +-
 .../ProcessInstanceDuplicatedExceptionMapper.java  |   4 +-
 .../ProcessInstanceExecutionExceptionMapper.java   |   4 +-
 .../ProcessInstanceNotFoundExceptionMapper.java    |   4 +-
 .../VariableViolationExceptionMapper.java          |   4 +-
 .../WorkItemExecutionExceptionMapper.java          |   4 +-
 .../WorkItemNotFoundExceptionMapper.java           |   4 +-
 .../resource/exceptions/ExceptionsHandlerTest.java |   8 +-
 quarkus/addons/source-files/runtime/pom.xml        |   2 +-
 .../source/files/SourceFilesProviderProducer.java  |   6 +-
 .../addon/source/files/SourceFilesRecorder.java    |   2 +-
 .../addon/source/files/SourceFilesResource.java    |  18 +--
 .../source/files/SourceFilesResourceTest.java      |   2 +-
 quarkus/addons/task-management/runtime/pom.xml     |   2 +-
 .../task/management/TaskManagementResource.java    |  24 ++--
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/task-notification/runtime/pom.xml   |   2 +-
 .../quarkus/NotificationEventPublisher.java        |   4 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 quarkus/addons/tracing-decision/runtime/pom.xml    |   2 +-
 .../decision/QuarkusDecisionTracingCollector.java  |   4 +-
 .../decision/QuarkusDecisionTracingListener.java   |   4 +-
 .../tracing/decision/QuarkusModelEventEmitter.java |   7 +-
 .../decision/QuarkusStartupModelPublisher.java     |   6 +-
 .../tracing/decision/QuarkusTraceEventEmitter.java |   5 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../org/kie/kogito/quarkus/dmn/CustomEndpoint.java |  12 +-
 .../kogito-quarkus-decisions/pom.xml               |   2 +-
 .../kogito-dmn-codestart/base/README.tpl.qute.md   |   4 +-
 .../quarkus/kogito-dmn-codestart/codestart.yml     |   2 +-
 .../quarkus/support/QuarkusDecisionIdFactory.java  |   2 +-
 .../quarkus/support/QuarkusDecisionService.java    |   8 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../common/deployment/KogitoAssetsProcessor.java   |   4 +-
 .../kogito-quarkus-common/pom.xml                  |   2 +-
 .../quarkus/auth/QuarkusIdentityProvider.java      |   8 +-
 .../org/kie/kogito/quarkus/config/ConfigBean.java  |   6 +-
 .../registry/ProcessDefinitionRegistration.java    |   8 +-
 .../runtime/SSLWebClientOptionsProducer.java       |   4 +-
 .../src/main/java/control/RestControl.java         |  10 +-
 .../src/main/java/control/RestControl.java         |  10 +-
 .../quarkus/it/kogito/jbpm/CalculationService.java |   2 +-
 .../org/kie/kogito/quarkus/jbpm/ProcessIT.java     |   4 +-
 .../kogito-quarkus/pom.xml                         |   2 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../application/quarkus/QuarkusAppRoot.java        |   6 +-
 .../quarkus/QuarkusInternalObjectMapper.java       |   2 +-
 .../kie/kogito/quarkus/pmml/CustomEndpoint.java    |  12 +-
 .../kogito-quarkus-predictions/pom.xml             |   2 +-
 .../quarkus/support/QuarkusPredictionIds.java      |   2 +-
 .../quarkus/support/QuarkusPredictionService.java  |   8 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../it/kogito/process/HotReloadTestHelper.java     |   2 +-
 .../src/main/java/org/acme/GreetingResource.java   |  18 +--
 .../java/org/acme/StatefulProcessResourceTest.java |   2 +-
 .../kogito-quarkus-processes/pom.xml               |   2 +-
 .../quarkus/support/QuarkusHumanTaskService.java   |   8 +-
 .../quarkus/support/QuarkusProcessIdFactory.java   |   2 +-
 .../support/QuarkusStatefulProcessService.java     |   8 +-
 .../QuarkusStraightThroughProcessService.java      |   8 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../kie/kogito/quarkus/drools/AnotherService.java  |   4 +-
 .../kie/kogito/quarkus/drools/CustomEndpoint.java  |  12 +-
 .../RuleUnitMetaDataContextSerializationTest.java  |   2 +-
 .../drools/StatefulRuleUnitServiceTest.java        |   2 +-
 .../kogito-quarkus-rules/pom.xml                   |   2 +-
 .../quarkus/support/DataSourceProvider.java        |   4 +-
 .../quarkus/support/QuarkusDataSourceService.java  |   8 +-
 .../quarkus/support/QuarkusRuleUnitIdFactory.java  |   2 +-
 .../quarkus/support/QuarkusRuleUnitService.java    |   8 +-
 .../support/QuarkusStatefulRuleUnitService.java    |   8 +-
 .../support/RuleUnitDataObjectCustomizer.java      |   2 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../workflow/asyncapi/AsyncAPIInfoConverter.java   |   6 +-
 .../deployment/livereload/LiveReloadProcessor.java |   2 +-
 .../openapi/WorkflowOpenApiHandlerGenerator.java   |   7 +-
 .../workflow/rpc/WorkflowRPCHandlerGenerator.java  |   4 +-
 .../workflow/io/QuarkusResourceCache.java          |   5 +-
 .../pom.xml                                        |  26 ++++
 .../workflows/services/AgePersonService.java       |   2 +-
 .../kie/kogito/workflows/services/EvenService.java |   2 +-
 .../kogito/workflows/services/GreetResource.java   |  14 +--
 .../services/JavaSerializationProducer.java        |   8 +-
 .../services/NodeInstanceTriggerEventListener.java |   2 +-
 .../kogito/workflows/services/PersonService.java   |   2 +-
 .../services/RPCCustomWorkItemHandler.java         |   2 +-
 .../services/RPCCustomWorkItemHandlerConfig.java   |   6 +-
 .../kogito/workflows/services/SquareService.java   |   2 +-
 .../src/main/resources/token-propagation.sw.json   |   2 +-
 .../quarkus/workflows/ExternalServiceMock.java     |   4 +-
 .../quarkus/workflows/KeycloakServiceMock.java     |   6 +-
 .../kie/kogito/quarkus/workflows/SubFlowsIT.java   |   2 +-
 .../TokenPropagationExternalServicesMock.java      |   6 +-
 .../quarkus/workflows/TokenPropagationIT.java      |   2 +-
 .../kogito-quarkus-serverless-workflow/pom.xml     |   2 +-
 .../base/README.tpl.qute.md                        |   4 +-
 .../codestart.yml                                  |   2 +-
 .../org/kie/kogito/expr/jq/JqQuarkusExtension.java |   4 +-
 .../secret/QuarkusConfigResolverRegister.java      |   3 +-
 .../ServerlessWorkflowWorkItemHandlerConfig.java   |   8 +-
 .../workflow/mapper/ObjectMapperConfig.java        |   2 +-
 .../workflow/openapi/OpenApiWorkItemHandler.java   |   6 +-
 .../main/resources/META-INF/quarkus-extension.yaml |   2 +-
 .../quarkus/workflow/KogitoBeanProducer.java       |   6 +-
 .../devservices/DataIndexEventPublisher.java       |   4 +-
 .../jobs/QuarkusScheduledExecutorService.java      |   4 +-
 .../java/org/acme/travels/PersonProcessTest.java   |   4 +-
 .../integrationtests/InjectDecisionModels.java     |   2 +-
 .../org/kie/kogito/legacy/rules/TmsEndpoint.java   |   6 +-
 .../kogito/quarkus/dmn/TrafficViolationTest.java   |   2 +-
 .../org/kie/kogito/quarkus/drools/HelloTest.java   |   2 +-
 .../org/kie/kogito/quarkus/jbpm/ProcessTest.java   |   4 +-
 .../kogito/quarkus/pmml/PMMLRegressionTest.java    |   2 +-
 .../integrationtests/InjectPredictionModels.java   |   2 +-
 .../src/main/java/org/kie/kogito/HelloService.java |   2 +-
 .../kogito/NodeInstanceTriggerEventListener.java   |   2 +-
 .../main/java/org/kie/kogito/wih/WIHRegister.java  |   2 +-
 .../src/main/java/org/acme/WIHRegister.java        |   2 +-
 .../kogito/integrationtests/ApprovalResource.java  |  16 +--
 .../integrationtests/EventListenerResource.java    |  12 +-
 .../kie/kogito/integrationtests/HelloService.java  |   2 +-
 .../kogito/integrationtests/InjectProcesses.java   |   2 +-
 .../NodeInstanceTriggerEventListener.java          |   2 +-
 .../UnitOfWorkTestEventListener.java               |   2 +-
 .../kie/kogito/integrationtests/quarkus/OASIT.java |  10 +-
 .../kogito/integrationtests/quarkus/TaskIT.java    |   2 +-
 .../kogito/integrationtests/InjectRuleUnits.java   |   2 +-
 .../kie/kogito/examples/CalculationService.java    |   2 +-
 .../kogito/test/quarkus/QuarkusTestProperty.java   |   2 +-
 .../resources/ConditionalQuarkusTestResource.java  |   3 +-
 .../ConditionalQuarkusTestResourceTest.java        |   3 +-
 .../SpringBootEventDrivenDecisionController.java   |   3 +-
 .../mongodb/SpringbootMongoDBEventPublisher.java   |   3 +-
 ...SpringBootEventDrivenPredictionsController.java |   3 +-
 springboot/addons/jobs/pom.xml                     |   4 +-
 .../springboot/SpringRestJobsService.java          |   6 +-
 springboot/addons/kubernetes/pom.xml               |   9 +-
 .../SpringBootKogitoExtensionInitializer.java      |   3 +-
 .../spring/SpringKafkaCloudEventEmitter.java       |   1 -
 .../spring/SpringKafkaCloudEventReceiver.java      |   3 +-
 .../SpringBootTopicsInformationResourceTest.java   |   2 +-
 .../springboot/SpringbootMetricsInterceptor.java   |   4 +-
 .../SpringbootSystemMetricsCollectorProvider.java  |   3 +-
 .../springboot/SpringMetricsInterceptorTest.java   |   4 +-
 .../SpringbootElasticRegistryProvider.java         |   3 +-
 springboot/addons/process-svg/pom.xml              |   4 +-
 .../svg/dataindex/SpringBootDataIndexClient.java   |   3 +-
 springboot/addons/tracing-decision/pom.xml         |   4 +-
 .../decision/SpringBootModelEventEmitter.java      |   3 +-
 .../src/main/resources/archetype-resources/pom.xml |   5 +
 .../src/test/java/GreetingsTest.java               |   2 +-
 .../src/test/java/TrafficViolationTest.java        |   2 +-
 springboot/bom/pom.xml                             |  14 +--
 .../pom.xml                                        |   2 +-
 .../integrationtests/springboot/BaseRestTest.java  |   2 +-
 .../springboot/CommonPMMLTestUtils.java            |   2 +-
 .../springboot/ElementAtIndexTest.java             |   2 +-
 .../springboot/PMMLRegressionTest.java             |   2 +-
 .../integrationtests/springboot/PMMLTreeTest.java  |   2 +-
 .../integrationtests/springboot/BaseRestTest.java  |   2 +-
 .../springboot/PingPongMessageTest.java            |   4 +-
 .../integration-tests-springboot-norest-it/pom.xml |   2 +-
 .../pom.xml                                        |   4 +-
 .../integrationtests/springboot/BaseRestTest.java  |   2 +-
 .../integrationtests/springboot/ProcessTest.java   |   2 +-
 .../integrationtests/springboot/TaskTest.java      |   2 +-
 .../pom.xml                                        |   5 +-
 .../java/org/kie/kogito/it/PersistenceTest.java    |   2 +-
 .../kogito-processes-spring-boot-starter/pom.xml   |   4 +
 springboot/starters/pom.xml                        |  10 +-
 .../test/springboot/kafka/KafkaTestClient.java     |   3 +-
 .../springboot/KeycloakSpringBootTestResource.java |   7 +-
 391 files changed, 1068 insertions(+), 1036 deletions(-)

diff --git a/README.md b/README.md
index 74ac93ca1e..a39979cd21 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ The official guides for Kogito can be found at our main website, these include g
 If you want to read more about Quarkus:
 
 - [Quarkus - Getting Started](https://quarkus.io/get-started/) - Quarkus Getting Started guide
-- [Quarkus - Using Kogito to add business automation capabilities to an application](https://quarkus.io/version/2.13/guides/kogito) - A simple quick start hosted on the Quarkus web site.
+- [Quarkus - Using Kogito to add business automation capabilities to an application](https://quarkus.io/guides/kogito) - A simple quick start hosted on the Quarkus web site.
 
 ## Building and Contributing to Kogito
 All contributions are welcome! Before you start please read the [contribution guide](CONTRIBUTING.md).
diff --git a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
index 982afe1739..6db25dad1d 100644
--- a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
+++ b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.api;
 
 import java.time.temporal.ChronoUnit;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
 import org.kie.kogito.jobs.service.api.TemporalUnit;
diff --git a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
index b1ca3a73db..99f1add2b7 100644
--- a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
+++ b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.api;
 
 import java.net.URI;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.jobs.ExactExpirationTime;
diff --git a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
index 9729b0ccdd..d775e7eacb 100644
--- a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
+++ b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.kogito.addons.k8s.Endpoint;
diff --git a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
index 688c4cf7a0..5eb93c71d2 100644
--- a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
+++ b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.addons.k8s.workitems;
 
 import java.util.Map;
 
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml
index b30b289b84..6402b5d06d 100644
--- a/addons/common/persistence/infinispan/pom.xml
+++ b/addons/common/persistence/infinispan/pom.xml
@@ -49,9 +49,9 @@
       <artifactId>process-serialization-protobuf</artifactId>
     </dependency>
 
-    <dependency>
+    <!--~~(No version provided)~~>--><dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-client-hotrod</artifactId>
+      <artifactId>infinispan-client-hotrod-jakarta</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/api/kogito-api/pom.xml b/api/kogito-api/pom.xml
index 68bd620d55..ea90fd825f 100755
--- a/api/kogito-api/pom.xml
+++ b/api/kogito-api/pom.xml
@@ -58,9 +58,10 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
       <scope>provided</scope>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/jbpm/jbpm-bpmn2/pom.xml b/jbpm/jbpm-bpmn2/pom.xml
index 3c7b009e86..09e26280de 100755
--- a/jbpm/jbpm-bpmn2/pom.xml
+++ b/jbpm/jbpm-bpmn2/pom.xml
@@ -74,9 +74,10 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
       <scope>provided</scope>
+      <version>4.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
@@ -84,13 +85,14 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
       <scope>provided</scope>
+      <version>4.0.4</version>
     </dependency>
-    <dependency>
-      <groupId>com.sun.activation</groupId>
-      <artifactId>javax.activation</artifactId>
+    <!--~~(No version provided)~~>--><dependency>
+      <groupId>org.eclipse.angus</groupId>
+      <artifactId>angus-activation</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml b/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml
index c9cd63d032..f81811971d 100755
--- a/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml
+++ b/jbpm/jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.1"
-             xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+<persistence version="3.0"
+             xmlns="https://jakarta.ee/xml/ns/persistence"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
 
   <persistence-unit name="org.jbpm.persistence.jpa" transaction-type="JTA">
     <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java
index fe3ca2c91b..fd9d2eecda 100755
--- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java
+++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java
@@ -20,7 +20,7 @@ package org.jbpm.bpmn2.objects;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class Address implements Serializable {
diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java
index 8978dee9e8..fb1a4feb6e 100755
--- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java
+++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java
@@ -18,7 +18,7 @@
  */
 package org.jbpm.bpmn2.objects;
 
-@javax.xml.bind.annotation.XmlRootElement
+@jakarta.xml.bind.annotation.XmlRootElement
 public class NotAvailableGoodsReport implements java.io.Serializable {
 
     static final long serialVersionUID = 1L;
diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java
index a299263f2d..1569635826 100755
--- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java
+++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java
@@ -20,7 +20,7 @@ package org.jbpm.bpmn2.objects;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "person")
 public class Person implements Serializable {
diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
index b106025632..a3288e3c8c 100755
--- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
+++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
@@ -22,8 +22,8 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 import org.jbpm.bpmn2.JbpmBpmn2TestCase;
 import org.jbpm.bpmn2.objects.Person;
diff --git a/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2 b/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2
index fd4c6b32ed..f4d4503a87 100755
--- a/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2
+++ b/jbpm/jbpm-bpmn2/src/test/resources/BPMN2-ServiceProcessWithMvelJaxbTransformation.bpmn2
@@ -23,7 +23,7 @@
 
   <process processType="Private" isExecutable="true" id="ServiceProcess" name="Service Process" >
     <extensionElements>
-      <tns:import name="javax.xml.bind.JAXBContext"/>
+      <tns:import name="jakarta.xml.bind.JAXBContext"/>
       <tns:import name="java.io.StringReader"/>
       <tns:import name="java.io.StringWriter"/>
       <tns:import name="org.jbpm.bpmn2.objects.Person"/>
diff --git a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java
index 1fba02658a..b377be1cc8 100644
--- a/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java
+++ b/jbpm/jbpm-flow-builder/src/main/java/org/jbpm/compiler/canonical/ModelMetaData.java
@@ -235,10 +235,10 @@ public class ModelMetaData {
     private void applyValidation(FieldDeclaration fd, List<String> tags) {
 
         if (supportsValidation) {
-            fd.addAnnotation("javax.validation.Valid");
+            fd.addAnnotation("jakarta.validation.Valid");
 
             if (tags != null && tags.contains(Variable.REQUIRED_TAG)) {
-                fd.addAnnotation("javax.validation.constraints.NotNull");
+                fd.addAnnotation("jakarta.validation.constraints.NotNull");
             }
         }
     }
diff --git a/jbpm/jbpm-flow/pom.xml b/jbpm/jbpm-flow/pom.xml
index ebf4574103..e220b3869f 100755
--- a/jbpm/jbpm-flow/pom.xml
+++ b/jbpm/jbpm-flow/pom.xml
@@ -106,9 +106,10 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
       <scope>provided</scope>
+      <version>4.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
index effad1e786..4bb7c5e332 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
@@ -18,10 +18,10 @@
  */
 package org.jbpm.process.instance.command;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
index 7bd2f26967..79e342bd84 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
@@ -21,11 +21,11 @@ package org.jbpm.process.instance.command;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 import org.drools.core.common.InternalKnowledgeRuntime;
 import org.jbpm.workflow.core.impl.NodeImpl;
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
index fd4450262c..6cc16653bf 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
@@ -18,11 +18,11 @@
  */
 package org.jbpm.process.instance.command;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
index 37f849d908..2f2d069a4d 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
@@ -18,11 +18,11 @@
  */
 package org.jbpm.process.instance.command;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 import org.kie.api.command.ExecutableCommand;
 import org.kie.api.runtime.Context;
diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
index c7b676986f..b5f8b6d6cb 100755
--- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
+++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
@@ -18,11 +18,11 @@
  */
 package org.jbpm.process.instance.command;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
 
 import org.jbpm.process.instance.impl.ProcessInstanceImpl;
 import org.kie.api.command.ExecutableCommand;
diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml
index 5220822064..d696d72063 100644
--- a/kogito-build/kogito-build-no-bom-parent/pom.xml
+++ b/kogito-build/kogito-build-no-bom-parent/pom.xml
@@ -353,7 +353,7 @@
             <excludes>
               <exclude>${tests.surefire.include}</exclude>
             </excludes>
-            <argLine>-Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none</argLine>
+            <argLine>-Xms2048m -Xmx4g  -XX:-TieredCompilation -XX:TieredStopAtLevel=1</argLine>
             <systemPropertyVariables>
               <maven.repo.local>${session.request.localRepositoryPath.path}</maven.repo.local>
               <maven.settings>${session.request.userSettingsFile.path}</maven.settings>
@@ -372,7 +372,7 @@
             <excludes>
               <exclude>${tests.failsafe.include}</exclude>
             </excludes>
-            <argLine>-Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none -Dfile.encoding=UTF-8</argLine>
+            <argLine>-Xms2048m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF-8</argLine>
             <systemPropertyVariables>
               <apple.awt.UIElement>true</apple.awt.UIElement>
               <org.uberfire.nio.git.daemon.enabled>false</org.uberfire.nio.git.daemon.enabled>
@@ -639,7 +639,7 @@
         </plugin>
         <plugin>
           <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+          <artifactId>quarkus-extension-maven-plugin</artifactId>
           <version>${version.io.quarkus}</version>
         </plugin>
         <plugin>
@@ -761,7 +761,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <!-- Append jacoco.agent.argLine property populated by JaCoCo's prepare-agent goal. -->
-              <argLine>@{jacoco.agent.argLine} -Xms1024m -Xmx4g -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none -Dfile.encoding=UTF-8</argLine>
+              <argLine>@{jacoco.agent.argLine} -Xms1024m -Xmx4g  -XX:-TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF-8</argLine>
             </configuration>
           </plugin>
           <plugin>
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
index e533c5cfbb..40d08426f1 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -16,79 +16,79 @@
 
   <properties>
     <!-- this version property is used in plugins but also in dependencies too -->
-    <version.io.quarkus>2.16.12.Final</version.io.quarkus>
+    <version.io.quarkus>3.2.9.Final</version.io.quarkus>
     <version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
-    <version.org.springframework.boot>2.6.6</version.org.springframework.boot>
+    <version.org.springframework.boot>3.0.5</version.org.springframework.boot>
     <version.org.apache.kafka>3.4.0</version.org.apache.kafka>
 
     <!-- dependencies versions -->
     <version.com.networknt>1.0.86</version.com.networknt>
-    <version.com.fasterxml.jackson>2.14.2</version.com.fasterxml.jackson>
-    <version.com.fasterxml.jackson.databind>2.14.2</version.com.fasterxml.jackson.databind>
+    <version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
+    <version.com.fasterxml.jackson.databind>2.15.2</version.com.fasterxml.jackson.databind>
     <version.com.jayway.jsonpath>2.8.0</version.com.jayway.jsonpath>
     <version.net.minidev.jsonsmart>2.4.10</version.net.minidev.jsonsmart>
     <version.net.thisptr.jackson-jq>1.0.0-preview.20220705</version.net.thisptr.jackson-jq>
-    <version.io.quarkiverse.jackson-jq>1.1.0</version.io.quarkiverse.jackson-jq>
-    <version.io.quarkiverse.openapi.generator>1.3.14</version.io.quarkiverse.openapi.generator>
-    <version.io.quarkiverse.asyncapi>0.0.6</version.io.quarkiverse.asyncapi>
-    <version.io.quarkiverse.reactivemessaging.http>1.1.5</version.io.quarkiverse.reactivemessaging.http>
+    <version.io.quarkiverse.jackson-jq>2.0.1</version.io.quarkiverse.jackson-jq>
+    <version.io.quarkiverse.openapi.generator>2.2.9</version.io.quarkiverse.openapi.generator>
+    <version.io.quarkiverse.asyncapi>0.2.0</version.io.quarkiverse.asyncapi>
+    <version.io.quarkiverse.reactivemessaging.http>2.0.2</version.io.quarkiverse.reactivemessaging.http>
     <version.io.quarkiverse.embedded.postgresql>0.0.9</version.io.quarkiverse.embedded.postgresql>
     <version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
-    <version.com.github.javaparser>3.24.2</version.com.github.javaparser>
-    <version.com.fasterxml.jackson.datatype>2.14.2</version.com.fasterxml.jackson.datatype>
+    <version.com.github.javaparser>3.25.1</version.com.github.javaparser>
+    <version.com.fasterxml.jackson.datatype>2.15.2</version.com.fasterxml.jackson.datatype>
     <version.com.github.victools>4.18.0</version.com.github.victools>
     <version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
     <version.com.google.protobuf>3.22.0</version.com.google.protobuf>
     <!-- We don't use gson directly. This is just to align versions of transitive dependencies -->
-    <version.com.google.gson>2.10</version.com.google.gson>
+    <version.com.google.gson>2.10.1</version.com.google.gson>
     <!-- currently required for integration test only -->
-    <version.com.oracle.database.jdbc>21.3.0.0</version.com.oracle.database.jdbc>
+    <version.com.oracle.database.jdbc>21.5.0.0</version.com.oracle.database.jdbc>
     <version.com.sun.xml.bind.core>2.3.0.1</version.com.sun.xml.bind.core>
     <version.com.sun.xml.bind.impl>2.3.5</version.com.sun.xml.bind.impl>
-    <version.com.sun.activation>1.2.0</version.com.sun.activation>
+    <version.com.sun.activation>2.0.1</version.com.sun.activation>
     <version.javax.annotation>1.3.2</version.javax.annotation>
     <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
-    <version.javax.inject>1</version.javax.inject>
+    <version.javax.inject>2.0.1</version.javax.inject>
     <version.javax.validation>2.0.1.Final</version.javax.validation>
     <version.javax.xml.bind>2.3.1</version.javax.xml.bind>
-    <version.org.eclipse.microprofile.openapi>2.0.1</version.org.eclipse.microprofile.openapi>
-    <version.ch.qos.logback>1.2.9</version.ch.qos.logback>
+    <version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
+    <version.ch.qos.logback>1.4.7</version.ch.qos.logback>
 
     <version.io.cloudevents>2.3.0</version.io.cloudevents>
-    <version.io.fabric8.kubernetes-client>6.3.1</version.io.fabric8.kubernetes-client>
-    <version.io.micrometer>1.10.2</version.io.micrometer>
-    <version.org.flywaydb>9.8.3</version.org.flywaydb>
-    <version.org.postgresql>42.5.1</version.org.postgresql>
+    <version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client>
+    <version.io.micrometer>1.11.1</version.io.micrometer>
+    <version.org.flywaydb>9.16.3</version.org.flywaydb>
+    <version.org.postgresql>42.6.0</version.org.postgresql>
     <version.io.serverlessworkflow>4.0.5.Final</version.io.serverlessworkflow>
     <!-- Aligned with Quarkus 2.7 (LTS) - see https://issues.redhat.com/browse/KOGITO-7971 -->
-    <version.io.smallrye-open-api>3.1.1</version.io.smallrye-open-api>
+    <version.io.smallrye-open-api>3.4.0</version.io.smallrye-open-api>
     <version.org.awaitility>4.2.0</version.org.awaitility>
 
-    <version.io.smallrye.reactive.mutiny-vertx-web-client>2.30.1</version.io.smallrye.reactive.mutiny-vertx-web-client>
+    <version.io.smallrye.reactive.mutiny-vertx-web-client>3.7.2</version.io.smallrye.reactive.mutiny-vertx-web-client>
 
-    <version.io.vertx>4.3.7</version.io.vertx>
-    <version.io.grpc>1.53.0</version.io.grpc>
+    <version.io.vertx>4.4.6</version.io.vertx>
+    <version.io.grpc>1.56.0</version.io.grpc>
 
-    <version.io.quarkus.camel>2.15.0</version.io.quarkus.camel>
+    <version.io.quarkus.camel>3.0.0-M1</version.io.quarkus.camel>
 
     <version.io.swagger.parser.v3>2.1.19</version.io.swagger.parser.v3>
     <version.io.swagger.core.v3>2.2.19</version.io.swagger.core.v3>
 
     <version.org.apache.commons>3.12.0</version.org.apache.commons>
 
-    <version.org.graalvm.nativeimage>22.3.0</version.org.graalvm.nativeimage>
+    <version.org.graalvm.nativeimage>23.0.1</version.org.graalvm.nativeimage>
 
-    <version.org.infinispan>14.0.6.Final</version.org.infinispan>
-    <version.org.infinispan.protostream>4.5.1.Final</version.org.infinispan.protostream>
+    <version.org.infinispan>14.0.7.Final</version.org.infinispan>
+    <version.org.infinispan.protostream>4.6.2.Final</version.org.infinispan.protostream>
 
     <version.org.rocksdb>7.10.2</version.org.rocksdb>
     <!-- consider migrating to 3.x JDK 9: https://jakarta.ee/specifications/restful-ws/ -->
-    <version.jakarta.ws.rs>2.1.6</version.jakarta.ws.rs>
-    <version.org.jboss.resteasy>4.7.7.Final</version.org.jboss.resteasy>
-    <version.org.keycloak>20.0.2</version.org.keycloak>
+    <version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
+    <version.org.jboss.resteasy>6.2.4.Final</version.org.jboss.resteasy>
+    <version.org.keycloak>21.0.1</version.org.keycloak>
     <!-- It seems that the confluent kafka cannot replace wurstmeister/kafka so easily. See FAI-729 -->
     <version.wurstmeister.kafka>2.12-2.2.1</version.wurstmeister.kafka>
-    <version.org.mongo>4.6.1</version.org.mongo>
+    <version.org.mongo>4.9.1</version.org.mongo>
     <version.org.mongo-image>4.4.14</version.org.mongo-image>
     <version.org.mozilla.rhino>1.7.13</version.org.mozilla.rhino>
     <version.org.redis>2.0.4</version.org.redis>
@@ -97,35 +97,35 @@
     <version.org.assertj>3.22.0</version.org.assertj>
     <version.org.json-unit-assertj>2.9.0</version.org.json-unit-assertj>
     <version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests -->
-    <version.org.junit.minor>8.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
+    <version.org.junit.minor>9.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
     <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
-    <version.org.junit.jupiter>5.9.2</version.org.junit.jupiter>
-    <version.org.junit.vintage>5.9.2</version.org.junit.vintage>
-    <version.org.junit.platform>1.9.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
+    <version.org.junit.jupiter>5.9.3</version.org.junit.jupiter>
+    <version.org.junit.vintage>5.9.3</version.org.junit.vintage>
+    <version.org.junit.platform>1.9.3</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
     <version.org.junit.pioneer>1.5.0</version.org.junit.pioneer>
     <version.org.mockito>4.11.0</version.org.mockito>
     <version.org.testcontainers>1.17.6</version.org.testcontainers>
     <version.org.xmlunit-core>2.9.1</version.org.xmlunit-core>
-    <version.io.rest-assured>4.5.1</version.io.rest-assured>
+    <version.io.rest-assured>5.3.2</version.io.rest-assured>
 
-    <version.net.byte-buddy>1.12.18</version.net.byte-buddy>
+    <version.net.byte-buddy>1.14.7</version.net.byte-buddy>
 
     <version.org.mvel>2.5.0.Final</version.org.mvel>
-    <version.org.reactivestreams>1.0.3</version.org.reactivestreams>
+    <version.org.reactivestreams>1.0.4</version.org.reactivestreams>
     <version.org.reflections>0.10.2</version.org.reflections>
-    <version.org.slf4j>1.7.36</version.org.slf4j>
+    <version.org.slf4j>2.0.6</version.org.slf4j>
 
-    <version.maven>3.8.6</version.maven>
-    <version.maven.plugin>3.6.0</version.maven.plugin>
+    <version.maven>3.9.3</version.maven>
+    <version.maven.plugin>3.7.1</version.maven.plugin>
     <version.maven.invoker>3.2.0</version.maven.invoker>
 
-    <version.plexus>1.6</version.plexus>
+    <version.plexus>2.1.0</version.plexus>
     <version.plexus.classworld>2.6.0</version.plexus.classworld>
 
     <!-- see: https://maven.apache.org/surefire/maven-surefire-plugin/examples/fork-options-and-parallel-execution.html#parallel-test-execution-and-single-thread-execution -->
     <version.com.github.stephenc.jcip>1.0-1</version.com.github.stephenc.jcip>
     <version.black.ninia>4.1.1</version.black.ninia>
-    <version.com.google.guava>32.0.1-jre</version.com.google.guava>
+    <version.com.google.guava>32.0.0-jre</version.com.google.guava>
     <version.apache.commons.commons-compress>1.24.0</version.apache.commons.commons-compress>
   </properties>
 
@@ -273,8 +273,8 @@
         <version>${version.com.fasterxml.jackson}</version>
       </dependency>
       <dependency>
-        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-        <artifactId>jackson-jaxrs-json-provider</artifactId>
+        <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+        <artifactId>jackson-jakarta-rs-json-provider</artifactId>
         <version>${version.com.fasterxml.jackson}</version>
       </dependency>
       <dependency>
@@ -284,7 +284,7 @@
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
-        <artifactId>jackson-module-jaxb-annotations</artifactId>
+        <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
         <version>${version.com.fasterxml.jackson}</version>
       </dependency>
       <dependency>
@@ -514,6 +514,12 @@
         <version>${version.com.github.tomakehurst.wiremock}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.tomakehurst</groupId>
+        <artifactId>wiremock-jre8-standalone</artifactId>
+        <version>${version.com.github.tomakehurst.wiremock}</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
         <groupId>org.apache.maven.shared</groupId>
@@ -564,9 +570,9 @@
       </dependency>
 
       <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>${version.javax.xml.bind}</version>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
       </dependency>
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
@@ -574,29 +580,29 @@
         <version>${version.com.sun.xml.bind.core}</version>
       </dependency>
       <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>${version.com.sun.xml.bind.impl}</version>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-runtime</artifactId>
+        <version>4.0.3</version>
       </dependency>
       <dependency>
-        <groupId>com.sun.activation</groupId>
-        <artifactId>javax.activation</artifactId>
+        <groupId>org.eclipse.angus</groupId>
+        <artifactId>angus-activation</artifactId>
         <version>${version.com.sun.activation}</version>
       </dependency>
       <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>${version.javax.validation}</version>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>3.0.2</version>
       </dependency>
       <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
+        <groupId>jakarta.inject</groupId>
+        <artifactId>jakarta.inject-api</artifactId>
         <version>${version.javax.inject}</version>
       </dependency>
       <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>${version.javax.annotation}</version>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
+        <version>2.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.microprofile.openapi</groupId>
@@ -654,7 +660,7 @@
       </dependency>
       <dependency>
         <groupId>org.infinispan</groupId>
-        <artifactId>infinispan-client-hotrod</artifactId>
+        <artifactId>infinispan-client-hotrod-jakarta</artifactId>
         <version>${version.org.infinispan}</version>
       </dependency>
       <dependency>
diff --git a/kogito-build/kogito-kie-bom/pom.xml b/kogito-build/kogito-kie-bom/pom.xml
index a900ed54a3..5e95b011b4 100644
--- a/kogito-build/kogito-kie-bom/pom.xml
+++ b/kogito-build/kogito-kie-bom/pom.xml
@@ -18,7 +18,7 @@
   </description>
 
   <properties>
-    <version.org.kie>8.45.0-SNAPSHOT</version.org.kie>
+    <version.org.kie>9.45.0-SNAPSHOT</version.org.kie>
   </properties>
 
   <dependencyManagement>
diff --git a/kogito-codegen-modules/GUIDELINES.adoc b/kogito-codegen-modules/GUIDELINES.adoc
index d0840addb4..909d7a2b31 100644
--- a/kogito-codegen-modules/GUIDELINES.adoc
+++ b/kogito-codegen-modules/GUIDELINES.adoc
@@ -157,14 +157,14 @@ This is the end-result when the class is rendered:
 .TravelersMessageConsumer_3.java
 [source,java]
 ----
-@javax.enterprise.context.ApplicationScoped()
+@jakarta.enterprise.context.ApplicationScoped()
 public class TravelersMessageConsumer_3 {
 
-    @javax.inject.Inject()
-    @javax.inject.Named("Travelers")
+    @jakarta.inject.Inject()
+    @jakarta.inject.Named("Travelers")
     Process<TravelersModel> process;
 
-    @javax.inject.Inject()
+    @jakarta.inject.Inject()
     Application application;
 
     @org.eclipse.microprofile.config.inject.ConfigProperty(name = "kogito.messaging.as-cloudevents")
@@ -219,7 +219,7 @@ u.findAll(FieldDeclaration.class,
         if (isSpring()) {
             vd.setType("java.util.List<WorkItemHandler>");
         } else {
-            vd.setType("javax.enterprise.inject.Instance<WorkItemHandler>");
+            vd.setType("jakarta.enterprise.inject.Instance<WorkItemHandler>");
         }
     });
 ----
@@ -292,7 +292,7 @@ public class TravelersProcess extends AbstractProcess<TravelersModel> {
 
     // post construct method that delegates to a non-final 
     // super-class method
-    @javax.annotation.PostConstruct()
+    @jakarta.annotation.PostConstruct()
     public void init() {
         this.activate();
     }
diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java
index a845270664..f6e0881f57 100644
--- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java
+++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/context/impl/QuarkusKogitoBuildContext.java
@@ -24,8 +24,8 @@ import org.drools.codegen.common.rest.impl.CDIRestAnnotator;
 public class QuarkusKogitoBuildContext extends AbstractKogitoBuildContext {
 
     public static final String CONTEXT_NAME = "Quarkus";
-    public static final String QUARKUS_REST = "javax.ws.rs.Path";
-    public static final String QUARKUS_DI = "javax.inject.Inject";
+    public static final String QUARKUS_REST = "jakarta.ws.rs.Path";
+    public static final String QUARKUS_DI = "jakarta.inject.Inject";
 
     protected QuarkusKogitoBuildContext(QuarkusKogitoBuildContextBuilder builder) {
         super(builder, new CDIDependencyInjectionAnnotator(), new CDIRestAnnotator(), CONTEXT_NAME);
diff --git a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java
index 64927dd573..70c2da73a9 100644
--- a/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java
+++ b/kogito-codegen-modules/kogito-codegen-api/src/main/java/org/kie/kogito/codegen/api/utils/KogitoCodeGenConstants.java
@@ -24,7 +24,7 @@ public class KogitoCodeGenConstants {
 
     }
 
-    public static final String VALIDATION_CLASS = "javax.validation.constraints.NotNull";
+    public static final String VALIDATION_CLASS = "jakarta.validation.constraints.NotNull";
     public static final String OPENAPI_SPEC_CLASS = "org.eclipse.microprofile.openapi.annotations.media.Schema";
     /**
      * Property that controls whether Kogito Codegen should ignore hidden files. Defaults to true.
diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
index 107ffe7059..e75602e131 100644
--- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/ApplicationQuarkusTemplate.java
@@ -18,13 +18,13 @@
  */
 package $Package$;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 public class Application extends org.kie.kogito.StaticApplication {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     public Application(
             org.kie.kogito.Config config,
-            javax.enterprise.inject.Instance<org.kie.kogito.KogitoEngine> engines) {
+            jakarta.enterprise.inject.Instance<org.kie.kogito.KogitoEngine> engines) {
         super(config, engines);
     }
 }
diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java
index 547a324698..a329586e4b 100644
--- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ApplicationConfigQuarkusTemplate.java
@@ -18,12 +18,12 @@
  */
 package $Package$;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 public class ApplicationConfig extends org.kie.kogito.StaticConfig {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     public ApplicationConfig(
             Instance<org.kie.kogito.KogitoConfig> configs) {
         super($Addons$, configs);
diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java
index e924e968cf..f0f09df0c5 100644
--- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/ConfigBeanSpringTemplate.java
@@ -30,7 +30,7 @@ public class ConfigBean extends org.kie.kogito.config.StaticConfigBean {
     @org.springframework.beans.factory.annotation.Value("${kogito.jackson.fail-on-empty-bean:#{false}}")
     boolean failOnEmptyBean;
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     protected void init() {
         setServiceUrl(kogitoService.orElse(""));
         setCloudEvents(useCloudEvents);
diff --git a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java
index 219b971df9..050097b1d1 100644
--- a/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-core/src/main/resources/class-templates/config/GlobalObjectMapperQuarkusTemplate.java
@@ -18,11 +18,11 @@
  */
 package $Package$;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import java.util.TimeZone;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
index 12b0f7bfa1..89ddb88e6f 100644
--- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
+++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
@@ -292,7 +292,7 @@ public class DecisionRestResourceGenerator {
 
     private void interpolateRequestPath(String pathName, String placeHolder, MethodDeclaration clonedDmnMethod) {
         clonedDmnMethod.getAnnotations().stream()
-                .filter(a -> a.getNameAsString().endsWith("Path") || a.getNameAsString().endsWith("PostMapping")) // e.g.: @javax.ws.rs.Path("/DSn/dmnresult") or @org.springframework.web.bind.annotation.PostMapping(value = "$dmnMethodUrl$", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+                .filter(a -> a.getNameAsString().endsWith("Path") || a.getNameAsString().endsWith("PostMapping")) // e.g.: @jakarta.ws.rs.Path("/DSn/dmnresult") or @org.springframework.web.bind.annotation.PostMapping(value = "$dmnMethodUrl$", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
                 .flatMap(a -> a.findAll(StringLiteralExpr.class).stream())
                 .forEach(vv -> {
                     String s = vv.getValue();
diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java
index f63fbaa315..401755fa81 100644
--- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionContainerQuarkusTemplate.java
@@ -18,7 +18,7 @@
  */
 package $Package$;
 
-@javax.enterprise.context.ApplicationScoped()
+@jakarta.enterprise.context.ApplicationScoped()
 @io.quarkus.runtime.Startup() //<-- Required to force full reload during hot reload
 public class DecisionModels extends org.kie.kogito.dmn.AbstractDecisionModels {
 
@@ -27,14 +27,14 @@ public class DecisionModels extends org.kie.kogito.dmn.AbstractDecisionModels {
                 /* arguments provided during codegen */);
     }
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     protected org.kie.kogito.Application application;
 
     public DecisionModels() {
         super();
     }
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     protected void init() {
         initApplication(application);
     }
diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
index bc71d6ad53..a14ff6013a 100644
--- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
@@ -22,14 +22,14 @@ import java.io.InputStream;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
 
 import org.kie.dmn.feel.codegen.feel11.CodegenStringUtil;
 import org.kie.kogito.Application;
@@ -87,7 +87,7 @@ public class DMNRestResourceTemplate {
     }
 
     private ResponseBuilder buildFailedEvaluationResponse(KogitoDMNResult result){
-        return Response.status(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(result);
+        return Response.status(jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(result);
     }
 
     private ResponseBuilder extractStronglyTypedContextIfSucceded(KogitoDMNResult result) {
diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java
index c38aecc6d8..aa9d4b9eee 100644
--- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/config/DecisionConfigQuarkusTemplate.java
@@ -25,17 +25,17 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import org.kie.dmn.api.core.event.DMNRuntimeEventListener;
 import org.kie.kogito.decision.DecisionEventListenerConfig;
 import org.kie.kogito.dmn.config.AbstractDecisionConfig;
 import org.kie.kogito.rules.RuleEventListenerConfig;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 class DecisionConfig extends AbstractDecisionConfig {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     public DecisionConfig(
             Instance<DecisionEventListenerConfig> decisionEventListenerConfigs,
             Instance<DMNRuntimeEventListener> dmnRuntimeEventListeners) {
diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java
index 80c8edfc7f..ab5b6009db 100644
--- a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PMMLRestResourceQuarkusTemplate.java
@@ -20,11 +20,11 @@ package org.kie.kogito.pmml.rest;
 
 import java.util.Collections;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.kogito.Application;
 
@@ -56,11 +56,11 @@ public class PMMLRestResourceTemplate extends org.kie.kogito.pmml.AbstractPMMLRe
         return super.descriptive(application, FILE_NAME, MODEL_NAME, variables);
     }
 
-    @javax.ws.rs.ext.Provider
-    public static class ErrorExceptionMapper implements javax.ws.rs.ext.ExceptionMapper<java.lang.Exception> {
+    @jakarta.ws.rs.ext.Provider
+    public static class ErrorExceptionMapper implements jakarta.ws.rs.ext.ExceptionMapper<java.lang.Exception> {
 
-        public javax.ws.rs.core.Response toResponse(java.lang.Exception e) {
-            return javax.ws.rs.core.Response.status(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(org.kie.kogito.pmml.AbstractPMMLRestResource.getJsonErrorMessage(e)).build();
+        public jakarta.ws.rs.core.Response toResponse(java.lang.Exception e) {
+            return jakarta.ws.rs.core.Response.status(jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR).entity(org.kie.kogito.pmml.AbstractPMMLRestResource.getJsonErrorMessage(e)).build();
         }
     }
 
diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java
index d5cfad7e91..7deb7d26d0 100644
--- a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/PredictionModelsQuarkusTemplate.java
@@ -18,7 +18,7 @@
  */
 package $Package$;
 
-@javax.enterprise.context.ApplicationScoped()
+@jakarta.enterprise.context.ApplicationScoped()
 public class PredictionModels extends org.kie.kogito.pmml.AbstractPredictionModels {
 
     static {
diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java
index 3fc484363c..8ec7773081 100644
--- a/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-predictions/src/main/resources/class-templates/config/PredictionConfigQuarkusTemplate.java
@@ -25,15 +25,15 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import org.kie.kogito.pmml.config.AbstractPredictionConfig;
 import org.kie.kogito.prediction.PredictionEventListenerConfig;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 class PredictionConfig extends AbstractPredictionConfig {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     public PredictionConfig(
             Instance<PredictionEventListenerConfig> predictionEventListenerConfigs) {
         super(predictionEventListenerConfigs);
diff --git a/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java b/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java
index c6dd295185..e5b5e71e45 100644
--- a/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java
+++ b/kogito-codegen-modules/kogito-codegen-predictions/src/test/java/org/kie/kogito/codegen/prediction/config/PredictionConfigGeneratorTest.java
@@ -39,9 +39,9 @@ class PredictionConfigGeneratorTest {
         GeneratedFile retrieved = predictionConfigGenerator.generate();
         assertNotNull(retrieved);
         String retrievedContent = new String(retrieved.contents());
-        String expected = "@javax.inject.Singleton";
+        String expected = "@jakarta.inject.Singleton";
         assertTrue(retrievedContent.contains(expected));
-        expected = "@javax.inject.Inject";
+        expected = "@jakarta.inject.Inject";
         assertTrue(retrievedContent.contains(expected));
         String unexpected = "@org.springframework.stereotype.Component";
         assertFalse(retrievedContent.contains(unexpected));
@@ -60,9 +60,9 @@ class PredictionConfigGeneratorTest {
         assertTrue(retrievedContent.contains(expected));
         expected = "@org.springframework.beans.factory.annotation.Autowired";
         assertTrue(retrievedContent.contains(expected));
-        String unexpected = "@javax.inject.Singleton";
+        String unexpected = "@jakarta.inject.Singleton";
         assertFalse(retrievedContent.contains(unexpected));
-        unexpected = "@javax.inject.Inject";
+        unexpected = "@jakarta.inject.Inject";
         assertFalse(retrievedContent.contains(unexpected));
     }
 }
\ No newline at end of file
diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml
index 6029d9bae8..ae1e860a0b 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml
+++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml
@@ -117,9 +117,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
       <scope>test</scope>
+      <version>3.0.2.redhat-00005</version>
     </dependency>
   </dependencies>
 
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java
index dfbb92dfb5..90ab0277b0 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java
@@ -368,8 +368,8 @@ public class ProcessResourceGenerator {
     }
 
     private void insertValidationAnnotations(Parameter param) {
-        param.addAnnotation("javax.validation.Valid");
-        param.addAnnotation("javax.validation.constraints.NotNull");
+        param.addAnnotation("jakarta.validation.Valid");
+        param.addAnnotation("jakarta.validation.constraints.NotNull");
     }
 
     private void initializeProcessField(FieldDeclaration fd) {
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java
index 1d8c9904f7..58b6087fcf 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerQuarkusTemplate.java
@@ -22,8 +22,8 @@ package $Package$;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.kie.kogito.process.Process;
 import org.kie.kogito.addon.quarkus.messaging.common.QuarkusMessageConsumer;
@@ -42,7 +42,7 @@ public class $Type$MessageConsumer extends QuarkusMessageConsumer<$Type$, $DataT
     
     private Set<String> correlation;
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     void init() {
         init(process,"$Trigger$",$DataType$.class, eventReceiver, correlation);
     }
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java
index b42dac9013..49fbd2f049 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageConsumerSpringTemplate.java
@@ -25,7 +25,7 @@ import org.kie.kogito.process.Process;
 import org.kie.kogito.addon.cloudevents.spring.SpringMessageConsumer;
 import org.kie.kogito.event.EventReceiver;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java
index 5d89c76f65..5a983df089 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/MessageProducerQuarkusTemplate.java
@@ -21,7 +21,7 @@ package org.kie.kogito.test;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.event.EventEmitter;
 import org.kie.kogito.event.impl.AbstractMessageProducer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @io.quarkus.runtime.Startup
 public class MessageProducer extends AbstractMessageProducer<$DataType$> {
@@ -29,7 +29,7 @@ public class MessageProducer extends AbstractMessageProducer<$DataType$> {
     @Inject
     EventEmitter emitter;
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     public void init() {
         init(emitter,"$Trigger$");
     }
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java
index 014f830f48..977f351c64 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerQuarkusTemplate.java
@@ -18,15 +18,15 @@
  */
 package $Package$;
 
-@javax.enterprise.context.ApplicationScoped
+@jakarta.enterprise.context.ApplicationScoped
 public class Processes implements org.kie.kogito.process.Processes {
 
-    @javax.inject.Inject
-    javax.enterprise.inject.Instance<org.kie.kogito.process.Process<? extends org.kie.kogito.Model>> processes;
+    @jakarta.inject.Inject
+    jakarta.enterprise.inject.Instance<org.kie.kogito.process.Process<? extends org.kie.kogito.Model>> processes;
 
     private java.util.Map<String, org.kie.kogito.process.Process<? extends org.kie.kogito.Model>> mappedProcesses = new java.util.HashMap<>();
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     public void setup() {
         for (org.kie.kogito.process.Process<? extends org.kie.kogito.Model> process : processes) {
             mappedProcesses.put(process.id(), process);
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java
index a7b9dc9b38..85badab09a 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ProcessContainerSpringTemplate.java
@@ -27,7 +27,7 @@ public class Processes implements org.kie.kogito.process.Processes {
 
     private java.util.Map<String, org.kie.kogito.process.Process<? extends org.kie.kogito.Model>> mappedProcesses = new java.util.HashMap<>();
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     public void setup() {
         for (org.kie.kogito.process.Process<? extends org.kie.kogito.Model> process : processes) {
             mappedProcesses.put(process.id(), process);
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java
index 944920ef74..4701acf96b 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/ReactiveRestResourceQuarkusTemplate.java
@@ -25,20 +25,20 @@ import java.util.stream.Collectors;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 
 import org.jbpm.util.JsonSchemaUtil;
 import org.kie.kogito.process.Process;
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java
index 773efa4265..bd40424d92 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceQuarkusTemplate.java
@@ -24,26 +24,26 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.PATCH;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response.Status;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.PATCH;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java
index 3ab9387965..34c0d6a96d 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/RestResourceUserTaskQuarkusTemplate.java
@@ -20,10 +20,10 @@ package com.myspace.demo;
 
 import java.util.List;
 
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.kie.kogito.auth.IdentityProviders;
 import org.kie.kogito.auth.SecurityPolicy;
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java
index 35dfd11fcb..19491e3b91 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/config/ProcessConfigQuarkusTemplate.java
@@ -18,7 +18,7 @@
  */
 package $Package$;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import org.kie.api.event.process.ProcessEventListener;
 import org.kie.kogito.auth.IdentityProvider;
@@ -30,10 +30,10 @@ import org.kie.kogito.process.WorkItemHandlerConfig;
 import org.kie.kogito.uow.UnitOfWorkManager;
 import org.kie.kogito.uow.events.UnitOfWorkEventListener;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 public class ProcessConfig extends org.kie.kogito.process.impl.AbstractProcessConfig {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     public ProcessConfig(
             Instance<WorkItemHandlerConfig> workItemHandlerConfig,
             Instance<UnitOfWorkManager> unitOfWorkManager,
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java
index 1b6f040386..1c66cb175a 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/persistence/KafkaStreamsTopologyProducerJavaTemplate.java
@@ -21,8 +21,8 @@ package org.kie.kogito.persistence;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.kafka.streams.Topology;
 import org.slf4j.Logger;
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java
index 280b3209eb..919f3ac313 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/resources/class-templates/producer/ProcessServiceProducerQuarkusTemplate.java
@@ -18,8 +18,8 @@
  */
 package $Package$;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.process.ProcessService;
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java
index 4b58ec25ba..3ef8eabe81 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java
@@ -38,7 +38,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
 
     @org.kie.kogito.codegen.VariableInfo(tags = "")
     @com.fasterxml.jackson.annotation.JsonProperty(value = "person")
-    @javax.validation.Valid()
+    @jakarta.validation.Valid()
     private Person person;
 
     public Person getPerson() {
@@ -51,7 +51,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
 
     @org.kie.kogito.codegen.VariableInfo(tags = "")
     @com.fasterxml.jackson.annotation.JsonProperty(value = "var2")
-    @javax.validation.Valid()
+    @jakarta.validation.Valid()
     private String var2;
 
     public String getVar2() {
@@ -64,7 +64,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
 
     @org.kie.kogito.codegen.VariableInfo(tags = "")
     @com.fasterxml.jackson.annotation.JsonProperty(value = "var1")
-    @javax.validation.Valid()
+    @jakarta.validation.Valid()
     private String var1;
 
     public String getVar1() {
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
index 72f3879838..93a30ce8f5 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/resources/openapi/SimpleResource.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
 
diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java
index ee72ea81e3..bc53ce9f06 100644
--- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/config/RuleConfigQuarkusTemplate.java
@@ -18,17 +18,17 @@
  */
 package $Package$;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import org.kie.kogito.drools.core.config.AbstractRuleConfig;
 import org.kie.api.event.rule.AgendaEventListener;
 import org.kie.api.event.rule.RuleRuntimeEventListener;
 import org.kie.kogito.rules.RuleEventListenerConfig;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 class RuleConfig extends AbstractRuleConfig implements org.kie.kogito.rules.RuleConfig {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     public RuleConfig(
             Instance<RuleEventListenerConfig> ruleEventListenerConfigs,
             Instance<AgendaEventListener> agendaEventListeners,
diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java
index a2f8cf740f..aa82ea7c56 100644
--- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/EventDrivenExecutorQuarkusTemplate.java
@@ -18,9 +18,9 @@
  */
 package com.myspace.demo;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.eventdriven.rules.AbstractEventDrivenQueryExecutor;
 import org.drools.ruleunits.api.RuleUnit;
diff --git a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java
index 141c98bad0..b469b9dc6f 100644
--- a/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-rules/src/main/resources/class-templates/rules/RuleUnitContainerQuarkusTemplate.java
@@ -26,10 +26,10 @@ import org.drools.ruleunits.impl.sessions.RuleUnitExecutorImpl;
 import org.kie.kogito.rules.RuleEventListenerConfig;
 import org.kie.kogito.app.Application;
 
-@javax.enterprise.context.ApplicationScoped
+@jakarta.enterprise.context.ApplicationScoped
 public class RuleUnits extends org.kie.kogito.drools.core.unit.AbstractRuleUnits implements org.kie.kogito.rules.RuleUnits {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     Application application;
 
     @Override
diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java
index 608f34f828..5d46d09e07 100644
--- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleContainerQuarkusTemplate.java
@@ -19,17 +19,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-@javax.enterprise.context.ApplicationScoped()
+@jakarta.enterprise.context.ApplicationScoped()
 public class SampleRuntime extends org.kie.kogito.codegen.sample.core.SampleRuntimeImpl {
 
-    @javax.inject.Inject
+    @jakarta.inject.Inject
     protected org.kie.kogito.Application application;
 
     public SampleRuntime() {
         super();
     }
 
-    @javax.annotation.PostConstruct
+    @jakarta.annotation.PostConstruct
     protected void init() {
         initApplication(application);
         initContent();
diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java
index db3893ba00..4b473716ba 100644
--- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceQuarkusTemplate.java
@@ -18,11 +18,11 @@
  */
 package org.kie.dmn.kogito.quarkus.example;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.kogito.codegen.sample.core.SampleRuntime;
 import org.kie.kogito.dmn.rest.DMNEvaluationErrorException;
diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java
index ddc3ab0768..9fc374e8ca 100644
--- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/SampleRestResourceSpringTemplate.java
@@ -18,7 +18,7 @@
  */
 package org.kie.dmn.kogito.quarkus.example;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.codegen.sample.core.SampleRuntime;
diff --git a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java
index df26763500..82a7758afb 100644
--- a/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java
+++ b/kogito-codegen-modules/kogito-codegen-sample/kogito-codegen-sample-generator/src/main/resources/class-templates/config/SampleConfigQuarkusTemplate.java
@@ -18,7 +18,7 @@
  */
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 public class SampleConfig extends org.kie.kogito.codegen.sample.core.SampleConfigImpl {
 
     public SampleConfig(
diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
index 55a94a42ae..f3a7c073bd 100644
--- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
+++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
@@ -21,11 +21,11 @@ package org.kie.kogito.addons.quarkus.camel.runtime;
 import java.util.Collections;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
index 92e74b341e..e8858be001 100644
--- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
+++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.addons.quarkus.camel.runtime;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 
 @ApplicationScoped
diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
index fd6a0d07b4..6d3c573c6b 100644
--- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
+++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
@@ -21,11 +21,11 @@ package org.kie.kogito.addon.quarkus.common.reactive.messaging;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.reactive.messaging.Message;
 
 /**
diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
index 4ff805195c..ec9a557dbc 100644
--- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
+++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.addon.quarkus.common.reactive.messaging.http;
 
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator;
diff --git a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
index 72b4d3200a..56d82c3462 100644
--- a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
+++ b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
@@ -21,8 +21,8 @@ package org.kie.kogito.addon.quarkus.messaging.common.message.http;
 import java.util.Collections;
 import java.util.Optional;
 
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/events/decisions/runtime/pom.xml b/quarkus/addons/events/decisions/runtime/pom.xml
index f4258b1d32..099c4dba4a 100644
--- a/quarkus/addons/events/decisions/runtime/pom.xml
+++ b/quarkus/addons/events/decisions/runtime/pom.xml
@@ -51,7 +51,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
index e2a5255c05..fbd6dd44a9 100644
--- a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
+++ b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.eventdriven.decision;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.decision.DecisionModels;
diff --git a/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 97c69b25eb..28a17c006b 100644
--- a/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - decisions
     - DMN
     - Kafka
-  guide: https://quarkus.io/version/2.13/guides/kogito-dmn
+  guide: https://quarkus.io/guides/kogito-dmn
   categories:
     - "business-automation"
diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml
index 031919c65e..b01045604d 100644
--- a/quarkus/addons/events/mongodb/runtime/pom.xml
+++ b/quarkus/addons/events/mongodb/runtime/pom.xml
@@ -44,8 +44,8 @@
       <artifactId>quarkus-mongodb-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.microprofile.config</groupId>
@@ -89,7 +89,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
index acc045bf57..da585bf0b1 100644
--- a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
+++ b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
+import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
diff --git a/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 5b6f1751d3..1f442efbb8 100644
--- a/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/events/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - mongodb
     - events
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
index ad167e7166..67a270cb3e 100644
--- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
+++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
@@ -20,7 +20,7 @@ package org.kie.kogito.events.mongodb;
 
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
index e00cebbfce..ad81feee51 100644
--- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
+++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 
diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
index 9d95cf4466..733fa74cfc 100644
--- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
+++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
diff --git a/quarkus/addons/events/predictions/runtime/pom.xml b/quarkus/addons/events/predictions/runtime/pom.xml
index f74c628f89..7884ec294f 100644
--- a/quarkus/addons/events/predictions/runtime/pom.xml
+++ b/quarkus/addons/events/predictions/runtime/pom.xml
@@ -51,7 +51,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
index b1b9b3849b..bb8854515d 100644
--- a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
+++ b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.eventdriven.predictions;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
diff --git a/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 8a988af040..fac44beefa 100644
--- a/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - predictions
     - PMML
     - Kafka
-  guide: https://quarkus.io/version/2.13/guides/kogito-pmml
+  guide: https://quarkus.io/guides/kogito-pmml
   categories:
     - "business-automation"
diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml
index 6f566021af..aa2eae5afb 100644
--- a/quarkus/addons/events/process/runtime/pom.xml
+++ b/quarkus/addons/events/process/runtime/pom.xml
@@ -45,8 +45,8 @@
       <artifactId>kogito-addons-quarkus-common-reactive-messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -92,7 +92,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
index 225f55eb4e..e5510c58bc 100644
--- a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
+++ b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
@@ -22,11 +22,11 @@ import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
+import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
diff --git a/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 1a5dc80673..d6ef5999d9 100644
--- a/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/events/process/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - process
     - events
   # TODO: add process guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/events/rules/runtime/pom.xml b/quarkus/addons/events/rules/runtime/pom.xml
index 756fb2d4dd..5855e1cafc 100644
--- a/quarkus/addons/events/rules/runtime/pom.xml
+++ b/quarkus/addons/events/rules/runtime/pom.xml
@@ -51,7 +51,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
index 4b34ff5589..1f261d8900 100644
--- a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
+++ b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.eventdriven.rules;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
diff --git a/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 3b47a52bdb..65aafaa29b 100644
--- a/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - drools
     - DRL
     - Kafka
-  guide: https://quarkus.io/version/2.13/guides/kogito-drl
+  guide: https://quarkus.io/guides/kogito-drl
   categories:
     - "business-automation"
diff --git a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
index c8e17b2846..dd02b78b17 100644
--- a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
+++ b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Singleton;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.core.Response;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml
index 703f894e52..4789686363 100644
--- a/quarkus/addons/explainability/runtime/pom.xml
+++ b/quarkus/addons/explainability/runtime/pom.xml
@@ -85,7 +85,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
index ae72a32581..1b3205e834 100644
--- a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
+++ b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
@@ -20,13 +20,13 @@ package org.kie.kogito.explainability;
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.explainability.model.PredictInput;
diff --git a/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 754324e79b..daa4d38238 100644
--- a/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/explainability/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,7 +25,7 @@ metadata:
     - decisions
     - dmn
     - explainability
-  guide: https://quarkus.io/version/2.13/guides/kogito-dmn
+  guide: https://quarkus.io/guides/kogito-dmn
   categories:
     - "business-automation"
   unlisted: true
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
index 55d400e440..52224a65e5 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
@@ -97,7 +97,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
index 5aba7abd79..1ed2dc4ae9 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
@@ -24,8 +24,8 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
index 104e80d302..9660edf455 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import io.fabric8.knative.client.KnativeClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
index dd818d9c9b..0220c39da1 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
@@ -21,8 +21,8 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
index 2900f610eb..9e53d7c6f9 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
@@ -22,8 +22,8 @@ import java.net.URI;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
index 4299a6bd55..7f7ae2f66f 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
@@ -23,8 +23,8 @@ import java.net.URI;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
index b895f67362..bd4d2c29b5 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 
@@ -59,7 +59,7 @@ public class DeploymentUtilsTest {
     @Test
     public void testNotFoundDeployment() {
         Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).item();
         deployment.getMetadata().setName("test");
         mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace();
         assertEquals(Optional.empty(),
@@ -71,11 +71,11 @@ public class DeploymentUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/example-deployment-with-service");
 
         Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).item();
         mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).item();
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = discovery.query(kubeURI).map(URI::toString);
@@ -87,14 +87,14 @@ public class DeploymentUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/custom-port-deployment?port-name=my-custom-port");
 
         Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment.yaml")).item();
         deployment.getMetadata().setName("custom-port-deployment");
         deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts()
                 .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build());
         mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-service.yaml")).item();
         service.getMetadata().setName("custom-port-name-service");
         service.getSpec().getPorts().add(new ServicePortBuilder()
                 .withName("my-custom-port")
@@ -111,16 +111,16 @@ public class DeploymentUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/example-deployment-no-service");
 
         Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).item();
         Deployment createdDeployment = mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace();
 
         ReplicaSet rs = mockServer.getClient().apps().replicaSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).item();
         rs.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid());
         ReplicaSet createdRs = mockServer.getClient().resource(rs).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).item();
         pod.getMetadata().setName("pod-deployment-no-service");
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdRs.getMetadata().getUid());
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
@@ -134,19 +134,19 @@ public class DeploymentUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/example-deployment-no-service-2-replicas");
 
         Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).item();
         deployment.getMetadata().setName("example-deployment-no-service-2-replicas");
         deployment.getStatus().setReplicas(2);
         Deployment createdDeployment = mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace();
 
         ReplicaSet rs = mockServer.getClient().apps().replicaSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).item();
         rs.getMetadata().setName("rs-2-replicas");
         rs.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid());
         ReplicaSet createdRs = mockServer.getClient().resource(rs).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).item();
         pod.getMetadata().setName("pod-2-replicas");
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdRs.getMetadata().getUid());
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
@@ -160,20 +160,20 @@ public class DeploymentUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("deployments.v1.apps/" + namespace + "/custom-port-deployment-1?port-name=my-custom-port");
 
         Deployment deployment = mockServer.getClient().apps().deployments().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/deployment-no-service.yaml")).item();
         deployment.getMetadata().setName("custom-port-deployment-1");
         deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts()
                 .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build());
         Deployment createdDeployment = mockServer.getClient().resource(deployment).inNamespace(namespace).createOrReplace();
 
         ReplicaSet rs = mockServer.getClient().apps().replicaSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/replica-set-deployment-no-service.yaml")).item();
         rs.getMetadata().setName("custom-port-rs");
         rs.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid());
         ReplicaSet createdRs = mockServer.getClient().resource(rs).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deployment/pod-deployment-no-service.yaml")).item();
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdRs.getMetadata().getUid());
         pod.getSpec().getContainers().get(0).getPorts()
                 .add(new ContainerPortBuilder()
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
index e9ed6cb6db..844cb509b8 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
index 8a2ed6392d..44e9b1bb88 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 
@@ -53,7 +53,7 @@ public class IngressUtilsTest {
         Ingress ingress = mockServer.getClient()
                 .network().v1().ingresses()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).item();
         mockServer.getClient().resource(ingress).inNamespace(namespace).createOrReplace();
 
         assertEquals(Optional.empty(),
@@ -65,7 +65,7 @@ public class IngressUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("ingresses.v1.networking.k8s.io/" + namespace + "/process-quarkus-ingress");
 
         Ingress ingress = mockServer.getClient().network().v1().ingresses().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-ip.yaml")).item();
 
         mockServer.getClient().resource(ingress).inNamespace(namespace).createOrReplace();
 
@@ -78,7 +78,7 @@ public class IngressUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("ingresses.v1.networking.k8s.io/" + namespace + "/hello-app-ingress-tls");
 
         Ingress ingress = mockServer.getClient().network().v1().ingresses().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-tls-and-host.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("ingress/ingress-with-tls-and-host.yaml")).item();
 
         mockServer.getClient().resource(ingress).inNamespace(namespace).createOrReplace();
 
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
index 0c6eb35452..45b8fd3fa9 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil;
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
index b88566787f..cd6c673e05 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 
@@ -54,7 +54,7 @@ public class KubernetesResourceDiscoveryTest {
         var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/process-quarkus-example-pod-service");
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).item();
 
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
@@ -67,7 +67,7 @@ public class KubernetesResourceDiscoveryTest {
         var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/custom-port-name-service?port-name=my-custom-port");
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).item();
         service.getMetadata().setName("custom-port-name-service");
         service.getSpec().getPorts().get(0).setName("my-custom-port");
         service.getSpec().getPorts().get(0).setPort(8089);
@@ -82,7 +82,7 @@ public class KubernetesResourceDiscoveryTest {
         var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/process-quarkus-example-pod-clusterip-svc");
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item();
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = kubernetesResourceDiscovery.query(kubeURI).map(URI::toString);
@@ -94,7 +94,7 @@ public class KubernetesResourceDiscoveryTest {
         var kubeURI = KubernetesResourceUri.parse("services.v1/" + namespace + "/process-quarkus-example-pod");
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-external-name.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-external-name.yaml")).item();
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = kubernetesResourceDiscovery.query(kubeURI).map(URI::toString);
@@ -104,7 +104,7 @@ public class KubernetesResourceDiscoveryTest {
     @Test
     public void testNotFoundService() {
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item();
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
         assertEquals(Optional.empty(),
@@ -114,7 +114,7 @@ public class KubernetesResourceDiscoveryTest {
     @Test
     public void testNotSupportedTypeService() {
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item();
         service.getSpec().setType(KubeConstants.LOAD_BALANCER_TYPE);
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
@@ -127,7 +127,7 @@ public class KubernetesResourceDiscoveryTest {
         var kubeURI = KubernetesResourceUri.parse("services.v1/process-quarkus-example-pod-service");
 
         Service service = mockServer.getClient().services().inNamespace("test")
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-node-port.yaml")).item();
         mockServer.getClient().resource(service).inNamespace("test").createOrReplace();
 
         Optional<String> url = kubernetesResourceDiscovery.query(kubeURI).map(URI::toString);
@@ -138,7 +138,7 @@ public class KubernetesResourceDiscoveryTest {
     public void testNotFoundKnativeService() {
         KnativeClient knativeClient = mockServer.getClient().adapt(KnativeClient.class);
         io.fabric8.knative.serving.v1.Service service = knativeClient.services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).item();
         service.getMetadata().setName("test");
 
         // ItemWritableOperation#create is deprecated. However, we can't use the new method while Quarkus LTS is not greater than 2.16.
@@ -154,7 +154,7 @@ public class KubernetesResourceDiscoveryTest {
 
         KnativeClient knativeClient = mockServer.getClient().adapt(KnativeClient.class);
         io.fabric8.knative.serving.v1.Service kService = knativeClient.services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("knative/quarkus-greeting.yaml")).item();
 
         // ItemWritableOperation#create is deprecated. However, we can't use the new method while Quarkus LTS is not greater than 2.16.
         knativeClient.services().inNamespace(namespace).create(kService);
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
index 960436dc1f..08ca9997a9 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 
@@ -52,7 +52,7 @@ public class OpenShiftServiceDiscoveryTest {
     @Test
     public void testNotFoundDeploymentConfig() {
         DeploymentConfig deploymentConfig = mockServer.getOpenshiftClient().deploymentConfigs().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).item();
         deploymentConfig.getMetadata().setName("test");
         mockServer.getOpenshiftClient().resource(deploymentConfig).inNamespace(namespace).createOrReplace();
         assertEquals(Optional.empty(),
@@ -66,13 +66,13 @@ public class OpenShiftServiceDiscoveryTest {
         DeploymentConfig deploymentConfig = mockServer.getOpenshiftClient()
                 .deploymentConfigs()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config.yaml")).item();
         mockServer.getOpenshiftClient().resource(deploymentConfig).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getOpenshiftClient()
                 .services()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-service.yaml")).item();
         mockServer.getOpenshiftClient().resource(service).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = kubeResourceDiscovery.query(kubeURI).map(URI::toString);
@@ -86,20 +86,20 @@ public class OpenShiftServiceDiscoveryTest {
         DeploymentConfig deploymentConfig = mockServer.getOpenshiftClient()
                 .deploymentConfigs()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/deployment-config-no-service.yaml")).item();
         DeploymentConfig createdDc = mockServer.getOpenshiftClient().resource(deploymentConfig).inNamespace(namespace).createOrReplace();
 
         ReplicationController rc = mockServer.getOpenshiftClient()
                 .replicationControllers()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/replication-controller-dc-no-svc.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/replication-controller-dc-no-svc.yaml")).item();
         rc.getMetadata().getOwnerReferences().get(0).setUid(createdDc.getMetadata().getUid());
         ReplicationController createdRc = mockServer.getOpenshiftClient().resource(rc).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getOpenshiftClient()
                 .pods()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/pod-deployment-config-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("deploymentConfig/pod-deployment-config-no-service.yaml")).item();
         pod.getMetadata().setName("example-dc-no-service-1-phlx4");
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdRc.getMetadata().getUid());
         mockServer.getOpenshiftClient().resource(pod).inNamespace(namespace).createOrReplace();
@@ -113,7 +113,7 @@ public class OpenShiftServiceDiscoveryTest {
         Route route = mockServer.getOpenshiftClient()
                 .routes()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).item();
         mockServer.getOpenshiftClient().resource(route).inNamespace(namespace).createOrReplace();
 
         assertEquals(Optional.empty(),
@@ -127,7 +127,7 @@ public class OpenShiftServiceDiscoveryTest {
         Route route = mockServer.getOpenshiftClient()
                 .routes()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("route/route.yaml")).item();
         mockServer.getOpenshiftClient().resource(route).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = kubeResourceDiscovery.query(kubeURI).map(URI::toString);
@@ -141,7 +141,7 @@ public class OpenShiftServiceDiscoveryTest {
         Route route = mockServer.getOpenshiftClient()
                 .routes()
                 .inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("route/route-tls.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("route/route-tls.yaml")).item();
         mockServer.getOpenshiftClient().resource(route).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = kubeResourceDiscovery.query(kubeURI).map(URI::toString);
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
index 2a70e3dfd0..1f4d34a4e4 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
@@ -22,7 +22,7 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 
@@ -53,7 +53,7 @@ public class PodUtilsTest {
     @Test
     public void testPodNotFound() {
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item();
         pod.getMetadata().setName("test-pod");
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
         assertEquals(Optional.empty(),
@@ -65,7 +65,7 @@ public class PodUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/process-quarkus-example-pod-no-service");
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item();
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = discovery.query(kubeURI).map(URI::toString);
@@ -77,7 +77,7 @@ public class PodUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/pod-no-service-custom-port?port-name=my-custom-port");
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service-custom-port-name.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service-custom-port-name.yaml")).item();
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = discovery.query(kubeURI).map(URI::toString);
@@ -89,12 +89,12 @@ public class PodUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/test-pod-with-service");
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item();
         pod.getMetadata().setName("test-pod-with-service");
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item();
 
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
@@ -107,17 +107,17 @@ public class PodUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("pods.v1/" + namespace + "/test-pod-with-service-custom-label?labels=label-name=test-label;other-label=other-value");
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("pod/pod-no-service.yaml")).item();
         pod.getMetadata().setName("test-pod-with-service-custom-label");
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item();
         service.getMetadata().setName(" process-quarkus-example-pod-clusterip-svc-custom-label");
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
         Service service1 = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("service/service-clusterip.yaml")).item();
         Map<String, String> labels = service1.getMetadata().getLabels();
         labels.put("label-name", "test-label");
         service1.getMetadata().setLabels(labels);
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
index 525d840a44..d424d629af 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -65,7 +65,7 @@ public class StatefulSetUtilsTest {
     @Test
     public void testNotFoundStatefulSet() {
         StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item();
         statefulSet.getMetadata().setName("test");
         mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace();
         assertEquals(Optional.empty(),
@@ -77,11 +77,11 @@ public class StatefulSetUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/example-statefulset-with-service");
 
         StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).item();
         mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).item();
         mockServer.getClient().resource(service).inNamespace(namespace).createOrReplace();
 
         Optional<String> url = discovery.query(kubeURI).map(URI::toString);
@@ -92,7 +92,7 @@ public class StatefulSetUtilsTest {
     public void testStatefulSetWithServiceWithCustomPortName() {
         var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/custom-port-statefulset?port-name=my-custom-port-stateful");
         StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset.yaml")).item();
         statefulSet.getMetadata().setName("custom-port-statefulset");
         statefulSet.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts()
                 .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build());
@@ -101,7 +101,7 @@ public class StatefulSetUtilsTest {
         mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace();
 
         Service service = mockServer.getClient().services().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-service.yaml")).item();
         service.getMetadata().setName("custom-port-name-service-statefulset");
         service.getSpec().getPorts().add(new ServicePortBuilder()
                 .withName("my-custom-port-stateful")
@@ -120,11 +120,11 @@ public class StatefulSetUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/process-quarkus-example-statefulset-no-service");
 
         StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item();
         StatefulSet createdDeployment = mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).item();
         pod.getMetadata().setName("pod-deployment-no-service");
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdDeployment.getMetadata().getUid());
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
@@ -138,13 +138,13 @@ public class StatefulSetUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/example-statefulset-no-service-2-replicas");
 
         StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item();
         statefulSet.getMetadata().setName("example-statefulset-no-service-2-replicas");
         statefulSet.getStatus().setReplicas(2);
         StatefulSet createdstatefulSet = mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).item();
         pod.getMetadata().setName("pod-2-replicas");
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdstatefulSet.getMetadata().getUid());
         mockServer.getClient().resource(pod).inNamespace(namespace).createOrReplace();
@@ -158,14 +158,14 @@ public class StatefulSetUtilsTest {
         var kubeURI = KubernetesResourceUri.parse("statefulsets.v1.apps/" + namespace + "/custom-port-statefulset-1?port-name=my-custom-port");
 
         StatefulSet statefulSet = mockServer.getClient().apps().statefulSets().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-no-service.yaml")).item();
         statefulSet.getMetadata().setName("custom-port-statefulset-1");
         statefulSet.getSpec().getTemplate().getSpec().getContainers().get(0).getPorts()
                 .add(new ContainerPortBuilder().withName("test-port").withContainerPort(4000).build());
         StatefulSet createdStatefulSet = mockServer.getClient().resource(statefulSet).inNamespace(namespace).createOrReplace();
 
         Pod pod = mockServer.getClient().pods().inNamespace(namespace)
-                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).get();
+                .load(this.getClass().getClassLoader().getResourceAsStream("statefulset/statefulset-pod-no-service.yaml")).item();
         pod.getMetadata().getOwnerReferences().get(0).setUid(createdStatefulSet.getMetadata().getUid());
         pod.getSpec().getContainers().get(0).getPorts()
                 .add(new ContainerPortBuilder()
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java
index 24dd54b94b..4ab6754563 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/src/main/java/org/kie/kogito/addons/quarkus/k8s/test/utils/KnativeResourceDiscoveryTestUtil.java
@@ -41,7 +41,7 @@ public final class KnativeResourceDiscoveryTestUtil {
             Service service = knativeClient.services()
                     .inNamespace(namespace)
                     .load(getResourceAsStream(knativeYaml))
-                    .get();
+                    .item();
 
             if (remoteServiceUrl != null) {
                 service.getStatus().setUrl(remoteServiceUrl);
diff --git a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
index 2d07f598e0..22fa2c4b4c 100644
--- a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
+++ b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.jobs.quarkus.common;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.jobs.api.JobCallbackPayload;
diff --git a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
index 0ba367524d..e65c671c84 100644
--- a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
+++ b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.quarkus.common;
 
 import java.util.Optional;
 
-import javax.enterprise.inject.Instance;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.inject.Instance;
+import jakarta.ws.rs.core.Response;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,9 +38,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
-import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static javax.ws.rs.core.Response.Status.OK;
+import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
+import static jakarta.ws.rs.core.Response.Status.NOT_FOUND;
+import static jakarta.ws.rs.core.Response.Status.OK;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
index ef684cd973..d566bd35fa 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
+++ b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
@@ -102,7 +102,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
index d11d0b35c7..07796c390f 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
+++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.knative.eventing.quarkus;
 
 import java.net.URI;
 
-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.eclipse.microprofile.reactive.messaging.Channel;
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 071e2f5377..80fce6516c 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - bpmn
     - jobs
   # TODO: add processes guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
index 74bd0c9b92..c37446e07e 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
+++ b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
@@ -22,7 +22,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Optional;
 
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.eclipse.microprofile.reactive.messaging.Emitter;
 import org.eclipse.microprofile.reactive.messaging.Message;
diff --git a/quarkus/addons/jobs/management/runtime/pom.xml b/quarkus/addons/jobs/management/runtime/pom.xml
index 6f3f9015b5..9155985449 100644
--- a/quarkus/addons/jobs/management/runtime/pom.xml
+++ b/quarkus/addons/jobs/management/runtime/pom.xml
@@ -110,7 +110,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
index 6b14088785..7216595018 100644
--- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
+++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.jobs.management.quarkus;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
index fe8625f833..1dd1ffb971 100644
--- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
+++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
@@ -20,11 +20,11 @@ package org.kie.kogito.jobs.management.quarkus;
 
 import java.net.URI;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
 import org.kie.kogito.jobs.ProcessJobDescription;
diff --git a/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 4e59ee7787..a704a1a6b1 100644
--- a/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/jobs/management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - bpmn
     - jobs
   # TODO: add processes guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
index 09e8ba5335..8dd932b3b3 100644
--- a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
+++ b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.jobs.management.quarkus;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml b/quarkus/addons/jobs/messaging/runtime/pom.xml
index b6ac66d31f..b957a95bc3 100644
--- a/quarkus/addons/jobs/messaging/runtime/pom.xml
+++ b/quarkus/addons/jobs/messaging/runtime/pom.xml
@@ -107,7 +107,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
index 0a0c817288..75a64911a2 100644
--- a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
+++ b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.messaging.quarkus;
 
 import java.net.URI;
 
-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.eclipse.microprofile.reactive.messaging.Channel;
diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index e2b620104a..77e5874e8c 100644
--- a/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/jobs/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - bpmn
     - jobs
   # TODO: add processes guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java
index cd90244aa7..4b6a386a81 100644
--- a/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java
+++ b/quarkus/addons/knative/eventing/deployment/src/test/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoProcessKnativeEventingProcessorTest.java
@@ -36,6 +36,7 @@ import org.kie.kogito.event.cloudevents.CloudEventMeta;
 import org.kie.kogito.quarkus.extensions.spi.deployment.KogitoProcessContainerGeneratorBuildItem;
 
 import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.kubernetes.spi.DeployStrategy;
 import io.quarkus.kubernetes.spi.KubernetesDeploymentTargetBuildItem;
 import io.quarkus.kubernetes.spi.KubernetesResourceMetadataBuildItem;
 
@@ -108,7 +109,7 @@ class KogitoProcessKnativeEventingProcessorTest {
         final MockKogitoKnativeMetadataProducer metadata = new MockKogitoKnativeMetadataProducer();
         final KubernetesResourceMetadataBuildItem kubernetesResourceMetadataBuildItem = new KubernetesResourceMetadataBuildItem("kubernetes", "apps", "v1", "Deployment", "name");
         final List<KubernetesResourceMetadataBuildItem> kubernetesMetaBuildItems = singletonList(kubernetesResourceMetadataBuildItem);
-        final List<KubernetesDeploymentTargetBuildItem> deploymentTargets = singletonList(new KubernetesDeploymentTargetBuildItem("kubernetes", "Deployment", "apps", "v1"));
+        final List<KubernetesDeploymentTargetBuildItem> deploymentTargets = singletonList(new KubernetesDeploymentTargetBuildItem("kubernetes", "Deployment", "apps", "v1", DeployStrategy.CreateOrUpdate));
         final List<KogitoCloudEventsBuildItem> extendedCloudEventsBuildItems = singletonList(new KogitoCloudEventsBuildItem(Set.of(EXTENDED_CLOUD_EVENT1, EXTENDED_CLOUD_EVENT2)));
 
         doCallRealMethod().when(processor).buildMetadata(singletonList(containerGeneratorBuildItem), extendedCloudEventsBuildItems, deploymentTargets, kubernetesMetaBuildItems, metadata);
diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml
index 0cd47c2bb5..35d4471ec1 100644
--- a/quarkus/addons/knative/eventing/runtime/pom.xml
+++ b/quarkus/addons/knative/eventing/runtime/pom.xml
@@ -74,7 +74,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
index 93acac0969..61ab1bee5a 100644
--- a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
+++ b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
@@ -23,7 +23,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 40f07b8d82..dcd7331c70 100644
--- a/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/knative/eventing/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -32,6 +32,6 @@ metadata:
     - eventing
     - cloudevents
   # TODO: add processes guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml
index ada7a01fd7..f2aa7bc834 100644
--- a/quarkus/addons/knative/serving/runtime/pom.xml
+++ b/quarkus/addons/knative/serving/runtime/pom.xml
@@ -114,7 +114,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
index c42d2dccf5..71f9b5abc4 100644
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
 @ApplicationScoped
diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
index 4a9a4e9c8e..9a3b12dbf0 100644
--- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
+++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
 
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 import org.kogito.workitem.rest.RestWorkItemHandlerUtils;
diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
index e2ac72eb39..dfa401d862 100644
--- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
+++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
 
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import io.vertx.ext.web.client.WebClientOptions;
 import io.vertx.mutiny.core.Vertx;
diff --git a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
index 48771f86d1..84fa677456 100644
--- a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
+++ b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.addons.quarkus.kubernetes;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
diff --git a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
index b9f49ef000..ddc14ab45d 100644
--- a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
+++ b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.addons.quarkus.kubernetes;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
diff --git a/quarkus/addons/kubernetes/runtime/pom.xml b/quarkus/addons/kubernetes/runtime/pom.xml
index 5a8d6944e1..879c831226 100644
--- a/quarkus/addons/kubernetes/runtime/pom.xml
+++ b/quarkus/addons/kubernetes/runtime/pom.xml
@@ -95,7 +95,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
index 8f60636c4a..3260bfb14b 100644
--- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
+++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.addons.quarkus.k8s;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.kie.kogito.addons.k8s.EndpointDiscovery;
 import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller;
diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
index 631a72cb34..ec3a3050fd 100644
--- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
+++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.addons.quarkus.k8s;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import org.kie.kogito.addons.k8s.KnativeRouteEndpointDiscovery;
 import org.kie.kogito.addons.k8s.KubernetesServiceEndpointDiscovery;
diff --git a/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 912df0b51a..9f6021ed24 100644
--- a/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/kubernetes/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,6 +24,6 @@ metadata:
     - kogito
     - kubernetes
     - knative
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
index 3bc6ad7928..e3979a210a 100644
--- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
+++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
index 901f7dfe31..9ccb178844 100644
--- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
+++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.addons.k8s.Endpoint;
diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
index 90d5fd773e..291f36b1d9 100644
--- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
+++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.addons.quarkus.k8s.config;
 
 import java.net.URI;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/mail/runtime/pom.xml b/quarkus/addons/mail/runtime/pom.xml
index 02b09d26b6..b7b57a6eea 100644
--- a/quarkus/addons/mail/runtime/pom.xml
+++ b/quarkus/addons/mail/runtime/pom.xml
@@ -61,7 +61,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
index 90af309c9a..f776accfdd 100644
--- a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
+++ b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
@@ -20,8 +20,8 @@ package org.kie.kogito.mail;
 
 import java.util.Arrays;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
diff --git a/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 16454fefe6..905a0af7c8 100644
--- a/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/mail/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -28,6 +28,6 @@ metadata:
     - tasks
     - notification
   # TODO: add processes guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
index 0489f1ed11..8b6d4e02e8 100644
--- a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
+++ b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml b/quarkus/addons/marshallers/avro/runtime/pom.xml
index 8ad177a492..fe6df4d7bb 100644
--- a/quarkus/addons/marshallers/avro/runtime/pom.xml
+++ b/quarkus/addons/marshallers/avro/runtime/pom.xml
@@ -47,7 +47,7 @@
     <plugins>
        <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/messaging/common/pom.xml b/quarkus/addons/messaging/common/pom.xml
index cc6eceebcf..7d1b36efd6 100644
--- a/quarkus/addons/messaging/common/pom.xml
+++ b/quarkus/addons/messaging/common/pom.xml
@@ -65,8 +65,8 @@
       <artifactId>quarkus-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
index 8202f616cc..31890f8776 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
@@ -23,7 +23,7 @@ import java.io.UncheckedIOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
index e0673dc70f..a3ee7b4f1e 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import io.vertx.core.impl.ConcurrentHashSet;
 
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
index de9571dce8..a8ff460ec6 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.slf4j.Logger;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java
index 2b4930eab7..52912375ef 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
index 6f57ee50c8..e7a795bf2a 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.event.CloudEventMarshaller;
 import org.kie.kogito.event.EventMarshaller;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
index b5c2849f46..5dfaa6901c 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
 import org.kie.kogito.event.EventUnmarshaller;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
index d523329561..9e19b484f2 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
@@ -20,8 +20,8 @@ package org.kie.kogito.addon.quarkus.messaging.common;
 
 import java.util.concurrent.ExecutorService;
 
-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.event.EventExecutorServiceFactory;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
index 2d5691cea4..48d018ba79 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.event.cloudevents.extension.KogitoExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
index ed9e3b9d78..b0867bc46a 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addon.quarkus.messaging.common;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.Model;
@@ -49,7 +49,7 @@ public abstract class QuarkusMessageConsumer<M extends Model, D> extends Abstrac
         init(application, process, trigger, eventReceiver, objectClass, processService, executor, correlation);
     }
 
-    @javax.annotation.PreDestroy
+    @jakarta.annotation.PreDestroy
     public void close() {
         executor.shutdownNow();
     }
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
index 7bf474983f..17076ecabd 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import javax.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
+import jakarta.annotation.Priority;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.kie.kogito.addon.cloudevents.AbstractTopicDiscovery;
 import org.kie.kogito.event.ChannelType;
diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
index 04e400127a..98249088ef 100644
--- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
@@ -18,15 +18,15 @@
  */
 package org.kie.kogito.addon.quarkus.messaging.common;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.addon.cloudevents.AbstractTopicsInformationResource;
 import org.kie.kogito.event.TopicDiscovery;
 import org.kie.kogito.event.cloudevents.CloudEventMeta;
@@ -48,7 +48,7 @@ public class QuarkusTopicsInformationResource extends AbstractTopicsInformationR
 
     @GET()
     @Produces(MediaType.APPLICATION_JSON)
-    public javax.ws.rs.core.Response getTopics() {
-        return javax.ws.rs.core.Response.ok(getTopicList()).build();
+    public jakarta.ws.rs.core.Response getTopics() {
+        return jakarta.ws.rs.core.Response.ok(getTopicList()).build();
     }
 }
diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java
index 9231080865..5e181d11e1 100644
--- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java
+++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
index c327facbc7..011ab2fcee 100644
--- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
+++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
@@ -19,9 +19,9 @@
 package $Package$;
 
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
index d08fb836f3..4cd5056c5b 100644
--- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
+++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
@@ -21,12 +21,12 @@ package $Package$;
 
 import java.util.concurrent.CompletionStage;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.reactive.messaging.Incoming;
 import org.eclipse.microprofile.reactive.messaging.Message;
-import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver ;
+import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
 
 
 import io.quarkus.runtime.Startup;
diff --git a/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java b/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java
index 14d46b5b91..b94a5f8328 100644
--- a/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java
+++ b/quarkus/addons/messaging/integration-tests/src/main/java/org/kie/kogito/integrationtests/QuarkusCloudEventResource.java
@@ -21,8 +21,8 @@ package org.kie.kogito.integrationtests;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.addon.quarkus.messaging.common.http.AbstractQuarkusCloudEventResource;
 
diff --git a/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java b/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java
index b1d40477a6..be9427a30a 100644
--- a/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java
+++ b/quarkus/addons/messaging/integration-tests/src/test/java/org/kie/kogito/integrationtests/QuarkusCloudEventResourceIT.java
@@ -25,9 +25,9 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/messaging/runtime/pom.xml b/quarkus/addons/messaging/runtime/pom.xml
index 5e5774200d..c5fb3af1f8 100644
--- a/quarkus/addons/messaging/runtime/pom.xml
+++ b/quarkus/addons/messaging/runtime/pom.xml
@@ -72,7 +72,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
index fb1acfc266..16474d1f42 100644
--- a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
+++ b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.addon.messaging;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
 import org.kie.kogito.config.ConfigBean;
diff --git a/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 41b303bc77..d40ea9bd41 100644
--- a/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/messaging/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -27,6 +27,6 @@ metadata:
     - cloudevents
     - bpmn
   # TODO: add processes guide
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
index d0fbd43584..6f268d4ba5 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
@@ -67,7 +67,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
index 362a3fcd16..ff698f32f0 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
 import java.net.URI;
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
index cd8ec75380..08c6e2e0d5 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
 
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
index 84c7a85d72..9654aec7f3 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.monitoring.core.quarkus;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
index ca00b36ca0..0ed27048e7 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.monitoring.core.quarkus;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.container.DynamicFeature;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.FeatureContext;
-import javax.ws.rs.ext.Provider;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.container.DynamicFeature;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.FeatureContext;
+import jakarta.ws.rs.ext.Provider;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.KogitoGAV;
@@ -39,7 +39,7 @@ public class QuarkusMetricsFilterRegister implements DynamicFeature {
 
     // Indirect Instance<Boolean> to solve warning message during compilation:
     // WARNING Directly injecting a @ConfigProperty into a JAX-RS provider may lead to unexpected results.
-    // To ensure proper results, please change the type of the field to javax.enterprise.inject.Instance<Boolean>.
+    // To ensure proper results, please change the type of the field to jakarta.enterprise.inject.Instance<Boolean>.
     @ConfigProperty(name = Constants.HTTP_INTERCEPTOR_USE_DEFAULT, defaultValue = "true")
     Instance<Boolean> httpInterceptorUseDefault;
 
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
index 66bfaab7e6..1501904a6e 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
@@ -20,9 +20,9 @@ package org.kie.kogito.monitoring.core.quarkus;
 
 import java.util.List;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
 
 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
 
diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
index 9b4e4c7ab7..c87d17e8fd 100644
--- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
+++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.monitoring.core.quarkus;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector;
diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
index 56c7d8c796..cc74d0bb0d 100644
--- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
+++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.core.quarkus;
 
 import java.util.List;
 
-import javax.enterprise.inject.Instance;
-import javax.ws.rs.core.FeatureContext;
+import jakarta.enterprise.inject.Instance;
+import jakarta.ws.rs.core.FeatureContext;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.monitoring.core.common.mock.MockedConfigBean;
diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
index 4e8be58a22..87b6340558 100644
--- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
+++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
@@ -22,10 +22,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerResponseContext;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml b/quarkus/addons/monitoring/elastic/runtime/pom.xml
index 191e6eb530..45bafdfa20 100644
--- a/quarkus/addons/monitoring/elastic/runtime/pom.xml
+++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml
@@ -52,7 +52,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
index 9d2dca4a9d..af3679c91e 100644
--- a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
+++ b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.elastic.quarkus;
 
 import java.util.Optional;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Singleton;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Singleton;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory;
diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index d10b7225b1..b360bc8d26 100644
--- a/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/monitoring/elastic/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,6 +24,6 @@ metadata:
     - kogito
     - elasticsearch
     - monitoring
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
index dce794681b..bba6028337 100644
--- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml
+++ b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
@@ -73,7 +73,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 3560af68b0..d56014af7e 100644
--- a/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/monitoring/prometheus/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,6 +24,6 @@ metadata:
     - kogito
     - prometheus
     - monitoring
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml b/quarkus/addons/persistence/filesystem/runtime/pom.xml
index ae1beb5271..4ad157edc4 100644
--- a/quarkus/addons/persistence/filesystem/runtime/pom.xml
+++ b/quarkus/addons/persistence/filesystem/runtime/pom.xml
@@ -62,7 +62,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
index 254319bd4a..49ebd0dd73 100644
--- a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-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.persistence.filesystem.AbstractProcessInstancesFactory;
diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f4c2d92e92..29eaf1bdac 100644
--- a/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/filesystem/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - filesystem
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
index e7a94178fa..1a3eb9199c 100644
--- a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
+++ b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
@@ -24,7 +24,7 @@ import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import javax.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Instance;
 
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
diff --git a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
index d8a82321c5..460341686d 100644
--- a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
+++ b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.infinispan.health;
 
-import javax.annotation.Resource;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.Resource;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml
index 37dc06d077..505fcc4ed3 100644
--- a/quarkus/addons/persistence/infinispan/runtime/pom.xml
+++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml
@@ -62,7 +62,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
index 4442674234..222d287c54 100644
--- a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.quarkus;
 
 import java.util.Optional;
 
-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.infinispan.client.hotrod.RemoteCacheManager;
diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 48fc61d4d1..ccfa367325 100644
--- a/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/infinispan/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - infinispan
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml b/quarkus/addons/persistence/jdbc/runtime/pom.xml
index 662f3f4226..c5769eb598 100644
--- a/quarkus/addons/persistence/jdbc/runtime/pom.xml
+++ b/quarkus/addons/persistence/jdbc/runtime/pom.xml
@@ -76,7 +76,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
index 6cf9776ceb..384eb6ac09 100644
--- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import javax.sql.DataSource;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
index a4aefa406b..b73095c95d 100644
--- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
+++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.quarkus;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 import javax.sql.DataSource;
 
 import org.kie.kogito.correlation.CorrelationService;
diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f24f7e367d..ceac5c3c3e 100644
--- a/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/jdbc/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - jdbc
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/kafka/runtime/pom.xml b/quarkus/addons/persistence/kafka/runtime/pom.xml
index 796a2bf0e4..57e3a66e61 100644
--- a/quarkus/addons/persistence/kafka/runtime/pom.xml
+++ b/quarkus/addons/persistence/kafka/runtime/pom.xml
@@ -121,7 +121,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
index b5be2b3d0e..d5bf80a692 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
@@ -20,10 +20,10 @@ package org.kie.kogito.persistence;
 
 import java.util.Map;
 
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PreDestroy;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.kafka.common.serialization.StringSerializer;
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
index 1001f512a9..052f652d7b 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
@@ -22,10 +22,10 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PreDestroy;
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StoreQueryParameters;
 import org.apache.kafka.streams.state.QueryableStoreTypes;
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
index 11b87ac30e..a4710f9471 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.persistence.kafka;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.kafka.streams.Topology;
 
diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index d4e8f732a3..1486e40cac 100644
--- a/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/kafka/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - kafka
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml b/quarkus/addons/persistence/mongodb/runtime/pom.xml
index df3c14557e..e6f069ff88 100644
--- a/quarkus/addons/persistence/mongodb/runtime/pom.xml
+++ b/quarkus/addons/persistence/mongodb/runtime/pom.xml
@@ -66,7 +66,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
index 5a4ab35c7d..43b005f712 100644
--- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-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.mongodb.AbstractProcessInstancesFactory;
diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
index d237aaf1da..0979fa9f36 100644
--- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
+++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-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.mongodb.transaction.AbstractTransactionManager;
diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f5187e3bdd..8e637f0b08 100644
--- a/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/mongodb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - mongodb
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml
index 692796ad39..d4e79ec6cc 100644
--- a/quarkus/addons/persistence/postgresql/runtime/pom.xml
+++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml
@@ -75,7 +75,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
index 042466ddf8..b0688f0402 100644
--- a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
+++ b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.persistence.quarkus;
 
-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.persistence.postgresql.AbstractProcessInstancesFactory;
diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index af868f862a..eccc373586 100644
--- a/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/postgresql/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - postgresql
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
index 8b9c28b96c..9c2c05ee4a 100644
--- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml
+++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
@@ -61,7 +61,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
index 4cd5e21188..0b9c49ae20 100644
--- a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
+++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.persistence.quarkus.rocksdb;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.kie.kogito.persistence.rocksdb.RocksDBProcessInstancesFactory;
 import org.kie.kogito.process.ProcessInstancesFactory;
 import org.rocksdb.Options;
diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 2221e259d2..a8d9cc40df 100644
--- a/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - persistence
     - rocksdb
     - process
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
index b2cc040a5c..84dd1d05b3 100644
--- a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
+++ b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
@@ -18,20 +18,20 @@
  */
 package org.kie.kogito.process.definitions;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.io.StringReader;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.process.ProcessInstancesFactory;
 import org.kie.kogito.serverless.workflow.executor.StaticWorkflowApplication;
diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml
index 56b200c8af..dc151b4067 100644
--- a/quarkus/addons/process-management/runtime/pom.xml
+++ b/quarkus/addons/process-management/runtime/pom.xml
@@ -80,9 +80,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
       <scope>test</scope>
+      <version>4.0.1</version>
     </dependency>
   </dependencies>
 
@@ -90,7 +91,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
index a8c0ffd9af..fd71154a44 100644
--- a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
+++ b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
@@ -18,17 +18,17 @@
  */
 package org.kie.kogito.process.management;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.process.Processes;
diff --git a/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f96e95bbdc..4e3547d219 100644
--- a/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/process-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,6 +24,6 @@ metadata:
     - kogito
     - process
     - management
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
index 7db5f82d61..9a1f266bcb 100644
--- a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
+++ b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
@@ -20,12 +20,12 @@ package org.kie.kogito.process.management;
 
 import java.util.Optional;
 
-import javax.enterprise.inject.Instance;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.StatusType;
-import javax.ws.rs.ext.RuntimeDelegate;
+import jakarta.enterprise.inject.Instance;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.StatusType;
+import jakarta.ws.rs.ext.RuntimeDelegate;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/quarkus/addons/process-svg/runtime/pom.xml b/quarkus/addons/process-svg/runtime/pom.xml
index 5a8dec89b9..b4453e7870 100644
--- a/quarkus/addons/process-svg/runtime/pom.xml
+++ b/quarkus/addons/process-svg/runtime/pom.xml
@@ -38,8 +38,8 @@
       <artifactId>kogito-addons-process-svg</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.spec.javax.ws.rs</groupId>
-      <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+      <groupId>jakarta.ws.rs</groupId>
+      <artifactId>jakarta.ws.rs-api</artifactId>
     </dependency>
 
     <dependency>
@@ -93,7 +93,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
index e5763343ce..1d476c8628 100644
--- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
+++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
@@ -23,10 +23,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.svg.ProcessSVGException;
 import org.slf4j.Logger;
diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
index 31e75cd256..c18ee17d72 100644
--- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
+++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
@@ -20,15 +20,15 @@ package org.kie.kogito.svg.rest;
 
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.svg.ProcessSvgService;
 
diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
index a648a30cd3..05618b33e1 100644
--- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
+++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
@@ -20,8 +20,8 @@ package org.kie.kogito.svg.service;
 
 import java.util.Optional;
 
-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.svg.AbstractProcessSvgService;
diff --git a/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index f8592c6ddd..51948695a1 100644
--- a/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/process-svg/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,6 +24,6 @@ metadata:
     - kogito
     - process
     - svg
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
index f32843b94b..cfc673a546 100644
--- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
+++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.quarkus.serverless.workflow.python;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
 import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml
index 12b7491c88..a1f2e51083 100644
--- a/quarkus/addons/rest-exception-handler/pom.xml
+++ b/quarkus/addons/rest-exception-handler/pom.xml
@@ -42,8 +42,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -67,9 +67,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
       <scope>test</scope>
+      <version>4.0.1</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java
index febb17b17d..21b70e76d7 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 public abstract class BaseExceptionMapper<E extends Throwable> implements ExceptionMapper<E> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java
index cdff6f06a0..ec1bd6679d 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 public class ExceptionsHandler extends BaseExceptionsHandler<Response> {
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java
index 92199a0057..56a734a511 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 @Provider
 public class IllegalArgumentExceptionMapper extends BaseExceptionMapper<IllegalArgumentException> {
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
index 8ff7cbe62f..976baa4bfc 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.workitem.InvalidLifeCyclePhaseException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
index 209d2207db..ef21f6b61b 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.workitem.InvalidTransitionException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
index be499edcf0..f1f131945e 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.NodeInstanceNotFoundException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
index 539aa490e7..4ac3965b2c 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.NodeNotFoundException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
index d12161df80..29e5056652 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.workitem.NotAuthorizedException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
index 02ab996453..59bec8b102 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.ProcessInstanceDuplicatedException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
index 895f9db741..4d450420eb 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.ProcessInstanceExecutionException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
index 7bbbaeee51..27391a3a31 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.ProcessInstanceNotFoundException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
index ba6b6318b8..ce80911352 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.VariableViolationException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
index 73bdac8cc7..201c6180cc 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.process.workitem.WorkItemExecutionException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
index 53b26200d0..0b0f3ff03a 100644
--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
+++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
 
 import org.kie.kogito.internal.process.runtime.WorkItemNotFoundException;
 
diff --git a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
index 15369715df..ce16cc01af 100644
--- a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
+++ b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.resource.exceptions;
 
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.RuntimeDelegate;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.RuntimeDelegate;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/source-files/runtime/pom.xml b/quarkus/addons/source-files/runtime/pom.xml
index be08c219f5..fa74154832 100644
--- a/quarkus/addons/source-files/runtime/pom.xml
+++ b/quarkus/addons/source-files/runtime/pom.xml
@@ -123,7 +123,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java
index ef53747f28..dc4ac4d01d 100644
--- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java
+++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.addon.source.files;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.Produces;
 
 @ApplicationScoped
 public final class SourceFilesProviderProducer {
diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
index b8d60de991..8866e3c887 100644
--- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
+++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.addon.source.files;
 
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDI;
 
 import io.quarkus.runtime.annotations.Recorder;
 
diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
index ab48413783..da618e2728 100644
--- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
+++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
@@ -23,15 +23,15 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.resource.exceptions.ExceptionsHandler;
 
diff --git a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
index 926b5b0d79..82414cb6ea 100644
--- a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
+++ b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.addon.source.files;
 
 import java.util.Optional;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/addons/task-management/runtime/pom.xml b/quarkus/addons/task-management/runtime/pom.xml
index 8b32acf4d6..bf82ce020e 100644
--- a/quarkus/addons/task-management/runtime/pom.xml
+++ b/quarkus/addons/task-management/runtime/pom.xml
@@ -81,7 +81,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
index d3b7f7fec6..624c19a504 100644
--- a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
+++ b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
@@ -18,20 +18,20 @@
  */
 package org.kie.kogito.task.management;
 
+import jakarta.annotation.PostConstruct;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PATCH;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PATCH;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.process.ProcessConfig;
 import org.kie.kogito.process.Processes;
diff --git a/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 50cca8ba42..0e849e5d10 100644
--- a/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/task-management/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -24,6 +24,6 @@ metadata:
     - kogito
     - process
     - task
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/task-notification/runtime/pom.xml b/quarkus/addons/task-notification/runtime/pom.xml
index 742c89aa44..dac5a7dc64 100644
--- a/quarkus/addons/task-notification/runtime/pom.xml
+++ b/quarkus/addons/task-notification/runtime/pom.xml
@@ -83,7 +83,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
index 774aa066f5..287af70636 100644
--- a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
+++ b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
@@ -20,8 +20,8 @@ package org.kie.kogito.task.notification.quarkus;
 
 import java.util.Collection;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
diff --git a/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index da2d590f4e..c8b51f5db7 100644
--- a/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/task-notification/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -26,6 +26,6 @@ metadata:
     - task
     - notification
     - BPMN
-  guide: https://quarkus.io/version/2.13/guides/kogito
+  guide: https://quarkus.io/guides/kogito
   categories:
     - "business-automation"
diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml
index 98b4ff95bf..1b545bebf6 100644
--- a/quarkus/addons/tracing-decision/runtime/pom.xml
+++ b/quarkus/addons/tracing-decision/runtime/pom.xml
@@ -104,7 +104,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
index 1d64d0f96e..20d98853d7 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
@@ -20,8 +20,8 @@ package org.kie.kogito.tracing.decision;
 
 import java.util.function.BiFunction;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.config.ConfigBean;
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
index c6a39d43bd..586cd9df64 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.tracing.decision;
 
-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;
 
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
index fb09ff6065..7f071d497c 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
@@ -18,12 +18,13 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
+import java.util.concurrent.Flow.Publisher;
 
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 import org.kie.kogito.decision.DecisionModelResourcesProvider;
-import org.reactivestreams.Publisher;
 
 import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor;
 
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
index c836b2d634..12d3750759 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
index ddad3bd54e..32c240f73c 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
+++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
@@ -18,11 +18,12 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
+
+import java.util.concurrent.Flow.Publisher;
 
 import org.eclipse.microprofile.reactive.messaging.Outgoing;
 import org.kie.kogito.tracing.EventEmitter;
-import org.reactivestreams.Publisher;
 
 import io.smallrye.mutiny.operators.multi.processors.BroadcastProcessor;
 
diff --git a/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml
index 0cc743e61b..ff94a8481e 100644
--- a/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/addons/tracing-decision/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
     - decisions
     - dmn
     - tracing
-  guide: https://quarkus.io/version/2.13/guides/kogito-dmn
+  guide: https://quarkus.io/guides/kogito-dmn
   categories:
     - "business-automation"
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
index 547c7ff509..86ce83223a 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
@@ -20,12 +20,12 @@ package org.kie.kogito.quarkus.dmn;
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.kogito.incubation.application.AppRoot;
 import org.kie.kogito.incubation.common.DataContext;
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml
index fe43491fb1..8b3e9445b5 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml
@@ -90,7 +90,7 @@
             </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md
index 277cfe3139..55f69a9b87 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/base/README.tpl.qute.md
@@ -1,7 +1,7 @@
 {#include readme-header /}
 
-This Kogito DMN Quarkus codestart contains a sample DMN model as described in the [Quarkus Kogito DMN guide](https://quarkus.io/version/2.13/guides/kogito-dmn).
+This Kogito DMN Quarkus codestart contains a sample DMN model as described in the [Quarkus Kogito DMN guide](https://quarkus.io/guides/kogito-dmn).
 The goal is to showcase automatic REST endpoint codegen, based on the content of the model.
 The `pricing.dmn` DMN model calculates a base price quotation based on some criteria provided as input.
 
-You can reference the [full guide on the Quarkus website](https://quarkus.io/version/2.13/guides/kogito-dmn).
+You can reference the [full guide on the Quarkus website](https://quarkus.io/guides/kogito-dmn).
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml
index 8abb1a555e..8b7e8dd93c 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/codestarts/quarkus/kogito-dmn-codestart/codestart.yml
@@ -24,7 +24,7 @@ tags: extension-codestart
 metadata:
   title: Kogito DMN codestart
   description: This is an example Kogito DMN Quarkus codestart, it contains a sample DMN model for REST code generation based on the model definition.
-  related-guide-section: https://quarkus.io/version/2.13/guides/kogito-dmn
+  related-guide-section: https://quarkus.io/guides/kogito-dmn
 language:
   base:
     test-dependencies:
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
index dc27f3b512..0880e67b40 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.core.decision.incubation.quarkus.support;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.incubation.decisions.DecisionIds;
 
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
index 4df9c6face..5955532e49 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.core.decision.incubation.quarkus.support;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.decision.DecisionModels;
 import org.kie.kogito.incubation.common.DataContext;
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml
index 64fde5ebe6..f0b3620a36 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,7 +25,7 @@ metadata:
   - "drools"
   - "decisions"
   - "DMN"
-  guide: "https://quarkus.io/version/2.13/guides/kogito-dmn"
+  guide: "https://quarkus.io/guides/kogito-dmn"
   categories:
   - "business-automation"
   codestart:
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
index 74c5c39f45..ac27b0fac9 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
@@ -31,8 +31,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.drools.codegen.common.DroolsModelBuildContext;
 import org.drools.codegen.common.GeneratedFile;
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
index b7353762b0..751caf201e 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
@@ -95,7 +95,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
             </plugin>
             <plugin>
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
index 8fb4babbf4..5ec28db8f0 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
@@ -22,10 +22,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.control.ActivateRequestContext;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.auth.IdentityProvider;
 
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
index f928cb9a56..24be9f3449 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
@@ -20,9 +20,9 @@ package org.kie.kogito.quarkus.config;
 
 import java.util.Optional;
 
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.StaticConfigBean;
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
index 4ec977733a..0a03ee61e8 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.quarkus.registry;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.process.Processes;
diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
index 4d18223a60..9d3e90724f 100644
--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
+++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.quarkus.runtime;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import io.quarkus.arc.DefaultBean;
 import io.vertx.ext.web.client.WebClientOptions;
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java
index 3fb44ee20c..2e0a9279f2 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java
@@ -18,11 +18,11 @@
  */
 package control;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.UUID;
 
 @Path("/control")
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java
index 3fb44ee20c..2e0a9279f2 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java
@@ -18,11 +18,11 @@
  */
 package control;
 
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.UUID;
 
 @Path("/control")
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java
index cb8d547dba..2d90b5f644 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java
@@ -21,7 +21,7 @@ package io.quarkus.it.kogito.jbpm;
 import java.security.SecureRandom;
 import java.util.Random;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class CalculationService {
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
index 1d5033a13c..c12bae9814 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
@@ -21,8 +21,8 @@ package org.kie.kogito.quarkus.jbpm;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.Model;
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
index bd42c3e73b..357b8df343 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
@@ -70,7 +70,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml
index 39edd05f17..fafe7f5551 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/src/main/resources/META-INF/quarkus-extension.yaml
@@ -28,6 +28,6 @@ metadata:
   - "rules"
   - "decisions"
   - "DMN"
-  guide: "https://quarkus.io/version/2.13/guides/kogito"
+  guide: "https://quarkus.io/guides/kogito"
   categories:
   - "business-automation"
diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
index 6d4ee21f09..9cd782e06d 100644
--- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
+++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
@@ -18,9 +18,9 @@
  */
 package org.kie.kogito.incubation.application.quarkus;
 
-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.incubation.application.AppRoot;
 import org.kie.kogito.incubation.common.ComponentRoot;
diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
index ca4a9c9527..1145293a40 100644
--- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
+++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
@@ -20,7 +20,7 @@ package org.kie.kogito.incubation.common.objectmapper.quarkus;
 
 import java.util.Map;
 
-import javax.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.CDI;
 
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
index 4ab172fe53..904bb0f277 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
@@ -20,12 +20,12 @@ package org.kie.kogito.quarkus.pmml;
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.kogito.incubation.application.AppRoot;
 import org.kie.kogito.incubation.common.DataContext;
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
index ee2a675854..a0e1e88ab6 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
@@ -62,7 +62,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
index b3e0792efa..bdea4a5b87 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.core.prediction.incubation.quarkus.support;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.incubation.predictions.PredictionIds;
 
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
index ed5b13d980..c2c727b1f3 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.core.prediction.incubation.quarkus.support;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml
index 4a84139fc3..bacc5000fa 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
   - "drools"
   - "predictions"
   - "PMML"
-  guide: "https://quarkus.io/version/2.13/guides/kogito-pmml"
+  guide: "https://quarkus.io/guides/kogito-pmml"
   categories:
   - "business-automation"
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java
index 41d5b44612..4b3aad3e64 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java
@@ -18,7 +18,7 @@
  */
 package io.quarkus.it.kogito.process;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * HotReloadTestHelper
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
index 608707a960..6b0f0863ce 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
@@ -20,15 +20,15 @@ package org.acme;
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.Model;
 import org.kie.kogito.incubation.application.AppRoot;
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
index 3af88368d9..f0c911c32d 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
@@ -21,7 +21,7 @@ package org.acme;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.incubation.application.AppRoot;
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml
index ca1a41e505..569fdcb392 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml
@@ -60,7 +60,7 @@
     <plugins>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
index 041d0992e5..e50d19ccd6 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.kie.kogito.Application;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
index 7ea23a236f..dac1728920 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.incubation.processes.ProcessIds;
 
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
index 2e40f0f880..0e2d7dff0d 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.kie.kogito.Application;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
index 3f009c5579..0875bfbc3c 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.core.process.incubation.quarkus.support;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.Id;
 import org.kie.kogito.incubation.processes.services.StraightThroughProcessService;
diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml
index 7b934adb58..c965648c3d 100644
--- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/resources/META-INF/quarkus-extension.yaml
@@ -27,6 +27,6 @@ metadata:
   - "bpm"
   - "bpmn"
   - "BPMN2"
-  guide: "https://quarkus.io/version/2.13/guides/kogito"
+  guide: "https://quarkus.io/guides/kogito"
   categories:
   - "business-automation"
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
index 66a42383c3..5ab246a52d 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.quarkus.drools;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.drools.ruleunits.api.DataStore;
 import org.drools.ruleunits.api.RuleUnitData;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
index c249f1faf0..a6d15cf7e8 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
@@ -21,12 +21,12 @@ package org.kie.kogito.quarkus.drools;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 import org.kie.kogito.incubation.application.AppRoot;
 import org.kie.kogito.incubation.common.DataContext;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
index 21ea877b5d..3673790aad 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.quarkus.drools;
 
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.incubation.common.EmptyDataContext;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
index a9e445e1b8..6b273c673e 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.drools.ruleunits.api.DataSource;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml
index 7f8290145d..ebdc6a35f5 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml
@@ -65,7 +65,7 @@
         <plugins>
             <plugin>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+                <artifactId>quarkus-extension-maven-plugin</artifactId>
                 <version>${version.io.quarkus}</version>
                 <executions>
                     <execution>
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
index 20991fef11..50c0b4724a 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.drools.ruleunits.api.DataSource;
 import org.drools.ruleunits.api.DataStore;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
index d4e780492e..d5cc44b16e 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.LocalId;
 import org.kie.kogito.incubation.rules.data.DataId;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
index 8fd6c24146..6ec9b87446 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.incubation.rules.RuleUnitIds;
 
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
index 80368286a2..5fe045b532 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
@@ -20,11 +20,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
 
 import java.util.stream.Stream;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.drools.ruleunits.api.RuleUnits;
 import org.kie.kogito.incubation.common.DataContext;
 import org.kie.kogito.incubation.common.Id;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
index 842cb11c73..0019bdad1e 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
@@ -20,11 +20,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
 
 import java.util.stream.Stream;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.kie.kogito.incubation.common.ExtendedDataContext;
 import org.kie.kogito.incubation.common.ExtendedReferenceContext;
 import org.kie.kogito.incubation.common.LocalId;
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
index e5bb3dd487..05071bef84 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.core.rules.incubation.quarkus.support;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml
index f38dab6280..70d98bba1d 100644
--- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/resources/META-INF/quarkus-extension.yaml
@@ -25,6 +25,6 @@ metadata:
   - "drools"
   - "rules"
   - "DRL"
-  guide: "https://quarkus.io/version/2.13/guides/kogito-drl"
+  guide: "https://quarkus.io/guides/kogito-drl"
   categories:
   - "business-automation"
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
index 73f2ecc13b..8a7edf8736 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
@@ -27,9 +27,9 @@ import org.kie.kogito.serverless.workflow.asyncapi.AsyncChannelInfo;
 import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfo;
 import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfoConverter;
 
-import com.asyncapi.v2.model.AsyncAPI;
-import com.asyncapi.v2.model.channel.ChannelItem;
-import com.asyncapi.v2.model.channel.operation.Operation;
+import com.asyncapi.v2._6_0.model.AsyncAPI;
+import com.asyncapi.v2._6_0.model.channel.ChannelItem;
+import com.asyncapi.v2._6_0.model.channel.operation.Operation;
 
 import io.quarkiverse.asyncapi.config.AsyncAPIRegistry;
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
index ba1fa4ba9b..765cbcf449 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
@@ -30,7 +30,7 @@ import java.util.ServiceLoader;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.drools.codegen.common.GeneratedFile;
 import org.drools.codegen.common.GeneratedFileType;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
index f502b34a83..3479fdbf6d 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
@@ -22,14 +22,15 @@ import java.lang.annotation.Annotation;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.core.Response;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
+import org.jboss.jandex.VoidType;
 import org.kie.kogito.codegen.api.context.KogitoBuildContext;
 import org.kie.kogito.quarkus.serverless.workflow.ClassAnnotatedWorkflowHandlerGenerator;
 import org.kie.kogito.quarkus.serverless.workflow.WorkflowCodeGenUtils;
@@ -91,7 +92,7 @@ public class WorkflowOpenApiHandlerGenerator extends ClassAnnotatedWorkflowHandl
         BlockStmt body = executeMethod.createBody();
         MethodCallExpr methodCallExpr = new MethodCallExpr(new NameExpr(OPEN_API_REF), m.name());
         final NameExpr parameters = new NameExpr(WORK_ITEM_PARAMETERS);
-        if (m.returnType().name().equals(DotName.createSimple(Response.class.getName()))) {
+        if (m.returnType().name().equals(DotName.createSimple(Response.class.getName())) || (m.returnType() instanceof VoidType)) {
             body.addStatement(methodCallExpr).addStatement(new ReturnStmt(new NullLiteralExpr()));
         } else {
             body.addStatement(new ReturnStmt(methodCallExpr));
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
index 37127f0604..e6144f96c4 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-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.jboss.jandex.IndexView;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
index 30a50a9eef..881d80ea18 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
@@ -21,10 +21,11 @@ package org.kie.kogito.serverless.workflow.io;
 import java.net.URI;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import io.quarkus.cache.Cache;
+
+import jakarta.annotation.PostConstruct;
 import io.quarkus.cache.CacheName;
 import io.quarkus.runtime.Startup;
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
index 747039445b..ea67425329 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
@@ -54,6 +54,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-grpc-codegen</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -202,6 +206,28 @@
           </execution>
         </executions>
       </plugin>
+      <!-- Based on https://github.com/quarkusio/quarkus/pull/31115 -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>post-process-grpc</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+            <configuration>
+              <skip>false</skip>
+              <includeProjectDependencies>true</includeProjectDependencies>
+              <arguments>
+                <argument>${project.build.directory}/generated-sources/grpc</argument>
+              </arguments>
+              <mainClass>io.quarkus.grpc.deployment.GrpcPostProcessing</mainClass>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
         <artifactId>quarkus-maven-plugin</artifactId>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java
index 38415e9b46..91a4f9e910 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java
@@ -20,7 +20,7 @@ package org.kie.kogito.workflows.services;
 
 import java.util.Date;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class AgePersonService {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java
index 10bcefb642..13f31b359c 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.workflows.services;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class EvenService {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
index 838f60172b..12f949e1c3 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
@@ -20,13 +20,13 @@ package org.kie.kogito.workflows.services;
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.Model;
 import org.kie.kogito.process.Process;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
index d9175ba155..5e4db1e3bc 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.workflows.services;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.kie.kogito.addon.quarkus.messaging.common.ChannelFormat;
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
index abe000d6f7..419aa07937 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.workflows.services;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java
index 7011b3f04f..36197c0232 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.workflows.services;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class PersonService {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
index 942c0709d8..2851f80580 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
@@ -20,7 +20,7 @@ package org.kie.kogito.workflows.services;
 
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
 import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
index 40748ec9fb..a33e0658d6 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
@@ -18,10 +18,10 @@
  */
 package org.kie.kogito.workflows.services;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 
 @ApplicationScoped
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java
index 4a93f89081..f72348a510 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java
@@ -21,7 +21,7 @@ package org.kie.kogito.workflows.services;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
 public class SquareService {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json
index b637610c69..190eb1fcca 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/token-propagation.sw.json
@@ -7,7 +7,7 @@
   "errors": [
     {
       "name": "execution_error",
-      "code": "javax.ws.rs.ProcessingException"
+      "code": "jakarta.ws.rs.ProcessingException"
     }
   ],
   "functions": [
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java
index 007127ec48..7ffa1481b7 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java
@@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
 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;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
 public class ExternalServiceMock implements QuarkusTestResourceLifecycleManager {
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java
index 5bd6325ac3..67d3d66bcc 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java
@@ -31,9 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 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;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
 /**
  * Lightweight Keycloak mock to use when an OidcClient is required, and we don't want/need to start a full Keycloak
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
index 93f7844f2b..8457c1846f 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows;
 import java.time.Duration;
 import java.util.UUID;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
index 0802aed3d1..0c42b4214a 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows;
 import java.util.Collections;
 import java.util.Map;
 
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 
@@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 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;
-import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE;
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 import static org.kie.kogito.quarkus.workflows.KeycloakServiceMock.KEYCLOAK_ACCESS_TOKEN;
 
 public class TokenPropagationExternalServicesMock implements QuarkusTestResourceLifecycleManager {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
index 12c7faa5b6..d7194e46fe 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.HttpHeaders;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml
index 2f0c60b687..4022c85adb 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml
@@ -143,7 +143,7 @@
       </plugin>
       <plugin>
         <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+        <artifactId>quarkus-extension-maven-plugin</artifactId>
         <version>${version.io.quarkus}</version>
         <executions>
           <execution>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md
index 5a6afd82f9..f15cc96ff3 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md
@@ -1,7 +1,7 @@
 {#include readme-header /}
 
-This Kogito Serverless Workflow project contains a sample workflow definition as described in the [Quarkus Kogito guide](https://quarkus.io/version/2.13/guides/kogito).
+This Kogito Serverless Workflow project contains a sample workflow definition as described in the [Quarkus Kogito guide](https://quarkus.io/guides/kogito).
 The goal is to showcase automatic REST endpoint codegen, based on the content of the model.
 The `greet.sw.json` workflow will greet users in different languages based on the input.
 
-You can reference the [full guide on the Quarkus website](https://quarkus.io/version/2.13/guides/kogito).
+You can reference the [full guide on the Quarkus website](https://quarkus.io/guides/kogito).
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml
index e8678aaeb2..774a2e2237 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml
@@ -5,7 +5,7 @@ tags: extension-codestart
 metadata:
   title: Kogito Serverless Workflow codestart
   description: This is an example Kogito Serverless Workflow Quarkus codestart, it contains a sample Serverless Workflow definition for REST code generation.
-  related-guide-section: https://quarkus.io/version/2.13/guides/kogito
+  related-guide-section: https://quarkus.io/guides/kogito
 language:
   base:
     dependencies:
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
index 9070b5e922..2ed35472f4 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.expr.jq;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import io.quarkus.runtime.Startup;
 
+import jakarta.annotation.PostConstruct;
 import net.thisptr.jackson.jq.Scope;
 
 @Startup
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
index 9fa0551c10..33fc2e550c 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.secret;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.serverless.workflow.utils.ConfigResolverHolder;
 
 import io.quarkus.runtime.Startup;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
index 54c0614393..9d5030bd2f 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
@@ -18,11 +18,11 @@
  */
 package org.kie.kogito.serverless.workflow.config;
 
-import javax.annotation.PostConstruct;
-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 jakarta.annotation.PostConstruct;
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
 import org.slf4j.Logger;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
index d07051612e..b6d051eebe 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.serverless.workflow.mapper;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.jackson.utils.JsonNodeFactoryListener;
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
index 6ef78bbf19..c2929e721b 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
@@ -23,9 +23,9 @@ import java.lang.reflect.ParameterizedType;
 import java.util.Collections;
 import java.util.Map;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
 
 import org.kie.kogito.event.cloudevents.extension.ProcessMeta;
 import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml
index 1fa30d99a1..d0ae242db9 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml
@@ -7,7 +7,7 @@ metadata:
     - "serverless"
     - "workflow"
     - "SW"
-  guide: "https://quarkus.io/version/2.13/guides/kogito"
+  guide: "https://quarkus.io/guides/kogito"
   categories:
     - "business-automation"
   status: "preview"
diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
index 26a0a3c852..e9b6c51100 100644
--- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
+++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
@@ -20,9 +20,9 @@ package org.kie.kogito.quarkus.workflow;
 
 import java.util.concurrent.ScheduledExecutorService;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
 
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.correlation.CorrelationService;
diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
index bf02d1fa33..69b83fc1bd 100644
--- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
+++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
@@ -21,9 +21,9 @@ package org.kie.kogito.quarkus.workflow.devservices;
 import java.util.Collection;
 import java.util.Optional;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
+import jakarta.annotation.PostConstruct;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.kie.kogito.event.DataEvent;
 import org.kie.kogito.event.EventPublisher;
diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
index 56552ca660..d8701e2c33 100644
--- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
+++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
@@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.context.ThreadContext;
 import org.kie.kogito.services.jobs.impl.InMemoryJobService;
diff --git a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java
index fe93bfc22d..09baf63f1a 100644
--- a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java
+++ b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java
@@ -26,8 +26,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.Model;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
index 02276572fb..5585554ba5 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.integrationtests;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.decision.DecisionConfig;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
index 589908d1d9..5763a15314 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
@@ -18,12 +18,12 @@
  */
 package org.kie.kogito.legacy.rules;
 
+import jakarta.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.ws.rs.*;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
 
 import org.kie.api.runtime.KieRuntimeBuilder;
 import org.kie.api.runtime.KieSession;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
index 4d86f0a465..146f7d6eaa 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.dmn;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.jupiter.api.Test;
 import org.kie.dmn.api.core.DMNResult;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
index 0ab9fb60d2..2235b94b67 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.drools.ruleunits.api.RuleUnit;
 import org.drools.ruleunits.api.RuleUnitInstance;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
index 7cbcbf9f89..2dbbb9ca44 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
@@ -21,8 +21,8 @@ package org.kie.kogito.quarkus.jbpm;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.Model;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
index f994995181..54f197106d 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.pmml;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java b/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java
index e39eb0adfa..2bf2d5333c 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-predictions/src/main/java/org/kie/kogito/integrationtests/InjectPredictionModels.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.integrationtests;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.prediction.PredictionConfig;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
index e998425a4c..4e81f33110 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
@@ -20,7 +20,7 @@ package org.kie.kogito;
 
 import java.io.IOException;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
index 641a4f922a..91629e1559 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
index abd03d0669..31c65cd8d0 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.wih;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
index ba823a3788..1ea029587c 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
@@ -18,7 +18,7 @@
  */
 package org.acme;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
index e3de3ba4b9..f8ec56ee6a 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
@@ -20,14 +20,14 @@ package org.kie.kogito.integrationtests;
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.kie.kogito.Model;
 import org.kie.kogito.process.Process;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java
index 9498c0e032..031fbc0759 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java
@@ -21,12 +21,12 @@ package org.kie.kogito.integrationtests;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("/events")
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
index 7cc318736f..026e1caad3 100755
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
@@ -20,7 +20,7 @@ package org.kie.kogito.integrationtests;
 
 import java.io.IOException;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.integrationtests.excetpion.ServiceException;
 import org.slf4j.Logger;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
index 86dcce9cf3..919b2ef874 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.integrationtests;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.process.ProcessConfig;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
index 171e26f73d..28a845f88f 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.integrationtests;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
index 1b7f2c85d1..818720a584 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
@@ -21,7 +21,7 @@ package org.kie.kogito.integrationtests;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.uow.events.UnitOfWorkAbortEvent;
 import org.kie.kogito.uow.events.UnitOfWorkEndEvent;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
index d8ed6f0c95..50575452ae 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
@@ -50,14 +50,8 @@ class OASIT {
         parseOptions.setResolve(true);
         SwaggerParseResult result = new OpenAPIV3Parser().readLocation(url, null, parseOptions);
 
-        //Will be fixed by https://issues.redhat.com/browse/KOGITO-5734
-        assertThat(result.getMessages()).containsExactly(
-                "attribute components.schemas.MultiinstancetaskprocessModelInput.items is missing",
-                "attribute components.schemas.MultiinstancetaskprocessModelInput.items is missing",
-                "attribute components.schemas.MultiinstancetaskprocessModelOutput.items is missing",
-                "attribute components.schemas.MultiinstancetaskprocessModelOutput.items is missing",
-                "attribute components.schemas.Multiinstancetaskprocess_2_TaskInput.items is missing",
-                "attribute components.schemas.Multiinstancetaskprocess_2_TaskInput.items is missing");
+        // Should fix https://issues.redhat.com/browse/KOGITO-5734
+        assertThat(result.getMessages()).isEmpty();
 
         OpenAPI openAPI = result.getOpenAPI();
         PathItem p1 = openAPI.getPaths().get("/approvals");
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
index 448036c580..662b572bf8 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
@@ -26,7 +26,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.acme.travels.Traveller;
 import org.junit.jupiter.api.Test;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
index 13e4d2789b..74309f3c16 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
@@ -18,7 +18,7 @@
  */
 package org.kie.kogito.integrationtests;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.kie.kogito.Application;
 import org.kie.kogito.rules.RuleConfig;
diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
index d15814e745..effee0cf27 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
+++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
@@ -20,7 +20,7 @@ package org.kie.kogito.examples;
 
 import java.util.Random;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.kie.kogito.examples.demo.Order;
 
diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java
index fa81bad963..1fce37229b 100644
--- a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java
+++ b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java
@@ -21,7 +21,7 @@ package org.kie.kogito.test.quarkus;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
index e081fccc33..8b6513edf2 100644
--- a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
+++ b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
@@ -23,8 +23,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.kie.kogito.test.quarkus.QuarkusTestProperty;
 import org.testcontainers.containers.Container;
 
diff --git a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
index 4dc9222f13..1f22146992 100644
--- a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
+++ b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
@@ -21,8 +21,7 @@ package org.kie.kogito.test.resources;
 import java.util.Collections;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
+import jakarta.annotation.Resource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
index 813b8448b5..9b38468d83 100644
--- a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
+++ b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.eventdriven.decision;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.decision.DecisionModels;
 import org.kie.kogito.event.EventEmitter;
diff --git a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
index 8ab43d6c7e..e08186b651 100644
--- a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
+++ b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.events.mongodb;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
index ede3ff7785..14a6d41dfc 100644
--- a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
+++ b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.eventdriven.predictions;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.EventEmitter;
 import org.kie.kogito.event.EventReceiver;
diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml
index 8a5537d588..c61418cb3f 100644
--- a/springboot/addons/jobs/pom.xml
+++ b/springboot/addons/jobs/pom.xml
@@ -53,8 +53,8 @@
       <artifactId>kogito-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
index d143618383..59eddb3c70 100644
--- a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
+++ b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.jobs.management.springboot;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.jobs.ProcessInstanceJobDescription;
 import org.kie.kogito.jobs.ProcessJobDescription;
 import org.kie.kogito.jobs.management.RestJobsService;
@@ -30,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -86,7 +86,7 @@ public class SpringRestJobsService extends RestJobsService {
         ResponseEntity<String> result = restTemplate.postForEntity(getJobsServiceUri(),
                 request,
                 String.class);
-        if (result.getStatusCode().ordinal() == 200) {
+        if (result.getStatusCode().isSameCodeAs(HttpStatusCode.valueOf(200))) {
             LOGGER.debug("Creating of the job {} done with status code {} ", job, result.getStatusCode());
         }
         return job.getId();
diff --git a/springboot/addons/kubernetes/pom.xml b/springboot/addons/kubernetes/pom.xml
index bd0c0c4f6b..9ca17296ad 100644
--- a/springboot/addons/kubernetes/pom.xml
+++ b/springboot/addons/kubernetes/pom.xml
@@ -33,8 +33,8 @@
   <name>Kogito :: Add-Ons :: Spring Boot :: Kubernetes</name>
 
   <properties>
-    <!-- Fabric8 aligned with Spring Cloud. See: https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-kubernetes-fabric8-autoconfig/2.1.1 -->
-    <version.io.fabric8>5.10.2</version.io.fabric8>
+    <!-- Fabric8 aligned with Spring Cloud. See: https://github.com/spring-cloud/spring-cloud-kubernetes/blob/main/spring-cloud-kubernetes-dependencies/pom.xml#L36 -->
+    <version.io.fabric8>6.2.0</version.io.fabric8>
   </properties>
 
   <dependencyManagement>
@@ -81,11 +81,6 @@
       <artifactId>kubernetes-server-mock</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.fabric8</groupId>
-      <artifactId>knative-mock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
index cc049ab883..4264e3fd48 100644
--- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
+++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.addon.cloudevents.spring;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.event.cloudevents.extension.KogitoExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension;
 import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension;
diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java
index 279b589211..ad1edac7c6 100644
--- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java
+++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventEmitter.java
@@ -64,7 +64,6 @@ public class SpringKafkaCloudEventEmitter<M> implements EventEmitter {
                             env.getProperty("kogito.addon.cloudevents.kafka." + KogitoEventStreams.OUTGOING + "." + event.getType(),
                                     defaultTopicName),
                             configBean.useCloudEvents() ? ceMarshaller.marshall(event.asCloudEvent(ceMarshaller.cloudEventDataFactory())) : marshaller.marshall(event.getData()))
-                    .completable()
                     .thenApply(r -> null);
         } catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
index 349d576ea6..5330d48cc8 100644
--- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
+++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
@@ -26,8 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.event.CloudEventUnmarshallerFactory;
 import org.kie.kogito.event.DataEvent;
diff --git a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java
index adf98c576b..c1563ad6b1 100644
--- a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java
+++ b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/src/test/java/org/kie/kogito/integrationtests/SpringBootTopicsInformationResourceTest.java
@@ -25,7 +25,7 @@ import org.kie.kogito.app.KogitoSpringbootApplication;
 import org.kie.kogito.event.ChannelType;
 import org.kie.kogito.event.Topic;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 
 import io.restassured.RestAssured;
 
diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
index 8428936c05..14b64f3ab4 100644
--- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
+++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
@@ -18,8 +18,8 @@
  */
 package org.kie.kogito.monitoring.core.springboot;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
 import org.springframework.lang.Nullable;
diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
index 2742bfaab2..fb29872dcc 100644
--- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
+++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.monitoring.core.springboot;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.config.ConfigBean;
 import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector;
diff --git a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
index 761ce48615..f1f7063f33 100644
--- a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
+++ b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.core.springboot;
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
diff --git a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
index 7dff7614e1..bbec67fe8c 100644
--- a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
+++ b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.monitoring.elastic.springboot;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory;
 import org.kie.kogito.monitoring.elastic.common.ElasticRegistry;
 import org.kie.kogito.monitoring.elastic.common.KogitoElasticConfig;
diff --git a/springboot/addons/process-svg/pom.xml b/springboot/addons/process-svg/pom.xml
index 4ee9fa3172..ff6a94dbdd 100644
--- a/springboot/addons/process-svg/pom.xml
+++ b/springboot/addons/process-svg/pom.xml
@@ -67,8 +67,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
index ae7baf53b8..69f490e5ce 100644
--- a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
+++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
@@ -21,8 +21,7 @@ package org.kie.kogito.svg.dataindex;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.keycloak.KeycloakPrincipal;
 import org.kie.kogito.svg.ProcessSVGException;
 import org.slf4j.Logger;
diff --git a/springboot/addons/tracing-decision/pom.xml b/springboot/addons/tracing-decision/pom.xml
index 01db69293a..fa79d6152d 100644
--- a/springboot/addons/tracing-decision/pom.xml
+++ b/springboot/addons/tracing-decision/pom.xml
@@ -49,8 +49,8 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
index b40973043d..da10bdb18b 100644
--- a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
+++ b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
@@ -18,8 +18,7 @@
  */
 package org.kie.kogito.tracing.decision;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import org.kie.kogito.decision.DecisionModelResourcesProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/springboot/archetype/src/main/resources/archetype-resources/pom.xml b/springboot/archetype/src/main/resources/archetype-resources/pom.xml
index 05fc684d06..21f342ef79 100644
--- a/springboot/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/springboot/archetype/src/main/resources/archetype-resources/pom.xml
@@ -60,6 +60,11 @@
       <artifactId>spring-boot-starter</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
diff --git a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java
index b38b59a135..ae3a39c9f8 100644
--- a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java
+++ b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/GreetingsTest.java
@@ -23,7 +23,7 @@ import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java
index 36e2c32e92..dce38a0f48 100644
--- a/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java
+++ b/springboot/archetype/src/main/resources/archetype-resources/src/test/java/TrafficViolationTest.java
@@ -26,7 +26,7 @@ import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringRunner;
diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
index 898384e80d..5223d402c2 100644
--- a/springboot/bom/pom.xml
+++ b/springboot/bom/pom.xml
@@ -36,16 +36,16 @@
 
   <properties>
     <version.io.swagger.core.v3>2.2.7</version.io.swagger.core.v3>
-    <version.org.springdoc>1.6.14</version.org.springdoc>
+    <version.org.springdoc>2.1.0</version.org.springdoc>
     <!-- Groovy -->
     <!-- must be aligned with the Archetype plugin: https://maven.apache.org/archetype/maven-archetype-plugin/dependencies.html -->
     <version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
     <version.org.spockframework>1.3-groovy-2.4</version.org.spockframework>
     <!-- Spring Boot Cloud aligned with Spring Boot Framework version. See: https://spring.io/projects/spring-cloud -->
-    <version.org.springframework.cloud.kubernetes.fabric8>2.1.1</version.org.springframework.cloud.kubernetes.fabric8>
+    <version.org.springframework.cloud.kubernetes.fabric8>3.0.2</version.org.springframework.cloud.kubernetes.fabric8>
     <!-- CVE-2022-25857: Upgrading snakeyaml until we upgrade to Spring Boot 3.x -->
     <!-- See: https://github.com/spring-projects/spring-boot/issues/32221 -->
-    <snakeyaml.version>2.0</snakeyaml.version>
+    <version.org.springframework.security>1.0.2</version.org.springframework.security>
   </properties>
   
   <dependencyManagement>
@@ -59,7 +59,7 @@
       </dependency>
       <dependency>
         <groupId>org.springdoc</groupId>
-        <artifactId>springdoc-openapi-ui</artifactId>
+        <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         <version>${version.org.springdoc}</version>
       </dependency>
       <dependency>
@@ -84,9 +84,9 @@
         <version>${version.org.springframework.cloud.kubernetes.fabric8}</version>
       </dependency>
       <dependency>
-        <groupId>org.yaml</groupId>
-        <artifactId>snakeyaml</artifactId>
-        <version>${snakeyaml.version}</version>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-oauth2-authorization-server</artifactId>
+        <version>${version.org.springframework.security}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml
index 3ef4800305..602afeca61 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml
@@ -95,7 +95,7 @@
 
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
     <dependency>
       <groupId>io.swagger.parser.v3</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
index 14ea9cd74d..5f755f1888 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.integrationtests.springboot;
 
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 
 public abstract class BaseRestTest {
 
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java
index b3a6c7d6be..9b03bee9f4 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/CommonPMMLTestUtils.java
@@ -64,7 +64,7 @@ public class CommonPMMLTestUtils {
                                   final String basePath,
                                   final String targetField,
                                   final Map<String, Object> expectedResultMap) {
-        String path = basePath + "descriptive";
+        String path = basePath + "/descriptive";
         final Response response = given()
                 .contentType(ContentType.JSON)
                 .body(inputData)
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java
index 97d036d980..2fb7a8b6a3 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/ElementAtIndexTest.java
@@ -23,7 +23,7 @@ import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.restassured.RestAssured.given;
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java
index eda126a569..a70f8ec22a 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLRegressionTest.java
@@ -46,7 +46,7 @@ import static org.kie.kogito.integrationtests.springboot.CommonPMMLTestUtils.tes
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = KogitoSpringbootApplication.class)
 class PMMLRegressionTest extends BaseRestTest {
 
-    private static final String BASE_PATH = "/PMMLRegression/LinReg/";
+    private static final String BASE_PATH = "/PMMLRegression/LinReg";
     private static final String TARGET = "fld4";
 
     static {
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java
index 96ace7c4a5..ec9e61b812 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/PMMLTreeTest.java
@@ -43,7 +43,7 @@ import static org.kie.kogito.integrationtests.springboot.CommonPMMLTestUtils.tes
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = KogitoSpringbootApplication.class)
 class PMMLTreeTest extends BaseRestTest {
 
-    private static final String BASE_PATH = "/PMMLTree/SampleMine/";
+    private static final String BASE_PATH = "/PMMLTree/SampleMine";
     private static final String TARGET = "decision";
 
     static {
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
index 14ea9cd74d..5f755f1888 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.integrationtests.springboot;
 
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 
 public abstract class BaseRestTest {
 
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java
index b4c5998499..5f0842b5f1 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/src/test/java/org/kie/kogito/integrationtests/springboot/PingPongMessageTest.java
@@ -84,7 +84,7 @@ public class PingPongMessageTest extends BaseRestTest {
                 .untilAsserted(() -> given()
                         .contentType(ContentType.JSON)
                         .when()
-                        .get("/pong_message/")
+                        .get("/pong_message")
                         .then()
                         .statusCode(200)
                         .body("$.size()", equalTo(1)));
@@ -92,7 +92,7 @@ public class PingPongMessageTest extends BaseRestTest {
         String pId = given()
                 .contentType(ContentType.JSON)
                 .when()
-                .get("/pong_message/")
+                .get("/pong_message")
                 .then()
                 .statusCode(200)
                 .body("$.size()", equalTo(1))
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml
index b3bca7436f..802f3f8bf8 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-norest-it/pom.xml
@@ -81,7 +81,7 @@
 
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
     <dependency>
       <groupId>io.swagger.parser.v3</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml
index 914967ef29..b4c3be2389 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml
@@ -109,13 +109,13 @@
     </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <artifactId>wiremock-jre8-standalone</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
     <dependency>
       <groupId>io.swagger.parser.v3</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
index 14ea9cd74d..5f755f1888 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/BaseRestTest.java
@@ -20,7 +20,7 @@ package org.kie.kogito.integrationtests.springboot;
 
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 
 public abstract class BaseRestTest {
 
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
index f03d48ac50..7fce7feb24 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/ProcessTest.java
@@ -30,7 +30,7 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.restassured.RestAssured.given;
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
index 174bc82f71..ad02446a92 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/src/test/java/org/kie/kogito/integrationtests/springboot/TaskTest.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.process.workitem.AttachmentInfo;
 import org.kie.kogito.task.management.service.TaskInfo;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static io.restassured.RestAssured.given;
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
index 49747a2c3f..0fe330df97 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
@@ -59,11 +59,10 @@
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-spring-boot-starter-remote</artifactId>
+      <artifactId>infinispan-spring-boot3-starter-remote</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie.kogito</groupId>      <artifactId>kogito-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
index 2520f4692a..38ba84d680 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
@@ -33,7 +33,7 @@ import org.kie.kogito.Address;
 import org.kie.kogito.AddressType;
 import org.kie.kogito.Person;
 import org.kie.kogito.Status;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
diff --git a/springboot/starters/kogito-processes-spring-boot-starter/pom.xml b/springboot/starters/kogito-processes-spring-boot-starter/pom.xml
index 3fdcd7f531..1bd324ece3 100644
--- a/springboot/starters/kogito-processes-spring-boot-starter/pom.xml
+++ b/springboot/starters/kogito-processes-spring-boot-starter/pom.xml
@@ -42,6 +42,10 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-rest-workitem</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.reactivestreams</groupId>
+      <artifactId>reactive-streams</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
diff --git a/springboot/starters/pom.xml b/springboot/starters/pom.xml
index 6e7adc0e41..8411f876e0 100644
--- a/springboot/starters/pom.xml
+++ b/springboot/starters/pom.xml
@@ -64,12 +64,12 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.activation</groupId>
-      <artifactId>javax.activation</artifactId>
+      <groupId>org.eclipse.angus</groupId>
+      <artifactId>angus-activation</artifactId>
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
index 532c5c34be..a946de2658 100644
--- a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
+++ b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
@@ -29,8 +29,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PreDestroy;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
diff --git a/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java b/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java
index 6379c92f26..ee05b95511 100644
--- a/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java
+++ b/springboot/test/src/main/java/org/kie/kogito/testcontainers/springboot/KeycloakSpringBootTestResource.java
@@ -18,6 +18,7 @@
  */
 package org.kie.kogito.testcontainers.springboot;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.kie.kogito.test.resources.ConditionalSpringBootTestResource;
@@ -32,6 +33,7 @@ import static java.util.Collections.singletonMap;
 public class KeycloakSpringBootTestResource extends ConditionalSpringBootTestResource<KogitoKeycloakContainer> {
 
     public static final String KOGITO_KEYCLOAK_PROPERTY = "keycloak.auth-server-url";
+    public static final String OAUTH2_JWT_ISSUER = "spring.security.oauth2.resourceserver.jwt.issuer-uri";
 
     public KeycloakSpringBootTestResource() {
         super(new KogitoKeycloakContainer());
@@ -39,7 +41,10 @@ public class KeycloakSpringBootTestResource extends ConditionalSpringBootTestRes
 
     @Override
     protected Map<String, String> getProperties() {
-        return singletonMap(KOGITO_KEYCLOAK_PROPERTY, String.format("http://localhost:%s", getTestResource().getMappedPort()));
+        Map<String, String> properties = new HashMap<>();
+        properties.put(KOGITO_KEYCLOAK_PROPERTY, String.format("http://localhost:%s", getTestResource().getMappedPort()));
+        properties.put(OAUTH2_JWT_ISSUER, String.format("http://localhost:%s/realms/%s", getTestResource().getMappedPort(), KogitoKeycloakContainer.REALM));
+        return properties;
     }
 
     public static class Conditional extends KeycloakSpringBootTestResource {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 01/07: Bump to Quarkus 3.2.9.Final

Posted by ma...@apache.org.
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-runtimes.git

commit 4c1448080625db69b456447fc6ccfd23859bfeaa
Author: Toshiya Kobayashi <to...@gmail.com>
AuthorDate: Wed Nov 29 11:54:03 2023 +0900

    Bump to Quarkus 3.2.9.Final
---
 .ci/environments/quarkus-3/before.sh                           |  2 +-
 .../jbang/CreateKieQuarkusProjectMigrationRecipe.java          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/environments/quarkus-3/before.sh b/.ci/environments/quarkus-3/before.sh
index aeda81b191..f5dddd7bb7 100755
--- a/.ci/environments/quarkus-3/before.sh
+++ b/.ci/environments/quarkus-3/before.sh
@@ -6,7 +6,7 @@ mvn_cmd="mvn ${BUILD_MVN_OPTS:-} ${BUILD_MVN_OPTS_QUARKUS_UPDATE:-}"
 ci="${CI:-false}"
 
 rewrite_plugin_version=4.43.0
-quarkus_version=${QUARKUS_VERSION:-3.0.0.Final}
+quarkus_version=${QUARKUS_VERSION:-3.2.9.Final}
 
 quarkus_recipe_file="${script_dir_path}/quarkus3.yml"
 patch_file="${script_dir_path}"/patches/0001_before_sh.patch
diff --git a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
index ef4a67020b..9f4f3842ec 100755
--- a/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
+++ b/.ci/environments/quarkus-3/jbang/CreateKieQuarkusProjectMigrationRecipe.java
@@ -12,16 +12,16 @@ import java.util.concurrent.Callable;
 import org.apache.commons.io.IOUtils;
 
 import io.quarkus.devtools.project.BuildTool;
-import io.quarkus.devtools.project.update.QuarkusUpdateRecipe;
-import io.quarkus.devtools.project.update.QuarkusUpdateRecipeIO;
-import io.quarkus.devtools.project.update.operations.UpdatePropertyOperation;
+import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipe;
+import io.quarkus.devtools.project.update.rewrite.QuarkusUpdateRecipeIO;
+import io.quarkus.devtools.project.update.rewrite.operations.UpdatePropertyOperation;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 // Version to be changed when needed
-//DEPS io.quarkus:quarkus-devtools-common:3.0.0.Final
+//DEPS io.quarkus:quarkus-devtools-common:3.2.9.Final
 //DEPS info.picocli:picocli:4.5.0
 
 /*
@@ -45,7 +45,7 @@ import picocli.CommandLine.Option;
     @Option(names={ "-v", "--property-version"}, description = "(multi). Add a dynamic property version to the final recipe")
     private Map<String, String> versionProperties = new HashMap<>();
 
-    static final String QUARKUS_UPDATES_BASE_URL = "https://raw.githubusercontent.com/quarkusio/quarkus-updates/1.0.0/recipes/src/main/resources/quarkus-updates/core/3alpha.yaml";
+    static final String QUARKUS_UPDATES_BASE_URL = "https://github.com/quarkusio/quarkus-updates/blob/main/recipes/src/main/resources/quarkus-updates/core/3.2.yaml";
 
     static final Path quarkus3DownloadedRecipePath = Paths.get("quarkus3-base-recipe.yml");
     static final Path quarkus3GeneratedRecipePath = Paths.get("quarkus3.yml");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org


(incubator-kie-kogito-runtimes) 02/07: [Quarkus 3] Updated rewrite data

Posted by ma...@apache.org.
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-runtimes.git

commit 6d01db12a688014d2c2eb75b8ffb6b95f158282b
Author: Toshiya Kobayashi <to...@gmail.com>
AuthorDate: Wed Nov 29 12:43:11 2023 +0900

    [Quarkus 3] Updated rewrite data
---
 .../quarkus-3/patches/0001_before_sh.patch         | 1410 ++++++++++----------
 .ci/environments/quarkus-3/quarkus3.yml            |    2 +-
 2 files changed, 727 insertions(+), 685 deletions(-)

diff --git a/.ci/environments/quarkus-3/patches/0001_before_sh.patch b/.ci/environments/quarkus-3/patches/0001_before_sh.patch
index a4c6e8f05a..146c57d058 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/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
-index e62f05047a..28c4533641 100644
+index 982afe1739..6db25dad1d 100644
 --- a/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
 +++ b/addons/common/jobs/api/src/main/java/org/kie/kogito/jobs/api/JobCallbackResourceDef.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.api;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.api;
  
  import java.time.temporal.ChronoUnit;
  
@@ -14,10 +14,10 @@ index e62f05047a..28c4533641 100644
  import org.kie.kogito.jobs.ProcessInstanceJobDescription;
  import org.kie.kogito.jobs.service.api.TemporalUnit;
 diff --git a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
-index ebc9d7f80b..b877b40ce6 100644
+index b1ca3a73db..99f1add2b7 100644
 --- a/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
 +++ b/addons/common/jobs/api/src/test/java/org/kie/kogito/jobs/api/JobCallbackResourceDefTest.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.api;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.api;
  
  import java.net.URI;
  
@@ -29,10 +29,10 @@ index ebc9d7f80b..b877b40ce6 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.jobs.ExactExpirationTime;
 diff --git a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
-index 827d4f53c1..6698791988 100644
+index 9729b0ccdd..d775e7eacb 100644
 --- a/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
 +++ b/addons/common/kubernetes/src/main/java/org/kie/kogito/addons/k8s/workitems/AbstractDiscoveredEndpointCaller.java
-@@ -23,8 +23,8 @@ import java.util.List;
+@@ -26,8 +26,8 @@ import java.util.List;
  import java.util.Map;
  import java.util.concurrent.TimeUnit;
  
@@ -44,10 +44,10 @@ index 827d4f53c1..6698791988 100644
  import org.kie.api.runtime.process.WorkItem;
  import org.kie.kogito.addons.k8s.Endpoint;
 diff --git a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
-index 3ef249edfe..5b317809a4 100644
+index 688c4cf7a0..5eb93c71d2 100644
 --- a/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
 +++ b/addons/common/kubernetes/src/test/java/org/kie/kogito/addons/k8s/workitems/DiscoveredEndpointCallerTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.addons.k8s.workitems;
+@@ -20,7 +20,7 @@ package org.kie.kogito.addons.k8s.workitems;
  
  import java.util.Map;
  
@@ -57,10 +57,10 @@ index 3ef249edfe..5b317809a4 100644
  import org.junit.jupiter.api.Test;
  import org.junit.jupiter.api.extension.ExtendWith;
 diff --git a/addons/common/persistence/infinispan/pom.xml b/addons/common/persistence/infinispan/pom.xml
-index a7220d09ea..9d64d395be 100644
+index b30b289b84..6402b5d06d 100644
 --- a/addons/common/persistence/infinispan/pom.xml
 +++ b/addons/common/persistence/infinispan/pom.xml
-@@ -29,9 +29,9 @@
+@@ -49,9 +49,9 @@
        <artifactId>process-serialization-protobuf</artifactId>
      </dependency>
  
@@ -73,10 +73,10 @@ index a7220d09ea..9d64d395be 100644
  
      <!-- test dependencies -->
 diff --git a/api/kogito-api/pom.xml b/api/kogito-api/pom.xml
-index 85c613d88b..c48d871ad5 100755
+index 68bd620d55..ea90fd825f 100755
 --- a/api/kogito-api/pom.xml
 +++ b/api/kogito-api/pom.xml
-@@ -38,9 +38,10 @@
+@@ -58,9 +58,10 @@
      </dependency>
  
      <dependency>
@@ -85,15 +85,15 @@ index 85c613d88b..c48d871ad5 100755
 +      <groupId>jakarta.xml.bind</groupId>
 +      <artifactId>jakarta.xml.bind-api</artifactId>
        <scope>provided</scope>
-+      <version>4.0.0</version>
++      <version>4.0.1</version>
      </dependency>
  
      <dependency>
 diff --git a/jbpm/jbpm-bpmn2/pom.xml b/jbpm/jbpm-bpmn2/pom.xml
-index 92ba977bbd..6e816b43da 100755
+index 3c7b009e86..09e26280de 100755
 --- a/jbpm/jbpm-bpmn2/pom.xml
 +++ b/jbpm/jbpm-bpmn2/pom.xml
-@@ -54,9 +54,10 @@
+@@ -74,9 +74,10 @@
      </dependency>
  
      <dependency>
@@ -102,11 +102,11 @@ index 92ba977bbd..6e816b43da 100755
 +      <groupId>jakarta.xml.bind</groupId>
 +      <artifactId>jakarta.xml.bind-api</artifactId>
        <scope>provided</scope>
-+      <version>4.0.0</version>
++      <version>4.0.1</version>
      </dependency>
      <dependency>
        <groupId>com.sun.xml.bind</groupId>
-@@ -64,13 +65,14 @@
+@@ -84,13 +85,14 @@
        <scope>provided</scope>
      </dependency>
      <dependency>
@@ -115,7 +115,7 @@ index 92ba977bbd..6e816b43da 100755
 +      <groupId>org.glassfish.jaxb</groupId>
 +      <artifactId>jaxb-runtime</artifactId>
        <scope>provided</scope>
-+      <version>4.0.3</version>
++      <version>4.0.4</version>
      </dependency>
 -    <dependency>
 -      <groupId>com.sun.activation</groupId>
@@ -143,10 +143,10 @@ index c9cd63d032..f81811971d 100755
    <persistence-unit name="org.jbpm.persistence.jpa" transaction-type="JTA">
      <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java
-index c09c1f2e9f..107b9a3fd9 100755
+index fe3ca2c91b..fd9d2eecda 100755
 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java
 +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Address.java
-@@ -17,7 +17,7 @@ package org.jbpm.bpmn2.objects;
+@@ -20,7 +20,7 @@ package org.jbpm.bpmn2.objects;
  
  import java.io.Serializable;
  
@@ -156,10 +156,10 @@ index c09c1f2e9f..107b9a3fd9 100755
  @XmlRootElement
  public class Address implements Serializable {
 diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java
-index 2675520841..7cc238935e 100755
+index 8978dee9e8..fb1a4feb6e 100755
 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java
 +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/NotAvailableGoodsReport.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.jbpm.bpmn2.objects;
  
@@ -169,10 +169,10 @@ index 2675520841..7cc238935e 100755
  
      static final long serialVersionUID = 1L;
 diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java
-index 6bdc9a9cd8..4356b256e6 100755
+index a299263f2d..1569635826 100755
 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java
 +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/objects/Person.java
-@@ -17,7 +17,7 @@ package org.jbpm.bpmn2.objects;
+@@ -20,7 +20,7 @@ package org.jbpm.bpmn2.objects;
  
  import java.io.Serializable;
  
@@ -182,10 +182,10 @@ index 6bdc9a9cd8..4356b256e6 100755
  @XmlRootElement(name = "person")
  public class Person implements Serializable {
 diff --git a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
-index e93c007f1e..d584c3f0c9 100755
+index b106025632..a3288e3c8c 100755
 --- a/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
 +++ b/jbpm/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/structureref/StructureRefTest.java
-@@ -19,8 +19,8 @@ import java.io.StringReader;
+@@ -22,8 +22,8 @@ import java.io.StringReader;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -197,10 +197,10 @@ index e93c007f1e..d584c3f0c9 100755
  import org.jbpm.bpmn2.JbpmBpmn2TestCase;
  import org.jbpm.bpmn2.objects.Person;
 diff --git a/jbpm/jbpm-flow/pom.xml b/jbpm/jbpm-flow/pom.xml
-index bace24ddfa..b75ab0c3dc 100755
+index ebf4574103..e220b3869f 100755
 --- a/jbpm/jbpm-flow/pom.xml
 +++ b/jbpm/jbpm-flow/pom.xml
-@@ -86,9 +86,10 @@
+@@ -106,9 +106,10 @@
      </dependency>
  
      <dependency>
@@ -209,15 +209,15 @@ index bace24ddfa..b75ab0c3dc 100755
 +      <groupId>jakarta.xml.bind</groupId>
 +      <artifactId>jakarta.xml.bind-api</artifactId>
        <scope>provided</scope>
-+      <version>4.0.0</version>
++      <version>4.0.1</version>
      </dependency>
  
      <dependency>
 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
-index e34727d2af..8461c27468 100755
+index effad1e786..4bb7c5e332 100755
 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
 +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/GetProcessInstanceVariableCommand.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.jbpm.process.instance.command;
  
@@ -233,10 +233,10 @@ index e34727d2af..8461c27468 100755
  import org.kie.api.command.ExecutableCommand;
  import org.kie.api.runtime.Context;
 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
-index 33b41f53d9..10aad0b0cf 100755
+index 7bd2f26967..79e342bd84 100755
 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
 +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/MigrateProcessInstanceCommand.java
-@@ -18,11 +18,11 @@ package org.jbpm.process.instance.command;
+@@ -21,11 +21,11 @@ package org.jbpm.process.instance.command;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -254,10 +254,10 @@ index 33b41f53d9..10aad0b0cf 100755
  import org.drools.core.common.InternalKnowledgeRuntime;
  import org.jbpm.workflow.core.impl.NodeImpl;
 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
-index 867be63fec..f146f410c0 100755
+index fd4450262c..6cc16653bf 100755
 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
 +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/ResumeProcessInstanceCommand.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package org.jbpm.process.instance.command;
  
@@ -275,10 +275,10 @@ index 867be63fec..f146f410c0 100755
  import org.kie.api.command.ExecutableCommand;
  import org.kie.api.runtime.Context;
 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
-index 21008bfcc2..03f0b63095 100755
+index 37f849d908..2f2d069a4d 100755
 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
 +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/SuspendProcessInstanceCommand.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package org.jbpm.process.instance.command;
  
@@ -296,10 +296,10 @@ index 21008bfcc2..03f0b63095 100755
  import org.kie.api.command.ExecutableCommand;
  import org.kie.api.runtime.Context;
 diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
-index 42d82935f9..157ad57d4b 100755
+index c7b676986f..b5f8b6d6cb 100755
 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
 +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/command/UpdateProcessCommand.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package org.jbpm.process.instance.command;
  
@@ -317,10 +317,10 @@ index 42d82935f9..157ad57d4b 100755
  import org.jbpm.process.instance.impl.ProcessInstanceImpl;
  import org.kie.api.command.ExecutableCommand;
 diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml b/kogito-build/kogito-build-no-bom-parent/pom.xml
-index 914a5ed1a5..840df84c51 100644
+index 30d4121411..18a30b1792 100644
 --- a/kogito-build/kogito-build-no-bom-parent/pom.xml
 +++ b/kogito-build/kogito-build-no-bom-parent/pom.xml
-@@ -619,7 +619,7 @@
+@@ -639,7 +639,7 @@
          </plugin>
          <plugin>
            <groupId>io.quarkus</groupId>
@@ -330,27 +330,31 @@ index 914a5ed1a5..840df84c51 100644
          </plugin>
          <plugin>
 diff --git a/kogito-build/kogito-dependencies-bom/pom.xml b/kogito-build/kogito-dependencies-bom/pom.xml
-index b5586ee40a..ac8b59bb73 100644
+index f2ba6467f3..0521832c93 100644
 --- a/kogito-build/kogito-dependencies-bom/pom.xml
 +++ b/kogito-build/kogito-dependencies-bom/pom.xml
-@@ -16,9 +16,9 @@
+@@ -16,76 +16,76 @@
  
    <properties>
      <!-- this version property is used in plugins but also in dependencies too -->
--    <version.io.quarkus>2.16.10.Final</version.io.quarkus>
-+    <version.io.quarkus>3.0.0.Final</version.io.quarkus>
+-    <version.io.quarkus>2.16.12.Final</version.io.quarkus>
++    <version.io.quarkus>3.2.9.Final</version.io.quarkus>
      <version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
 -    <version.org.springframework.boot>2.6.6</version.org.springframework.boot>
 +    <version.org.springframework.boot>3.0.5</version.org.springframework.boot>
      <version.org.apache.kafka>3.4.0</version.org.apache.kafka>
  
      <!-- dependencies versions -->
-@@ -28,48 +28,48 @@
+     <version.com.networknt>1.0.86</version.com.networknt>
+-    <version.com.fasterxml.jackson>2.14.2</version.com.fasterxml.jackson>
+-    <version.com.fasterxml.jackson.databind>2.14.2</version.com.fasterxml.jackson.databind>
++    <version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
++    <version.com.fasterxml.jackson.databind>2.15.2</version.com.fasterxml.jackson.databind>
      <version.com.jayway.jsonpath>2.8.0</version.com.jayway.jsonpath>
      <version.net.minidev.jsonsmart>2.4.10</version.net.minidev.jsonsmart>
      <version.net.thisptr.jackson-jq>1.0.0-preview.20220705</version.net.thisptr.jackson-jq>
 -    <version.io.quarkiverse.jackson-jq>1.1.0</version.io.quarkiverse.jackson-jq>
--    <version.io.quarkiverse.openapi.generator>1.3.9</version.io.quarkiverse.openapi.generator>
+-    <version.io.quarkiverse.openapi.generator>1.3.10</version.io.quarkiverse.openapi.generator>
 -    <version.io.quarkiverse.asyncapi>0.0.6</version.io.quarkiverse.asyncapi>
 -    <version.io.quarkiverse.reactivemessaging.http>1.1.5</version.io.quarkiverse.reactivemessaging.http>
 +    <version.io.quarkiverse.jackson-jq>2.0.1</version.io.quarkiverse.jackson-jq>
@@ -360,8 +364,9 @@ index b5586ee40a..ac8b59bb73 100644
      <version.io.quarkiverse.embedded.postgresql>0.0.9</version.io.quarkiverse.embedded.postgresql>
      <version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
 -    <version.com.github.javaparser>3.24.2</version.com.github.javaparser>
+-    <version.com.fasterxml.jackson.datatype>2.14.2</version.com.fasterxml.jackson.datatype>
 +    <version.com.github.javaparser>3.25.1</version.com.github.javaparser>
-     <version.com.fasterxml.jackson.datatype>2.14.2</version.com.fasterxml.jackson.datatype>
++    <version.com.fasterxml.jackson.datatype>2.15.2</version.com.fasterxml.jackson.datatype>
      <version.com.github.victools>4.18.0</version.com.github.victools>
      <version.com.github.tomakehurst.wiremock>2.33.2</version.com.github.tomakehurst.wiremock>
      <version.com.google.protobuf>3.22.0</version.com.google.protobuf>
@@ -373,7 +378,7 @@ index b5586ee40a..ac8b59bb73 100644
      <version.com.sun.xml.bind.core>2.3.0.1</version.com.sun.xml.bind.core>
      <version.com.sun.xml.bind.impl>2.3.5</version.com.sun.xml.bind.impl>
 -    <version.com.sun.activation>1.2.0</version.com.sun.activation>
-+    <version.com.sun.activation>2.0.0</version.com.sun.activation>
++    <version.com.sun.activation>2.0.1</version.com.sun.activation>
      <version.javax.annotation>1.3.2</version.javax.annotation>
      <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
      <version.javax.inject>1</version.javax.inject>
@@ -381,42 +386,45 @@ index b5586ee40a..ac8b59bb73 100644
      <version.javax.xml.bind>2.3.1</version.javax.xml.bind>
 -    <version.org.eclipse.microprofile.openapi>2.0.1</version.org.eclipse.microprofile.openapi>
 -    <version.ch.qos.logback>1.2.9</version.ch.qos.logback>
-+    <version.org.eclipse.microprofile.openapi>3.1</version.org.eclipse.microprofile.openapi>
++    <version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>
 +    <version.ch.qos.logback>1.4.7</version.ch.qos.logback>
  
      <version.io.cloudevents>2.3.0</version.io.cloudevents>
 -    <version.io.fabric8.kubernetes-client>6.3.1</version.io.fabric8.kubernetes-client>
 -    <version.io.micrometer>1.10.2</version.io.micrometer>
-+    <version.io.fabric8.kubernetes-client>6.5.1</version.io.fabric8.kubernetes-client>
-+    <version.io.micrometer>1.10.5</version.io.micrometer>
++    <version.io.fabric8.kubernetes-client>6.7.2</version.io.fabric8.kubernetes-client>
++    <version.io.micrometer>1.11.1</version.io.micrometer>
      <version.org.flywaydb>9.8.3</version.org.flywaydb>
      <version.org.postgresql>42.5.1</version.org.postgresql>
-     <version.io.serverlessworkflow>4.0.4.Final</version.io.serverlessworkflow>
+     <version.io.serverlessworkflow>4.0.5.Final</version.io.serverlessworkflow>
      <!-- Aligned with Quarkus 2.7 (LTS) - see https://issues.redhat.com/browse/KOGITO-7971 -->
 -    <version.io.smallrye-open-api>3.1.1</version.io.smallrye-open-api>
-+    <version.io.smallrye-open-api>3.3.2</version.io.smallrye-open-api>
++    <version.io.smallrye-open-api>3.4.0</version.io.smallrye-open-api>
      <version.org.awaitility>4.2.0</version.org.awaitility>
  
 -    <version.io.smallrye.reactive.mutiny-vertx-web-client>2.30.1</version.io.smallrye.reactive.mutiny-vertx-web-client>
-+    <version.io.smallrye.reactive.mutiny-vertx-web-client>3.2.0</version.io.smallrye.reactive.mutiny-vertx-web-client>
++    <version.io.smallrye.reactive.mutiny-vertx-web-client>3.7.2</version.io.smallrye.reactive.mutiny-vertx-web-client>
  
-     <version.io.vertx>4.3.7</version.io.vertx>
+-    <version.io.vertx>4.3.7</version.io.vertx>
 -    <version.io.grpc>1.53.0</version.io.grpc>
-+    <version.io.grpc>1.54.0</version.io.grpc>
++    <version.io.vertx>4.4.6</version.io.vertx>
++    <version.io.grpc>1.56.0</version.io.grpc>
  
 -    <version.io.quarkus.camel>2.15.0</version.io.quarkus.camel>
 +    <version.io.quarkus.camel>3.0.0-M1</version.io.quarkus.camel>
  
-     <version.io.swagger.parser.v3>2.0.26</version.io.swagger.parser.v3>
+     <version.io.swagger.parser.v3>2.1.16</version.io.swagger.parser.v3>
+     <version.io.swagger.core.v3>2.2.14</version.io.swagger.core.v3>
  
-@@ -77,14 +77,14 @@
+     <version.org.apache.commons>3.12.0</version.org.apache.commons>
  
-     <version.org.graalvm.nativeimage>22.3.0</version.org.graalvm.nativeimage>
+-    <version.org.graalvm.nativeimage>22.3.0</version.org.graalvm.nativeimage>
++    <version.org.graalvm.nativeimage>23.0.1</version.org.graalvm.nativeimage>
  
 -    <version.org.infinispan>14.0.6.Final</version.org.infinispan>
 -    <version.org.infinispan.protostream>4.5.1.Final</version.org.infinispan.protostream>
 +    <version.org.infinispan>14.0.7.Final</version.org.infinispan>
-+    <version.org.infinispan.protostream>4.6.1.Final</version.org.infinispan.protostream>
++    <version.org.infinispan.protostream>4.6.2.Final</version.org.infinispan.protostream>
  
      <version.org.rocksdb>7.10.2</version.org.rocksdb>
      <!-- consider migrating to 3.x JDK 9: https://jakarta.ee/specifications/restful-ws/ -->
@@ -424,23 +432,30 @@ index b5586ee40a..ac8b59bb73 100644
 -    <version.org.jboss.resteasy>4.7.7.Final</version.org.jboss.resteasy>
 -    <version.org.keycloak>20.0.2</version.org.keycloak>
 +    <version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
-+    <version.org.jboss.resteasy>6.2.1.Final</version.org.jboss.resteasy>
++    <version.org.jboss.resteasy>6.2.4.Final</version.org.jboss.resteasy>
 +    <version.org.keycloak>21.0.1</version.org.keycloak>
      <!-- It seems that the confluent kafka cannot replace wurstmeister/kafka so easily. See FAI-729 -->
      <version.wurstmeister.kafka>2.12-2.2.1</version.wurstmeister.kafka>
      <version.org.mongo>4.6.1</version.org.mongo>
-@@ -102,20 +102,20 @@
-     <version.org.junit.vintage>5.9.2</version.org.junit.vintage>
-     <version.org.junit.platform>1.9.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
+@@ -99,24 +99,24 @@
+     <version.org.hamcrest>1.3</version.org.hamcrest> <!-- else old version coming from Mockito wins and breaks tests -->
+     <version.org.junit.minor>8.2</version.org.junit.minor> <!-- so that org.junit.platform and org.junit can share the same minor version -->
+     <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
+-    <version.org.junit.jupiter>5.9.2</version.org.junit.jupiter>
+-    <version.org.junit.vintage>5.9.2</version.org.junit.vintage>
+-    <version.org.junit.platform>1.9.2</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
++    <version.org.junit.jupiter>5.9.3</version.org.junit.jupiter>
++    <version.org.junit.vintage>5.9.3</version.org.junit.vintage>
++    <version.org.junit.platform>1.9.3</version.org.junit.platform> <!-- otherwise Quarkus brings its own, silently disabling some tests -->
      <version.org.junit.pioneer>1.5.0</version.org.junit.pioneer>
--    <version.org.mockito>4.11.0</version.org.mockito>
-+    <version.org.mockito>5.2.0</version.org.mockito>
+     <version.org.mockito>4.11.0</version.org.mockito>
      <version.org.testcontainers>1.17.6</version.org.testcontainers>
      <version.org.xmlunit-core>2.9.1</version.org.xmlunit-core>
 -    <version.io.rest-assured>4.5.1</version.io.rest-assured>
-+    <version.io.rest-assured>5.3.1</version.io.rest-assured>
++    <version.io.rest-assured>5.3.2</version.io.rest-assured>
  
-     <version.net.byte-buddy>1.12.18</version.net.byte-buddy>
+-    <version.net.byte-buddy>1.12.18</version.net.byte-buddy>
++    <version.net.byte-buddy>1.14.7</version.net.byte-buddy>
  
      <version.org.mvel>2.5.0.Final</version.org.mvel>
 -    <version.org.reactivestreams>1.0.3</version.org.reactivestreams>
@@ -450,21 +465,21 @@ index b5586ee40a..ac8b59bb73 100644
  
 -    <version.maven>3.8.6</version.maven>
 -    <version.maven.plugin>3.6.0</version.maven.plugin>
-+    <version.maven>3.9.1</version.maven>
++    <version.maven>3.9.3</version.maven>
 +    <version.maven.plugin>3.7.1</version.maven.plugin>
      <version.maven.invoker>3.2.0</version.maven.invoker>
  
      <version.plexus>1.6</version.plexus>
-@@ -124,7 +124,7 @@
+@@ -125,7 +125,7 @@
      <!-- see: https://maven.apache.org/surefire/maven-surefire-plugin/examples/fork-options-and-parallel-execution.html#parallel-test-execution-and-single-thread-execution -->
      <version.com.github.stephenc.jcip>1.0-1</version.com.github.stephenc.jcip>
      <version.black.ninia>4.1.1</version.black.ninia>
 -    <version.com.google.guava>32.0.1-jre</version.com.google.guava>
-+    <version.com.google.guava>31.1-jre</version.com.google.guava>
++    <version.com.google.guava>32.0.0-jre</version.com.google.guava>
+     <version.apache.commons.commons-compress>1.24.0</version.apache.commons.commons-compress>
    </properties>
  
-   <dependencyManagement>
-@@ -264,8 +264,8 @@
+@@ -273,8 +273,8 @@
          <version>${version.com.fasterxml.jackson}</version>
        </dependency>
        <dependency>
@@ -475,7 +490,7 @@ index b5586ee40a..ac8b59bb73 100644
          <version>${version.com.fasterxml.jackson}</version>
        </dependency>
        <dependency>
-@@ -275,7 +275,7 @@
+@@ -284,7 +284,7 @@
        </dependency>
        <dependency>
          <groupId>com.fasterxml.jackson.module</groupId>
@@ -484,7 +499,7 @@ index b5586ee40a..ac8b59bb73 100644
          <version>${version.com.fasterxml.jackson}</version>
        </dependency>
        <dependency>
-@@ -555,9 +555,9 @@
+@@ -564,9 +564,9 @@
        </dependency>
  
        <dependency>
@@ -497,7 +512,7 @@ index b5586ee40a..ac8b59bb73 100644
        </dependency>
        <dependency>
          <groupId>com.sun.xml.bind</groupId>
-@@ -565,19 +565,19 @@
+@@ -574,19 +574,19 @@
          <version>${version.com.sun.xml.bind.core}</version>
        </dependency>
        <dependency>
@@ -506,7 +521,7 @@ index b5586ee40a..ac8b59bb73 100644
 -        <version>${version.com.sun.xml.bind.impl}</version>
 +        <groupId>org.glassfish.jaxb</groupId>
 +        <artifactId>jaxb-runtime</artifactId>
-+        <version>4.0.2</version>
++        <version>4.0.3</version>
        </dependency>
        <dependency>
 -        <groupId>com.sun.activation</groupId>
@@ -525,7 +540,7 @@ index b5586ee40a..ac8b59bb73 100644
        </dependency>
        <dependency>
          <groupId>javax.inject</groupId>
-@@ -585,9 +585,9 @@
+@@ -594,9 +594,9 @@
          <version>${version.javax.inject}</version>
        </dependency>
        <dependency>
@@ -538,7 +553,7 @@ index b5586ee40a..ac8b59bb73 100644
        </dependency>
        <dependency>
          <groupId>org.eclipse.microprofile.openapi</groupId>
-@@ -633,7 +633,7 @@
+@@ -654,7 +654,7 @@
        </dependency>
        <dependency>
          <groupId>org.infinispan</groupId>
@@ -548,7 +563,7 @@ index b5586ee40a..ac8b59bb73 100644
        </dependency>
        <dependency>
 diff --git a/kogito-build/kogito-kie-bom/pom.xml b/kogito-build/kogito-kie-bom/pom.xml
-index 715dbf66c8..17a69d138e 100644
+index a900ed54a3..5e95b011b4 100644
 --- a/kogito-build/kogito-kie-bom/pom.xml
 +++ b/kogito-build/kogito-kie-bom/pom.xml
 @@ -18,7 +18,7 @@
@@ -561,10 +576,10 @@ index 715dbf66c8..17a69d138e 100644
  
    <dependencyManagement>
 diff --git a/kogito-codegen-modules/kogito-codegen-processes/pom.xml b/kogito-codegen-modules/kogito-codegen-processes/pom.xml
-index d7cf272966..27e823f66d 100644
+index 6029d9bae8..ae1e860a0b 100644
 --- a/kogito-codegen-modules/kogito-codegen-processes/pom.xml
 +++ b/kogito-codegen-modules/kogito-codegen-processes/pom.xml
-@@ -97,9 +97,10 @@
+@@ -117,9 +117,10 @@
        <scope>test</scope>
      </dependency>
      <dependency>
@@ -573,15 +588,15 @@ index d7cf272966..27e823f66d 100644
 +      <groupId>jakarta.validation</groupId>
 +      <artifactId>jakarta.validation-api</artifactId>
        <scope>test</scope>
-+      <version>3.0.2</version>
++      <version>3.0.2.redhat-00005</version>
      </dependency>
    </dependencies>
  
 diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java
-index 37649b0a2c..275181529a 100644
+index 4b58ec25ba..3ef8eabe81 100644
 --- a/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java
 +++ b/kogito-codegen-modules/kogito-codegen-processes/src/test/java/org/kie/kogito/codegen/data/HelloModel.java
-@@ -35,7 +35,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
+@@ -38,7 +38,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
  
      @org.kie.kogito.codegen.VariableInfo(tags = "")
      @com.fasterxml.jackson.annotation.JsonProperty(value = "person")
@@ -590,7 +605,7 @@ index 37649b0a2c..275181529a 100644
      private Person person;
  
      public Person getPerson() {
-@@ -48,7 +48,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
+@@ -51,7 +51,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
  
      @org.kie.kogito.codegen.VariableInfo(tags = "")
      @com.fasterxml.jackson.annotation.JsonProperty(value = "var2")
@@ -599,7 +614,7 @@ index 37649b0a2c..275181529a 100644
      private String var2;
  
      public String getVar2() {
-@@ -61,7 +61,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
+@@ -64,7 +64,7 @@ public class HelloModel implements Model, MapInput, MapInputId, MapOutput {
  
      @org.kie.kogito.codegen.VariableInfo(tags = "")
      @com.fasterxml.jackson.annotation.JsonProperty(value = "var1")
@@ -609,10 +624,10 @@ index 37649b0a2c..275181529a 100644
  
      public String getVar1() {
 diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
-index ba7c3c6366..e5051b4a5e 100644
+index 55a94a42ae..f3a7c073bd 100644
 --- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
 +++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandler.java
-@@ -18,11 +18,11 @@ package org.kie.kogito.addons.quarkus.camel.runtime;
+@@ -21,11 +21,11 @@ package org.kie.kogito.addons.quarkus.camel.runtime;
  import java.util.Collections;
  import java.util.Map;
  
@@ -629,10 +644,10 @@ index ba7c3c6366..e5051b4a5e 100644
  import org.apache.camel.ProducerTemplate;
  import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
 diff --git a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
-index 2da06ff74e..b76f6aa336 100644
+index 92e74b341e..e8858be001 100644
 --- a/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
 +++ b/quarkus/addons/camel/runtime/src/main/java/org/kie/kogito/addons/quarkus/camel/runtime/CamelCustomWorkItemHandlerConfig.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.kie.kogito.addons.quarkus.camel.runtime;
  
@@ -647,14 +662,10 @@ index 2da06ff74e..b76f6aa336 100644
  
  @ApplicationScoped
 diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
-index edb289a8ee..2ce6d0582e 100644
+index fd6a0d07b4..6d3c573c6b 100644
 --- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
 +++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/MessageDecoratorProvider.java
-@@ -15,13 +15,13 @@
-  */
- package org.kie.kogito.addon.quarkus.common.reactive.messaging;
- 
-+import jakarta.annotation.PostConstruct;
+@@ -21,11 +21,11 @@ package org.kie.kogito.addon.quarkus.common.reactive.messaging;
  import java.util.Collection;
  import java.util.stream.Collectors;
  
@@ -666,13 +677,43 @@ index edb289a8ee..2ce6d0582e 100644
 +import jakarta.enterprise.inject.Instance;
 +import jakarta.inject.Inject;
  
++import jakarta.annotation.PostConstruct;
+ import org.eclipse.microprofile.reactive.messaging.Message;
+ 
+ /**
+diff --git a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
+index 4ff805195c..ec9a557dbc 100644
+--- a/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
++++ b/quarkus/addons/common/reactive-messaging/src/main/java/org/kie/kogito/addon/quarkus/common/reactive/messaging/http/CloudEventHttpOutgoingDecorator.java
+@@ -18,7 +18,7 @@
+  */
+ package org.kie.kogito.addon.quarkus.common.reactive.messaging.http;
+ 
+-import javax.ws.rs.core.HttpHeaders;
++import jakarta.ws.rs.core.HttpHeaders;
+ 
  import org.eclipse.microprofile.reactive.messaging.Message;
+ import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator;
+diff --git a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
+index 72b4d3200a..56d82c3462 100644
+--- a/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
++++ b/quarkus/addons/common/reactive-messaging/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/http/CloudEventHttpOutgoingDecoratorTest.java
+@@ -21,8 +21,8 @@ package org.kie.kogito.addon.quarkus.messaging.common.message.http;
+ import java.util.Collections;
+ import java.util.Optional;
+ 
+-import javax.enterprise.inject.Produces;
+-import javax.inject.Inject;
++import jakarta.enterprise.inject.Produces;
++import jakarta.inject.Inject;
  
+ import org.eclipse.microprofile.reactive.messaging.Message;
+ import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/events/decisions/runtime/pom.xml b/quarkus/addons/events/decisions/runtime/pom.xml
-index 8eb1c309cd..575ee45565 100644
+index f4258b1d32..099c4dba4a 100644
 --- a/quarkus/addons/events/decisions/runtime/pom.xml
 +++ b/quarkus/addons/events/decisions/runtime/pom.xml
-@@ -31,7 +31,7 @@
+@@ -51,7 +51,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -682,10 +723,10 @@ index 8eb1c309cd..575ee45565 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
-index 32da3571ba..e282deadbe 100644
+index e2a5255c05..fbd6dd44a9 100644
 --- a/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
 +++ b/quarkus/addons/events/decisions/runtime/src/main/java/org/kie/kogito/eventdriven/decision/QuarkusEventDrivenDecisionController.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.eventdriven.decision;
  
@@ -697,10 +738,10 @@ index 32da3571ba..e282deadbe 100644
  import org.kie.kogito.config.ConfigBean;
  import org.kie.kogito.decision.DecisionModels;
 diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml
-index 5421d4a96e..1594de9f17 100644
+index 031919c65e..ff5f1c70c6 100644
 --- a/quarkus/addons/events/mongodb/runtime/pom.xml
 +++ b/quarkus/addons/events/mongodb/runtime/pom.xml
-@@ -69,7 +69,7 @@
+@@ -89,7 +89,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -710,11 +751,11 @@ index 5421d4a96e..1594de9f17 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
-index ed54ccd623..0314f29b7c 100644
+index acc045bf57..da585bf0b1 100644
 --- a/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
 +++ b/quarkus/addons/events/mongodb/runtime/src/main/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisher.java
-@@ -16,10 +16,10 @@
- 
+@@ -18,10 +18,10 @@
+  */
  package org.kie.kogito.events.mongodb;
  
 -import javax.annotation.PostConstruct;
@@ -728,10 +769,10 @@ index ed54ccd623..0314f29b7c 100644
  import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
  
 diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
-index 8c973f4511..eabd6236a7 100644
+index ad167e7166..67a270cb3e 100644
 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
 +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockMongoClient.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.events.mongodb;
+@@ -20,7 +20,7 @@ package org.kie.kogito.events.mongodb;
  
  import java.util.List;
  
@@ -741,11 +782,11 @@ index 8c973f4511..eabd6236a7 100644
  import org.bson.Document;
  import org.bson.conversions.Bson;
 diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
-index 183341ce03..44ebd72cb1 100644
+index e00cebbfce..ad81feee51 100644
 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
 +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/MockTransactionManager.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.events.mongodb;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -754,11 +795,11 @@ index 183341ce03..44ebd72cb1 100644
  import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
  
 diff --git a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
-index 2976a44a1e..a0ea0200a7 100644
+index 9d95cf4466..733fa74cfc 100644
 --- a/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
 +++ b/quarkus/addons/events/mongodb/runtime/src/test/java/org/kie/kogito/events/mongodb/QuarkusMongoDBEventPublisherTest.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.events.mongodb;
  
 -import javax.inject.Inject;
@@ -767,10 +808,10 @@ index 2976a44a1e..a0ea0200a7 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 diff --git a/quarkus/addons/events/predictions/runtime/pom.xml b/quarkus/addons/events/predictions/runtime/pom.xml
-index caffff49de..4da6d6518d 100644
+index f74c628f89..7884ec294f 100644
 --- a/quarkus/addons/events/predictions/runtime/pom.xml
 +++ b/quarkus/addons/events/predictions/runtime/pom.xml
-@@ -31,7 +31,7 @@
+@@ -51,7 +51,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -780,10 +821,10 @@ index caffff49de..4da6d6518d 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
-index 1d0a6ec2a6..b5714777f2 100644
+index b1b9b3849b..bb8854515d 100644
 --- a/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
 +++ b/quarkus/addons/events/predictions/runtime/src/main/java/org/kie/kogito/eventdriven/predictions/QuarkusEventDrivenPredictionsController.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.eventdriven.predictions;
  
@@ -795,10 +836,10 @@ index 1d0a6ec2a6..b5714777f2 100644
  import org.kie.kogito.config.ConfigBean;
  import org.kie.kogito.event.EventEmitter;
 diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml
-index c128d47b8e..6eedd46d9d 100644
+index 6f566021af..ffbd211d38 100644
 --- a/quarkus/addons/events/process/runtime/pom.xml
 +++ b/quarkus/addons/events/process/runtime/pom.xml
-@@ -68,7 +68,7 @@
+@@ -92,7 +92,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -808,10 +849,10 @@ index c128d47b8e..6eedd46d9d 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
-index 90e517d759..3eeb7c902e 100644
+index 225f55eb4e..e5510c58bc 100644
 --- a/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
 +++ b/quarkus/addons/events/process/runtime/src/main/java/org/kie/kogito/events/process/ReactiveMessagingEventPublisher.java
-@@ -20,11 +20,11 @@ import java.util.Optional;
+@@ -22,11 +22,11 @@ import java.util.Collection;
  import java.util.concurrent.CompletableFuture;
  import java.util.concurrent.CompletionStage;
  
@@ -824,14 +865,14 @@ index 90e517d759..3eeb7c902e 100644
 +import jakarta.inject.Singleton;
  
 +import jakarta.annotation.PostConstruct;
- import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.eclipse.microprofile.reactive.messaging.Channel;
- import org.eclipse.microprofile.reactive.messaging.Emitter;
+ import org.eclipse.microprofile.reactive.messaging.Message;
+ import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
 diff --git a/quarkus/addons/events/rules/runtime/pom.xml b/quarkus/addons/events/rules/runtime/pom.xml
-index 99b5870071..c74f928495 100644
+index 756fb2d4dd..5855e1cafc 100644
 --- a/quarkus/addons/events/rules/runtime/pom.xml
 +++ b/quarkus/addons/events/rules/runtime/pom.xml
-@@ -31,7 +31,7 @@
+@@ -51,7 +51,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -841,10 +882,10 @@ index 99b5870071..c74f928495 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
-index 777439455a..3337ba231d 100644
+index 4b34ff5589..1f261d8900 100644
 --- a/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
 +++ b/quarkus/addons/events/rules/runtime/src/main/java/org/kie/kogito/eventdriven/rules/QuarkusEventDrivenRulesController.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.eventdriven.rules;
  
@@ -856,10 +897,10 @@ index 777439455a..3337ba231d 100644
  import org.kie.kogito.config.ConfigBean;
  import org.kie.kogito.event.EventEmitter;
 diff --git a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
-index 6fbf975d41..9b3599f562 100644
+index c8e17b2846..dd02b78b17 100644
 --- a/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
 +++ b/quarkus/addons/explainability/integration-tests/src/test/java/org/kie/kogito/explainability/QuarkusExplainableResourceIT.java
-@@ -19,8 +19,8 @@ import java.util.HashMap;
+@@ -22,8 +22,8 @@ import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
@@ -871,10 +912,10 @@ index 6fbf975d41..9b3599f562 100644
  import org.hamcrest.Matchers;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml
-index 8fd4cfcc9e..ab80329157 100644
+index 703f894e52..4789686363 100644
 --- a/quarkus/addons/explainability/runtime/pom.xml
 +++ b/quarkus/addons/explainability/runtime/pom.xml
-@@ -65,7 +65,7 @@
+@@ -85,7 +85,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -884,10 +925,10 @@ index 8fd4cfcc9e..ab80329157 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
-index fac920d739..cdbc8756bc 100644
+index ae72a32581..1b3205e834 100644
 --- a/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
 +++ b/quarkus/addons/explainability/runtime/src/main/java/org/kie/kogito/explainability/QuarkusExplainableResource.java
-@@ -17,13 +17,13 @@ package org.kie.kogito.explainability;
+@@ -20,13 +20,13 @@ package org.kie.kogito.explainability;
  
  import java.util.List;
  
@@ -909,10 +950,10 @@ index fac920d739..cdbc8756bc 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.explainability.model.PredictInput;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
-index 4cf954e2df..02a3964c18 100644
+index 55d400e440..52224a65e5 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
-@@ -77,7 +77,7 @@
+@@ -97,7 +97,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -922,10 +963,10 @@ index 4cf954e2df..02a3964c18 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
-index cd3dc1e86d..177be0b153 100644
+index 5aba7abd79..1ed2dc4ae9 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalog.java
-@@ -21,8 +21,8 @@ import java.util.Optional;
+@@ -24,8 +24,8 @@ import java.util.Optional;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.function.Function;
  
@@ -937,10 +978,10 @@ index cd3dc1e86d..177be0b153 100644
  import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
  import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogKey;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
-index 609b486015..a76022a325 100644
+index 104e80d302..9660edf455 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeClientProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  
@@ -954,10 +995,10 @@ index 609b486015..a76022a325 100644
  import io.fabric8.knative.client.KnativeClient;
  import io.fabric8.kubernetes.client.KubernetesClient;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
-index ae4e02433a..067e27b670 100644
+index dd818d9c9b..0220c39da1 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscovery.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,8 +21,8 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -969,10 +1010,10 @@ index ae4e02433a..067e27b670 100644
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
-index 407230e76d..c119b1b4ef 100644
+index 2900f610eb..9e53d7c6f9 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscovery.java
-@@ -19,8 +19,8 @@ import java.net.URI;
+@@ -22,8 +22,8 @@ import java.net.URI;
  import java.util.Optional;
  import java.util.function.Supplier;
  
@@ -984,10 +1025,10 @@ index 407230e76d..c119b1b4ef 100644
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
-index f2193da323..672ee93723 100644
+index 4299a6bd55..7f7ae2f66f 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftResourceDiscovery.java
-@@ -20,8 +20,8 @@ import java.net.URI;
+@@ -23,8 +23,8 @@ import java.net.URI;
  import java.util.Optional;
  import java.util.function.Supplier;
  
@@ -999,10 +1040,10 @@ index f2193da323..672ee93723 100644
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
-index 0f633000df..fbce47a8d7 100644
+index b895f67362..b5cde6b776 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/DeploymentUtilsTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -1012,10 +1053,10 @@ index 0f633000df..fbce47a8d7 100644
  import org.junit.jupiter.api.Test;
  
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
-index 9e3d66eb77..2c1751bc6e 100644
+index e9ed6cb6db..844cb509b8 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/Fabric8KubernetesServiceCatalogTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  
@@ -1025,10 +1066,10 @@ index 9e3d66eb77..2c1751bc6e 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
-index dfd5f8c3c3..1005e06c49 100644
+index 8a2ed6392d..338a337b5b 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/IngressUtilsTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -1038,10 +1079,10 @@ index dfd5f8c3c3..1005e06c49 100644
  import org.junit.jupiter.api.Test;
  
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
-index e42ec2cf50..b6a8597679 100644
+index 0c6eb35452..45b8fd3fa9 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KnativeServiceDiscoveryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -1051,10 +1092,10 @@ index e42ec2cf50..b6a8597679 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.addons.quarkus.k8s.test.utils.KnativeResourceDiscoveryTestUtil;
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
-index 8168d4786f..39f8409005 100644
+index b88566787f..f5c23f0a5e 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/KubernetesResourceDiscoveryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -1064,10 +1105,10 @@ index 8168d4786f..39f8409005 100644
  import org.junit.jupiter.api.Test;
  
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
-index 76069c7866..ff6157d7c9 100644
+index 960436dc1f..d25271fdb3 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/OpenShiftServiceDiscoveryTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -1077,10 +1118,10 @@ index 76069c7866..ff6157d7c9 100644
  import org.junit.jupiter.api.Test;
  
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
-index 2a2dfea3f6..228df7dbcc 100644
+index 2a70e3dfd0..7337ccc492 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/PodUtilsTest.java
-@@ -19,7 +19,7 @@ import java.net.URI;
+@@ -22,7 +22,7 @@ import java.net.URI;
  import java.util.Map;
  import java.util.Optional;
  
@@ -1090,10 +1131,10 @@ index 2a2dfea3f6..228df7dbcc 100644
  import org.junit.jupiter.api.Test;
  
 diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
-index d5584edc3d..8edc43c794 100644
+index 525d840a44..68e1a86c4b 100644
 --- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
 +++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/fabric8/k8s/service/catalog/StatefulSetUtilsTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.fabric8.k8s.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
@@ -1103,11 +1144,11 @@ index d5584edc3d..8edc43c794 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
-index cdd80a9626..dbb1159652 100644
+index 2d07f598e0..22fa2c4b4c 100644
 --- a/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
 +++ b/quarkus/addons/jobs/common/rest-callback/src/main/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResource.java
-@@ -16,17 +16,17 @@
- 
+@@ -18,17 +18,17 @@
+  */
  package org.kie.kogito.jobs.quarkus.common;
  
 -import javax.enterprise.inject.Instance;
@@ -1136,10 +1177,10 @@ index cdd80a9626..dbb1159652 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.jobs.api.JobCallbackPayload;
 diff --git a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
-index 5fcd29c913..cc568d7493 100644
+index 0ba367524d..e65c671c84 100644
 --- a/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
 +++ b/quarkus/addons/jobs/common/rest-callback/src/test/java/org/kie/kogito/jobs/quarkus/common/CallbackJobsServiceResourceTest.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.quarkus.common;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.quarkus.common;
  
  import java.util.Optional;
  
@@ -1150,7 +1191,7 @@ index 5fcd29c913..cc568d7493 100644
  
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
-@@ -36,9 +36,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
+@@ -38,9 +38,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
  
  import com.fasterxml.jackson.databind.ObjectMapper;
  
@@ -1164,10 +1205,10 @@ index 5fcd29c913..cc568d7493 100644
  import static org.mockito.ArgumentMatchers.any;
  import static org.mockito.Mockito.doReturn;
 diff --git a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
-index ad641090c9..2972fb53c9 100644
+index ef684cd973..d566bd35fa 100644
 --- a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
 +++ b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
-@@ -82,7 +82,7 @@
+@@ -102,7 +102,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1177,10 +1218,10 @@ index ad641090c9..2972fb53c9 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
-index d3a558198f..6a7ea79bdf 100644
+index d11d0b35c7..07796c390f 100644
 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
 +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/main/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsService.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.knative.eventing.quarkus;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.knative.eventing.quarkus;
  
  import java.net.URI;
  
@@ -1192,10 +1233,10 @@ index d3a558198f..6a7ea79bdf 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.eclipse.microprofile.reactive.messaging.Channel;
 diff --git a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
-index c4da02e7fa..a1d9e27e8a 100644
+index 74bd0c9b92..c37446e07e 100644
 --- a/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
 +++ b/quarkus/addons/jobs/knative-eventing/runtime/src/test/java/org/kie/kogito/jobs/knative/eventing/quarkus/KnativeEventingJobsServiceTest.java
-@@ -20,7 +20,7 @@ import java.net.URI;
+@@ -22,7 +22,7 @@ import java.net.URI;
  import java.util.List;
  import java.util.Optional;
  
@@ -1205,10 +1246,10 @@ index c4da02e7fa..a1d9e27e8a 100644
  import org.eclipse.microprofile.reactive.messaging.Emitter;
  import org.eclipse.microprofile.reactive.messaging.Message;
 diff --git a/quarkus/addons/jobs/management/runtime/pom.xml b/quarkus/addons/jobs/management/runtime/pom.xml
-index a0f478bb08..59d24ff4db 100644
+index 6f3f9015b5..9155985449 100644
 --- a/quarkus/addons/jobs/management/runtime/pom.xml
 +++ b/quarkus/addons/jobs/management/runtime/pom.xml
-@@ -90,7 +90,7 @@
+@@ -110,7 +110,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1218,11 +1259,11 @@ index a0f478bb08..59d24ff4db 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
-index 9586b68e7c..ebfd4516dd 100644
+index 6b14088785..7216595018 100644
 --- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
 +++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/AddonObjectMapperCustomizer.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.jobs.management.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -1231,10 +1272,10 @@ index 9586b68e7c..ebfd4516dd 100644
  import com.fasterxml.jackson.databind.ObjectMapper;
  
 diff --git a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
-index 61aed9a036..0e7184b72f 100644
+index fe8625f833..1dd1ffb971 100644
 --- a/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
 +++ b/quarkus/addons/jobs/management/runtime/src/main/java/org/kie/kogito/jobs/management/quarkus/VertxJobsService.java
-@@ -17,11 +17,11 @@ package org.kie.kogito.jobs.management.quarkus;
+@@ -20,11 +20,11 @@ package org.kie.kogito.jobs.management.quarkus;
  
  import java.net.URI;
  
@@ -1251,10 +1292,10 @@ index 61aed9a036..0e7184b72f 100644
  import org.kie.kogito.jobs.ProcessInstanceJobDescription;
  import org.kie.kogito.jobs.ProcessJobDescription;
 diff --git a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
-index 9801125c62..c6e24c6e37 100644
+index 09e8ba5335..8dd932b3b3 100644
 --- a/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
 +++ b/quarkus/addons/jobs/management/runtime/src/test/java/org/kie/kogito/jobs/management/quarkus/VertxJobsServiceTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.jobs.management.quarkus;
  
@@ -1264,10 +1305,10 @@ index 9801125c62..c6e24c6e37 100644
  import org.junit.jupiter.api.Test;
  import org.junit.jupiter.api.extension.ExtendWith;
 diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml b/quarkus/addons/jobs/messaging/runtime/pom.xml
-index 0e91be1cfc..56c0cea7ed 100644
+index b6ac66d31f..b957a95bc3 100644
 --- a/quarkus/addons/jobs/messaging/runtime/pom.xml
 +++ b/quarkus/addons/jobs/messaging/runtime/pom.xml
-@@ -87,7 +87,7 @@
+@@ -107,7 +107,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1277,10 +1318,10 @@ index 0e91be1cfc..56c0cea7ed 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
-index 9894ced190..7052f46fe3 100644
+index 0a0c817288..75a64911a2 100644
 --- a/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
 +++ b/quarkus/addons/jobs/messaging/runtime/src/main/java/org/kie/kogito/jobs/messaging/quarkus/ReactiveMessagingJobsService.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.jobs.messaging.quarkus;
+@@ -20,8 +20,8 @@ package org.kie.kogito.jobs.messaging.quarkus;
  
  import java.net.URI;
  
@@ -1292,10 +1333,10 @@ index 9894ced190..7052f46fe3 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.eclipse.microprofile.reactive.messaging.Channel;
 diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml
-index 8b6c805b2c..e500ed07c1 100644
+index 0cd47c2bb5..35d4471ec1 100644
 --- a/quarkus/addons/knative/eventing/runtime/pom.xml
 +++ b/quarkus/addons/knative/eventing/runtime/pom.xml
-@@ -54,7 +54,7 @@
+@@ -74,7 +74,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1305,10 +1346,10 @@ index 8b6c805b2c..e500ed07c1 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
-index 4153a39970..dd02bb5268 100644
+index 93acac0969..61ab1bee5a 100644
 --- a/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
 +++ b/quarkus/addons/knative/eventing/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/KSinkInjectionHealthCheck.java
-@@ -21,7 +21,7 @@ import java.net.URI;
+@@ -23,7 +23,7 @@ import java.net.URI;
  import java.net.URISyntaxException;
  import java.net.UnknownHostException;
  
@@ -1318,10 +1359,10 @@ index 4153a39970..dd02bb5268 100644
  import org.eclipse.microprofile.health.HealthCheck;
  import org.eclipse.microprofile.health.HealthCheckResponse;
 diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml
-index d5919b1d46..a6c31368b4 100644
+index ada7a01fd7..f2aa7bc834 100644
 --- a/quarkus/addons/knative/serving/runtime/pom.xml
 +++ b/quarkus/addons/knative/serving/runtime/pom.xml
-@@ -94,7 +94,7 @@
+@@ -114,7 +114,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -1331,10 +1372,10 @@ index d5919b1d46..a6c31368b4 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
-index e78681c3b8..74ec97bc65 100644
+index c42d2dccf5..71f9b5abc4 100644
 --- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
 +++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerConfig.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
  
@@ -1349,10 +1390,10 @@ index e78681c3b8..74ec97bc65 100644
  
  @ApplicationScoped
 diff --git a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
-index 3e88d6676e..cdd89c7698 100644
+index 4a9a4e9c8e..9a3b12dbf0 100644
 --- a/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
 +++ b/quarkus/addons/knative/serving/runtime/src/main/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/KnativeWorkItemHandlerProducer.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
  
@@ -1364,10 +1405,10 @@ index 3e88d6676e..cdd89c7698 100644
  import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
  import org.kogito.workitem.rest.RestWorkItemHandlerUtils;
 diff --git a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
-index 71f9225df1..cb3a8f09ff 100644
+index e2ac72eb39..dfa401d862 100644
 --- a/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
 +++ b/quarkus/addons/knative/serving/runtime/src/test/java/org/kie/kogito/addons/quarkus/knative/serving/customfunctions/WebClientProducer.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.addons.quarkus.knative.serving.customfunctions;
  
@@ -1379,10 +1420,10 @@ index 71f9225df1..cb3a8f09ff 100644
  import io.vertx.ext.web.client.WebClientOptions;
  import io.vertx.mutiny.core.Vertx;
 diff --git a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
-index e1549df41b..77a4491cbd 100644
+index 48771f86d1..84fa677456 100644
 --- a/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
 +++ b/quarkus/addons/kubernetes/deployment/src/test/java/org/kie/kogito/addons/quarkus/kubernetes/KubernetesAddOnTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.addons.quarkus.kubernetes;
  
@@ -1392,10 +1433,10 @@ index e1549df41b..77a4491cbd 100644
  import org.jboss.shrinkwrap.api.ShrinkWrap;
  import org.jboss.shrinkwrap.api.spec.JavaArchive;
 diff --git a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
-index abcbda4799..dd6c4a130a 100644
+index b9f49ef000..ddc14ab45d 100644
 --- a/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
 +++ b/quarkus/addons/kubernetes/integration-tests/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/Foo.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package org.kie.kogito.addons.quarkus.kubernetes;
  
@@ -1413,10 +1454,10 @@ index abcbda4799..dd6c4a130a 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  
 diff --git a/quarkus/addons/kubernetes/runtime/pom.xml b/quarkus/addons/kubernetes/runtime/pom.xml
-index 32ed7e88c9..f9df0a85c5 100644
+index 5a8d6944e1..879c831226 100644
 --- a/quarkus/addons/kubernetes/runtime/pom.xml
 +++ b/quarkus/addons/kubernetes/runtime/pom.xml
-@@ -75,7 +75,7 @@
+@@ -95,7 +95,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1426,10 +1467,10 @@ index 32ed7e88c9..f9df0a85c5 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
-index 6c9aa98079..2ee0bfca5d 100644
+index 8f60636c4a..3260bfb14b 100644
 --- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
 +++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointCallerProducer.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package org.kie.kogito.addons.quarkus.k8s;
  
@@ -1447,10 +1488,10 @@ index 6c9aa98079..2ee0bfca5d 100644
  import org.kie.kogito.addons.k8s.EndpointDiscovery;
  import org.kie.kogito.addons.quarkus.k8s.workitems.QuarkusDiscoveredEndpointCaller;
 diff --git a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
-index 8e3a24887f..4471230cf3 100644
+index 631a72cb34..ec3a3050fd 100644
 --- a/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
 +++ b/quarkus/addons/kubernetes/runtime/src/main/java/org/kie/kogito/addons/quarkus/k8s/EndpointDiscoveryProducer.java
-@@ -15,12 +15,12 @@
+@@ -18,12 +18,12 @@
   */
  package org.kie.kogito.addons.quarkus.k8s;
  
@@ -1470,10 +1511,10 @@ index 8e3a24887f..4471230cf3 100644
  import org.kie.kogito.addons.k8s.KnativeRouteEndpointDiscovery;
  import org.kie.kogito.addons.k8s.KubernetesServiceEndpointDiscovery;
 diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
-index bab6850827..ff8268bd65 100644
+index 3bc6ad7928..e3979a210a 100644
 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
 +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KnativeRouteEndpointDiscoveryTest.java
-@@ -22,7 +22,7 @@ import java.util.List;
+@@ -25,7 +25,7 @@ import java.util.List;
  import java.util.Map;
  import java.util.Optional;
  
@@ -1483,10 +1524,10 @@ index bab6850827..ff8268bd65 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
-index 78e7e9818c..1e9cabca8c 100644
+index 901f7dfe31..9ccb178844 100644
 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
 +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/KubernetesServiceEndpointDiscoveryTest.java
-@@ -23,8 +23,8 @@ import java.util.List;
+@@ -26,8 +26,8 @@ import java.util.List;
  import java.util.Map;
  import java.util.Optional;
  
@@ -1498,10 +1539,10 @@ index 78e7e9818c..1e9cabca8c 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.addons.k8s.Endpoint;
 diff --git a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
-index 21bfd13d42..ab9286b986 100644
+index 90d5fd773e..291f36b1d9 100644
 --- a/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
 +++ b/quarkus/addons/kubernetes/runtime/src/test/java/org/kie/kogito/addons/quarkus/k8s/config/KubeDiscoveryConfigCacheUpdaterTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.addons.quarkus.k8s.config;
+@@ -20,7 +20,7 @@ package org.kie.kogito.addons.quarkus.k8s.config;
  
  import java.net.URI;
  
@@ -1511,10 +1552,10 @@ index 21bfd13d42..ab9286b986 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/mail/runtime/pom.xml b/quarkus/addons/mail/runtime/pom.xml
-index af87d750fe..d967d932c6 100644
+index 02b09d26b6..b7b57a6eea 100644
 --- a/quarkus/addons/mail/runtime/pom.xml
 +++ b/quarkus/addons/mail/runtime/pom.xml
-@@ -41,7 +41,7 @@
+@@ -61,7 +61,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1524,10 +1565,10 @@ index af87d750fe..d967d932c6 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
-index 0aa6799198..e68eb3ee78 100644
+index 90af309c9a..f776accfdd 100644
 --- a/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
 +++ b/quarkus/addons/mail/runtime/src/main/java/org/kie/kogito/mail/QuarkusMailSender.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.mail;
+@@ -20,8 +20,8 @@ package org.kie.kogito.mail;
  
  import java.util.Arrays;
  
@@ -1537,12 +1578,12 @@ index 0aa6799198..e68eb3ee78 100644
 +import jakarta.inject.Inject;
  
  import org.eclipse.microprofile.reactive.messaging.Incoming;
- import org.kie.kogito.event.process.UserTaskDeadlineDataEvent;
+ import org.kie.kogito.event.usertask.UserTaskInstanceDeadlineDataEvent;
 diff --git a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
-index ebffca8e67..9b3c9334f8 100644
+index 0489f1ed11..8b6d4e02e8 100644
 --- a/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
 +++ b/quarkus/addons/mail/runtime/src/test/java/org/kie/kogito/mail/QuarkusMailSenderTest.java
-@@ -19,7 +19,7 @@ import java.util.HashMap;
+@@ -22,7 +22,7 @@ import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
@@ -1552,10 +1593,10 @@ index ebffca8e67..9b3c9334f8 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml b/quarkus/addons/marshallers/avro/runtime/pom.xml
-index 8e71b03c4e..b9cadff3ae 100644
+index 8ad177a492..fe6df4d7bb 100644
 --- a/quarkus/addons/marshallers/avro/runtime/pom.xml
 +++ b/quarkus/addons/marshallers/avro/runtime/pom.xml
-@@ -27,7 +27,7 @@
+@@ -47,7 +47,7 @@
      <plugins>
         <plugin>
          <groupId>io.quarkus</groupId>
@@ -1565,10 +1606,10 @@ index 8e71b03c4e..b9cadff3ae 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
-index 06a804316f..f4d14b6cd9 100644
+index 8202f616cc..31890f8776 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/AbstractQuarkusCloudEventEmitter.java
-@@ -20,7 +20,7 @@ import java.io.UncheckedIOException;
+@@ -23,7 +23,7 @@ import java.io.UncheckedIOException;
  import java.util.concurrent.CompletableFuture;
  import java.util.concurrent.CompletionStage;
  
@@ -1578,10 +1619,10 @@ index 06a804316f..f4d14b6cd9 100644
  import org.eclipse.microprofile.reactive.messaging.Message;
  import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecoratorProvider;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
-index 9c2a0d8000..2b0f7c6b8d 100644
+index e0673dc70f..a3ee7b4f1e 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressureKogitoEmitter.java
-@@ -19,7 +19,7 @@ import java.util.HashMap;
+@@ -22,7 +22,7 @@ import java.util.HashMap;
  import java.util.Map;
  import java.util.Set;
  
@@ -1591,10 +1632,10 @@ index 9c2a0d8000..2b0f7c6b8d 100644
  import io.vertx.core.impl.ConcurrentHashSet;
  
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
-index ebe8294f84..e694e58df7 100644
+index de9571dce8..a8ff460ec6 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/BackpressurePublisherDecorator.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.addon.quarkus.messaging.common;
  
@@ -1606,10 +1647,10 @@ index ebe8294f84..e694e58df7 100644
  import org.eclipse.microprofile.reactive.messaging.Message;
  import org.slf4j.Logger;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java
-index 9a553b6a72..16377d7b76 100644
+index 2b4930eab7..52912375ef 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/ChannelFormat.java
-@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
+@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.lang.annotation.Target;
  
@@ -1619,10 +1660,10 @@ index 9a553b6a72..16377d7b76 100644
  @Qualifier
  @Retention(RetentionPolicy.RUNTIME)
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
-index ffbeef4978..e45574eecd 100644
+index 6f57ee50c8..e7a795bf2a 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventMarshallerProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.addon.quarkus.messaging.common;
  
@@ -1636,10 +1677,10 @@ index ffbeef4978..e45574eecd 100644
  import org.kie.kogito.event.CloudEventMarshaller;
  import org.kie.kogito.event.EventMarshaller;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
-index cb832147bd..babdfd56da 100644
+index b5c2849f46..5dfaa6901c 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/EventUnmarshallerProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.addon.quarkus.messaging.common;
  
@@ -1653,10 +1694,10 @@ index cb832147bd..babdfd56da 100644
  import org.kie.kogito.event.CloudEventUnmarshallerFactory;
  import org.kie.kogito.event.EventUnmarshaller;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
-index 9da769d9bf..eed1f92619 100644
+index d523329561..9e19b484f2 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusEventExecutorServiceFactory.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.addon.quarkus.messaging.common;
+@@ -20,8 +20,8 @@ package org.kie.kogito.addon.quarkus.messaging.common;
  
  import java.util.concurrent.ExecutorService;
  
@@ -1668,10 +1709,10 @@ index 9da769d9bf..eed1f92619 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.event.EventExecutorServiceFactory;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
-index 016603c22b..1347678dea 100644
+index 2d5691cea4..48d018ba79 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusKogitoExtensionInitializer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.addon.quarkus.messaging.common;
  
@@ -1684,10 +1725,10 @@ index 016603c22b..1347678dea 100644
  import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension;
  import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
-index bdea116ebf..c3b4af4c7d 100644
+index ed9e3b9d78..b0867bc46a 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusMessageConsumer.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.addon.quarkus.messaging.common;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addon.quarkus.messaging.common;
  import java.util.Set;
  import java.util.concurrent.ExecutorService;
  
@@ -1696,7 +1737,7 @@ index bdea116ebf..c3b4af4c7d 100644
  
  import org.kie.kogito.Application;
  import org.kie.kogito.Model;
-@@ -46,7 +46,7 @@ public abstract class QuarkusMessageConsumer<M extends Model, D> extends Abstrac
+@@ -49,7 +49,7 @@ public abstract class QuarkusMessageConsumer<M extends Model, D> extends Abstrac
          init(application, process, trigger, eventReceiver, objectClass, processService, executor, correlation);
      }
  
@@ -1706,10 +1747,10 @@ index bdea116ebf..c3b4af4c7d 100644
          executor.shutdownNow();
      }
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
-index a955059306..79f26807c6 100644
+index 7bf474983f..17076ecabd 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicDiscovery.java
-@@ -19,9 +19,9 @@ import java.util.ArrayList;
+@@ -22,9 +22,9 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.Optional;
  
@@ -1722,11 +1763,11 @@ index a955059306..79f26807c6 100644
  import org.kie.kogito.addon.cloudevents.AbstractTopicDiscovery;
  import org.kie.kogito.event.ChannelType;
 diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
-index eb4b1234d8..f71582eba9 100644
+index 04e400127a..98249088ef 100644
 --- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
 +++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/QuarkusTopicsInformationResource.java
-@@ -16,15 +16,15 @@
- 
+@@ -18,15 +18,15 @@
+  */
  package org.kie.kogito.addon.quarkus.messaging.common;
  
 -import javax.annotation.PostConstruct;
@@ -1737,7 +1778,6 @@ index eb4b1234d8..f71582eba9 100644
 -import javax.ws.rs.Path;
 -import javax.ws.rs.Produces;
 -import javax.ws.rs.core.MediaType;
--
 +import jakarta.enterprise.context.ApplicationScoped;
 +import jakarta.enterprise.inject.Instance;
 +import jakarta.inject.Inject;
@@ -1745,12 +1785,12 @@ index eb4b1234d8..f71582eba9 100644
 +import jakarta.ws.rs.Path;
 +import jakarta.ws.rs.Produces;
 +import jakarta.ws.rs.core.MediaType;
-+
+ 
 +import jakarta.annotation.PostConstruct;
  import org.kie.kogito.addon.cloudevents.AbstractTopicsInformationResource;
  import org.kie.kogito.event.TopicDiscovery;
  import org.kie.kogito.event.cloudevents.CloudEventMeta;
-@@ -46,7 +46,7 @@ public class QuarkusTopicsInformationResource extends AbstractTopicsInformationR
+@@ -48,7 +48,7 @@ public class QuarkusTopicsInformationResource extends AbstractTopicsInformationR
  
      @GET()
      @Produces(MediaType.APPLICATION_JSON)
@@ -1760,39 +1800,11 @@ index eb4b1234d8..f71582eba9 100644
 +        return jakarta.ws.rs.core.Response.ok(getTopicList()).build();
      }
  }
-diff --git a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java
-index 53c35657ad..75b74d2c89 100644
---- a/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java
-+++ b/quarkus/addons/messaging/common/src/main/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecorator.java
-@@ -15,7 +15,7 @@
-  */
- package org.kie.kogito.addon.quarkus.messaging.common.message;
- 
--import javax.ws.rs.core.HttpHeaders;
-+import jakarta.ws.rs.core.HttpHeaders;
- 
- import org.eclipse.microprofile.reactive.messaging.Message;
- import org.kie.kogito.addon.quarkus.common.reactive.messaging.MessageDecorator;
-diff --git a/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java b/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java
-index 871d017e77..8715facb83 100644
---- a/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java
-+++ b/quarkus/addons/messaging/common/src/test/java/org/kie/kogito/addon/quarkus/messaging/common/message/CloudEventHttpOutgoingDecoratorTest.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.addon.quarkus.messaging.common.message;
- import java.util.Collections;
- import java.util.Optional;
- 
--import javax.enterprise.inject.Produces;
--import javax.inject.Inject;
-+import jakarta.enterprise.inject.Produces;
-+import jakarta.inject.Inject;
- 
- import org.eclipse.microprofile.reactive.messaging.Message;
- import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java
-index 41974d80c5..c0758ca7d7 100644
+index 9231080865..5e181d11e1 100644
 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java
 +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/ChannelQualifierQuarkusTemplate.java
-@@ -20,7 +20,7 @@ import java.lang.annotation.Retention;
+@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.lang.annotation.Target;
  
@@ -1802,10 +1814,10 @@ index 41974d80c5..c0758ca7d7 100644
  @Qualifier
  @Retention(RetentionPolicy.RUNTIME)
 diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
-index 803f621abf..c7d7e37afa 100644
+index c327facbc7..f3bed99ca8 100644
 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
 +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventEmitterQuarkusTemplate.java
-@@ -16,9 +16,8 @@
+@@ -19,9 +19,8 @@
  package $Package$;
  
  
@@ -1818,10 +1830,10 @@ index 803f621abf..c7d7e37afa 100644
  import org.eclipse.microprofile.reactive.messaging.Channel;
  import org.eclipse.microprofile.reactive.messaging.Emitter;
 diff --git a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
-index 8a23525327..acbd1c48ca 100644
+index d08fb836f3..ab37c6836a 100644
 --- a/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
 +++ b/quarkus/addons/messaging/deployment/src/main/resources/class-templates/EventReceiverQuarkusTemplate.java
-@@ -18,12 +18,11 @@ package $Package$;
+@@ -21,12 +21,11 @@ package $Package$;
  
  import java.util.concurrent.CompletionStage;
  
@@ -1837,10 +1849,10 @@ index 8a23525327..acbd1c48ca 100644
  
  import io.quarkus.runtime.Startup;
 diff --git a/quarkus/addons/messaging/runtime/pom.xml b/quarkus/addons/messaging/runtime/pom.xml
-index d5a81c2cef..b80ef76384 100644
+index 5e5774200d..c5fb3af1f8 100644
 --- a/quarkus/addons/messaging/runtime/pom.xml
 +++ b/quarkus/addons/messaging/runtime/pom.xml
-@@ -52,7 +52,7 @@
+@@ -72,7 +72,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -1850,11 +1862,11 @@ index d5a81c2cef..b80ef76384 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
-index d6618e0ffd..1e820b4df2 100644
+index fb1acfc266..16474d1f42 100644
 --- a/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
 +++ b/quarkus/addons/messaging/runtime/src/main/java/org/kie/kogito/addon/messaging/QuarkusDefaultCloudEventReceiver.java
-@@ -16,9 +16,9 @@
- 
+@@ -18,9 +18,9 @@
+  */
  package org.kie.kogito.addon.messaging;
  
 -import javax.annotation.PostConstruct;
@@ -1867,10 +1879,10 @@ index d6618e0ffd..1e820b4df2 100644
  import org.kie.kogito.addon.quarkus.messaging.common.AbstractQuarkusCloudEventReceiver;
  import org.kie.kogito.config.ConfigBean;
 diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
-index 0de7a857aa..96777ed600 100644
+index d0fbd43584..6f268d4ba5 100644
 --- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
 +++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
-@@ -47,7 +47,7 @@
+@@ -67,7 +67,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -1880,25 +1892,23 @@ index 0de7a857aa..96777ed600 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
-index 620f1632d8..15bb77b9dd 100644
+index 362a3fcd16..ff698f32f0 100644
 --- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
 +++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/main/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalog.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
+@@ -21,7 +21,7 @@ package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
  import java.net.URI;
  import java.util.Optional;
  
 -import javax.enterprise.context.ApplicationScoped;
--import javax.inject.Inject;
 +import jakarta.enterprise.context.ApplicationScoped;
-+import jakarta.inject.Inject;
  
- import org.eclipse.microprofile.config.Config;
+ import org.eclipse.microprofile.config.ConfigProvider;
  import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalog;
 diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
-index 28f7abe736..7ac841fb71 100644
+index cd8ec75380..08c6e2e0d5 100644
 --- a/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
 +++ b/quarkus/addons/microprofile-config-service-catalog/runtime/src/test/java/org/kie/kogito/addons/quarkus/microprofile/config/service/catalog/MicroProfileConfigServiceCatalogTest.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.addons.quarkus.microprofile.config.service.catalog;
  
@@ -1908,10 +1918,10 @@ index 28f7abe736..7ac841fb71 100644
  import org.kie.kogito.addons.k8s.resource.catalog.KubernetesServiceCatalogTest;
  
 diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
-index c0dc15fd1d..478cd757c5 100644
+index 84c7a85d72..9654aec7f3 100644
 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
 +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusEventListenerFactory.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.monitoring.core.quarkus;
  
@@ -1925,10 +1935,10 @@ index c0dc15fd1d..478cd757c5 100644
  import org.kie.kogito.KogitoGAV;
  import org.kie.kogito.config.ConfigBean;
 diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
-index bce1da1776..130135619b 100644
+index ca00b36ca0..f51cfb49b3 100644
 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
 +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegister.java
-@@ -15,12 +15,12 @@
+@@ -18,12 +18,12 @@
   */
  package org.kie.kogito.monitoring.core.quarkus;
  
@@ -1948,10 +1958,10 @@ index bce1da1776..130135619b 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.KogitoGAV;
 diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
-index c486ca5ab3..bfbc64e244 100644
+index 66bfaab7e6..1501904a6e 100644
 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
 +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptor.java
-@@ -17,9 +17,9 @@ package org.kie.kogito.monitoring.core.quarkus;
+@@ -20,9 +20,9 @@ package org.kie.kogito.monitoring.core.quarkus;
  
  import java.util.List;
  
@@ -1965,10 +1975,10 @@ index c486ca5ab3..bfbc64e244 100644
  import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
  
 diff --git a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
-index 671e17e2d0..50330c7cff 100644
+index 9b4e4c7ab7..c87d17e8fd 100644
 --- a/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
 +++ b/quarkus/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/quarkus/QuarkusSystemMetricsCollectorProvider.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.kie.kogito.monitoring.core.quarkus;
  
@@ -1983,10 +1993,10 @@ index 671e17e2d0..50330c7cff 100644
  import org.kie.kogito.config.ConfigBean;
  import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector;
 diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
-index ba32350482..934dacf778 100644
+index 56c7d8c796..cc74d0bb0d 100644
 --- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
 +++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsFilterRegisterTest.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.monitoring.core.quarkus;
+@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.core.quarkus;
  
  import java.util.List;
  
@@ -1998,10 +2008,10 @@ index ba32350482..934dacf778 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.monitoring.core.common.mock.MockedConfigBean;
 diff --git a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
-index ecd08becd3..14989d4d53 100644
+index 4e8be58a22..87b6340558 100644
 --- a/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
 +++ b/quarkus/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/quarkus/QuarkusMetricsInterceptorTest.java
-@@ -19,10 +19,10 @@ import java.util.Arrays;
+@@ -22,10 +22,10 @@ import java.util.Arrays;
  import java.util.Collections;
  import java.util.List;
  
@@ -2017,10 +2027,10 @@ index ecd08becd3..14989d4d53 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
 diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml b/quarkus/addons/monitoring/elastic/runtime/pom.xml
-index 4487866fb2..393d1f3e8a 100644
+index 191e6eb530..45bafdfa20 100644
 --- a/quarkus/addons/monitoring/elastic/runtime/pom.xml
 +++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml
-@@ -32,7 +32,7 @@
+@@ -52,7 +52,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2030,10 +2040,10 @@ index 4487866fb2..393d1f3e8a 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
-index 08dd6c8568..2097ed9d8a 100644
+index 9d2dca4a9d..af3679c91e 100644
 --- a/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
 +++ b/quarkus/addons/monitoring/elastic/runtime/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/QuarkusElasticRegistryProvider.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.monitoring.elastic.quarkus;
+@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.elastic.quarkus;
  
  import java.util.Optional;
  
@@ -2045,10 +2055,10 @@ index 08dd6c8568..2097ed9d8a 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.monitoring.elastic.common.ElasticConfigFactory;
 diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
-index c3ac08f49e..6b53bd08a0 100644
+index dce794681b..bba6028337 100644
 --- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml
 +++ b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
-@@ -53,7 +53,7 @@
+@@ -73,7 +73,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2058,10 +2068,10 @@ index c3ac08f49e..6b53bd08a0 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml b/quarkus/addons/persistence/filesystem/runtime/pom.xml
-index b1f0446419..5e93af241f 100644
+index ae1beb5271..4ad157edc4 100644
 --- a/quarkus/addons/persistence/filesystem/runtime/pom.xml
 +++ b/quarkus/addons/persistence/filesystem/runtime/pom.xml
-@@ -58,7 +58,7 @@
+@@ -62,7 +62,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2071,11 +2081,11 @@ index b1f0446419..5e93af241f 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
-index 0fd6369208..f5bb74e762 100644
+index 254319bd4a..49ebd0dd73 100644
 --- a/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
 +++ b/quarkus/addons/persistence/filesystem/runtime/src/main/java/org/kie/kogito/persistence/quarkus/FileSystemProcessInstancesFactory.java
-@@ -16,8 +16,8 @@
- 
+@@ -18,8 +18,8 @@
+  */
  package org.kie.kogito.persistence.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -2086,10 +2096,10 @@ index 0fd6369208..f5bb74e762 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.persistence.filesystem.AbstractProcessInstancesFactory;
 diff --git a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
-index 92245898e4..2b7b0e20e2 100644
+index e7a94178fa..1a3eb9199c 100644
 --- a/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
 +++ b/quarkus/addons/persistence/infinispan/health/src/main/java/org/kie/kogito/infinispan/health/InfinispanHealthCheck.java
-@@ -21,7 +21,7 @@ import java.util.Optional;
+@@ -24,7 +24,7 @@ import java.util.Optional;
  import java.util.concurrent.TimeUnit;
  import java.util.stream.Collectors;
  
@@ -2099,10 +2109,10 @@ index 92245898e4..2b7b0e20e2 100644
  import org.eclipse.microprofile.health.HealthCheck;
  import org.eclipse.microprofile.health.HealthCheckResponse;
 diff --git a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
-index 2107932098..ee1c2a50f2 100644
+index d8a82321c5..460341686d 100644
 --- a/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
 +++ b/quarkus/addons/persistence/infinispan/health/src/test/java/org/kie/kogito/infinispan/health/InfinispanHealthCheckIT.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.kie.kogito.infinispan.health;
  
@@ -2117,10 +2127,10 @@ index 2107932098..ee1c2a50f2 100644
  import org.infinispan.client.hotrod.RemoteCacheManager;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml
-index 8482d8911c..739dab2a7b 100644
+index 37dc06d077..505fcc4ed3 100644
 --- a/quarkus/addons/persistence/infinispan/runtime/pom.xml
 +++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml
-@@ -58,7 +58,7 @@
+@@ -62,7 +62,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2130,10 +2140,10 @@ index 8482d8911c..739dab2a7b 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
-index 96d2192088..9e34b69376 100644
+index 4442674234..222d287c54 100644
 --- a/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
 +++ b/quarkus/addons/persistence/infinispan/runtime/src/main/java/org/kie/kogito/persistence/quarkus/InfinispanProcessInstancesFactory.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.persistence.quarkus;
+@@ -20,8 +20,8 @@ package org.kie.kogito.persistence.quarkus;
  
  import java.util.Optional;
  
@@ -2145,10 +2155,10 @@ index 96d2192088..9e34b69376 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.infinispan.client.hotrod.RemoteCacheManager;
 diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml b/quarkus/addons/persistence/jdbc/runtime/pom.xml
-index 3b5bf94b2e..eab5ac273e 100644
+index 662f3f4226..c5769eb598 100644
 --- a/quarkus/addons/persistence/jdbc/runtime/pom.xml
 +++ b/quarkus/addons/persistence/jdbc/runtime/pom.xml
-@@ -72,7 +72,7 @@
+@@ -76,7 +76,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2158,11 +2168,11 @@ index 3b5bf94b2e..eab5ac273e 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
-index b82187c949..587bd72e12 100644
+index 6cf9776ceb..384eb6ac09 100644
 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
 +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCProcessInstancesFactory.java
-@@ -16,8 +16,8 @@
- 
+@@ -18,8 +18,8 @@
+  */
  package org.kie.kogito.persistence.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -2173,10 +2183,10 @@ index b82187c949..587bd72e12 100644
  
  import org.eclipse.microprofile.config.inject.ConfigProperty;
 diff --git a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
-index 45d6fe1144..33a13bba2c 100644
+index a4aefa406b..b73095c95d 100644
 --- a/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
 +++ b/quarkus/addons/persistence/jdbc/runtime/src/main/java/org/kie/kogito/persistence/quarkus/JDBCorrelationServiceProducer.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.persistence.quarkus;
+@@ -21,7 +21,7 @@ package org.kie.kogito.persistence.quarkus;
  import java.sql.Connection;
  import java.sql.SQLException;
  
@@ -2186,10 +2196,10 @@ index 45d6fe1144..33a13bba2c 100644
  
  import org.kie.kogito.correlation.CorrelationService;
 diff --git a/quarkus/addons/persistence/kafka/runtime/pom.xml b/quarkus/addons/persistence/kafka/runtime/pom.xml
-index 4180a4c9b7..6c7c92cd5e 100644
+index 796a2bf0e4..57e3a66e61 100644
 --- a/quarkus/addons/persistence/kafka/runtime/pom.xml
 +++ b/quarkus/addons/persistence/kafka/runtime/pom.xml
-@@ -117,7 +117,7 @@
+@@ -121,7 +121,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2199,10 +2209,10 @@ index 4180a4c9b7..6c7c92cd5e 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
-index 33f09b3f14..70eaa92bb3 100644
+index b5be2b3d0e..d5bf80a692 100644
 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
 +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/KafkaProcessInstancesFactory.java
-@@ -17,10 +17,10 @@ package org.kie.kogito.persistence;
+@@ -20,10 +20,10 @@ package org.kie.kogito.persistence;
  
  import java.util.Map;
  
@@ -2217,10 +2227,10 @@ index 33f09b3f14..70eaa92bb3 100644
  import org.apache.kafka.common.serialization.ByteArraySerializer;
  import org.apache.kafka.common.serialization.StringSerializer;
 diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
-index bd5bfcc585..b9490caf04 100644
+index 1001f512a9..052f652d7b 100644
 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
 +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsStateListener.java
-@@ -20,10 +20,10 @@ import java.util.Collection;
+@@ -22,10 +22,10 @@ import java.util.Collection;
  import java.util.Map;
  import java.util.concurrent.ConcurrentHashMap;
  
@@ -2235,10 +2245,10 @@ index bd5bfcc585..b9490caf04 100644
  import org.apache.kafka.streams.StoreQueryParameters;
  import org.apache.kafka.streams.state.QueryableStoreTypes;
 diff --git a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
-index 641b7e691a..c3ec471b68 100644
+index 11b87ac30e..a4710f9471 100644
 --- a/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
 +++ b/quarkus/addons/persistence/kafka/runtime/src/main/java/org/kie/kogito/persistence/kafka/KafkaStreamsTopologyProducer.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.persistence.kafka;
  
@@ -2250,10 +2260,10 @@ index 641b7e691a..c3ec471b68 100644
  import org.apache.kafka.streams.Topology;
  
 diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml b/quarkus/addons/persistence/mongodb/runtime/pom.xml
-index dff5d8ac92..3f58530ef0 100644
+index df3c14557e..e6f069ff88 100644
 --- a/quarkus/addons/persistence/mongodb/runtime/pom.xml
 +++ b/quarkus/addons/persistence/mongodb/runtime/pom.xml
-@@ -46,7 +46,7 @@
+@@ -66,7 +66,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2263,11 +2273,11 @@ index dff5d8ac92..3f58530ef0 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
-index 50cd0c864c..82968f4326 100644
+index 5a4ab35c7d..43b005f712 100644
 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
 +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBProcessInstancesFactory.java
-@@ -16,8 +16,8 @@
- 
+@@ -18,8 +18,8 @@
+  */
  package org.kie.kogito.persistence.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -2278,11 +2288,11 @@ index 50cd0c864c..82968f4326 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.mongodb.AbstractProcessInstancesFactory;
 diff --git a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
-index b216cb27bf..f921041a20 100644
+index d237aaf1da..0979fa9f36 100644
 --- a/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
 +++ b/quarkus/addons/persistence/mongodb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/MongoDBTransactionManager.java
-@@ -16,8 +16,8 @@
- 
+@@ -18,8 +18,8 @@
+  */
  package org.kie.kogito.persistence.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -2293,10 +2303,10 @@ index b216cb27bf..f921041a20 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.mongodb.transaction.AbstractTransactionManager;
 diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml
-index 313e265e12..0eec3b0607 100644
+index 692796ad39..d4e79ec6cc 100644
 --- a/quarkus/addons/persistence/postgresql/runtime/pom.xml
 +++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml
-@@ -71,7 +71,7 @@
+@@ -75,7 +75,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2306,11 +2316,11 @@ index 313e265e12..0eec3b0607 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
-index 613dc845ed..60d4d45251 100644
+index 042466ddf8..b0688f0402 100644
 --- a/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
 +++ b/quarkus/addons/persistence/postgresql/runtime/src/main/java/org/kie/kogito/persistence/quarkus/PostgresqlProcessInstancesFactory.java
-@@ -16,8 +16,8 @@
- 
+@@ -18,8 +18,8 @@
+  */
  package org.kie.kogito.persistence.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -2321,10 +2331,10 @@ index 613dc845ed..60d4d45251 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.persistence.postgresql.AbstractProcessInstancesFactory;
 diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
-index 63f8fecb62..977fccae63 100644
+index 8b9c28b96c..9c2c05ee4a 100644
 --- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml
 +++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
-@@ -41,7 +41,7 @@
+@@ -61,7 +61,7 @@
        </plugin>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2334,10 +2344,10 @@ index 63f8fecb62..977fccae63 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
-index 83e7d81c55..8daa52c6e1 100644
+index 4cd5e21188..0b9c49ae20 100644
 --- a/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
 +++ b/quarkus/addons/persistence/rocksdb/runtime/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/RocksDbProcessInstancesFactoryProducer.java
-@@ -15,12 +15,12 @@
+@@ -18,12 +18,12 @@
   */
  package org.kie.kogito.persistence.quarkus.rocksdb;
  
@@ -2356,10 +2366,10 @@ index 83e7d81c55..8daa52c6e1 100644
  import org.kie.kogito.process.ProcessInstancesFactory;
  import org.rocksdb.Options;
 diff --git a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
-index 2b7c9d0879..7a9b4af18f 100644
+index b2cc040a5c..84dd1d05b3 100644
 --- a/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
 +++ b/quarkus/addons/process-definitions/runtime/src/main/java/org/kie/kogito/process/definitions/ProcessDefinitionsResource.java
-@@ -15,20 +15,20 @@
+@@ -18,20 +18,20 @@
   */
  package org.kie.kogito.process.definitions;
  
@@ -2392,10 +2402,10 @@ index 2b7c9d0879..7a9b4af18f 100644
  import org.kie.kogito.process.ProcessInstancesFactory;
  import org.kie.kogito.serverless.workflow.executor.StaticWorkflowApplication;
 diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml
-index ce0eedf6cd..eea0ab21f5 100644
+index 56b200c8af..dc151b4067 100644
 --- a/quarkus/addons/process-management/runtime/pom.xml
 +++ b/quarkus/addons/process-management/runtime/pom.xml
-@@ -60,9 +60,10 @@
+@@ -80,9 +80,10 @@
        <scope>test</scope>
      </dependency>
      <dependency>
@@ -2404,11 +2414,11 @@ index ce0eedf6cd..eea0ab21f5 100644
 +      <groupId>jakarta.xml.bind</groupId>
 +      <artifactId>jakarta.xml.bind-api</artifactId>
        <scope>test</scope>
-+      <version>4.0.0</version>
++      <version>4.0.1</version>
      </dependency>
    </dependencies>
  
-@@ -70,7 +71,7 @@
+@@ -90,7 +91,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2418,10 +2428,10 @@ index ce0eedf6cd..eea0ab21f5 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
-index aa8ebbbca3..6651462922 100644
+index a8c0ffd9af..fd71154a44 100644
 --- a/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
 +++ b/quarkus/addons/process-management/runtime/src/main/java/org/kie/kogito/process/management/ProcessInstanceManagementResource.java
-@@ -15,17 +15,17 @@
+@@ -18,17 +18,17 @@
   */
  package org.kie.kogito.process.management;
  
@@ -2451,10 +2461,10 @@ index aa8ebbbca3..6651462922 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.process.Processes;
 diff --git a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
-index eb834c6b3b..5b3f3ce75e 100644
+index 7db5f82d61..9a1f266bcb 100644
 --- a/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
 +++ b/quarkus/addons/process-management/runtime/src/test/java/org/kie/kogito/process/management/ProcessInstanceManagementResourceTest.java
-@@ -17,12 +17,12 @@ package org.kie.kogito.process.management;
+@@ -20,12 +20,12 @@ package org.kie.kogito.process.management;
  
  import java.util.Optional;
  
@@ -2474,10 +2484,10 @@ index eb834c6b3b..5b3f3ce75e 100644
  import org.junit.jupiter.api.BeforeAll;
  import org.junit.jupiter.api.BeforeEach;
 diff --git a/quarkus/addons/process-svg/runtime/pom.xml b/quarkus/addons/process-svg/runtime/pom.xml
-index eccd95d1fe..975fd59a88 100644
+index 5a8dec89b9..b4453e7870 100644
 --- a/quarkus/addons/process-svg/runtime/pom.xml
 +++ b/quarkus/addons/process-svg/runtime/pom.xml
-@@ -18,8 +18,8 @@
+@@ -38,8 +38,8 @@
        <artifactId>kogito-addons-process-svg</artifactId>
      </dependency>
      <dependency>
@@ -2488,7 +2498,7 @@ index eccd95d1fe..975fd59a88 100644
      </dependency>
  
      <dependency>
-@@ -73,7 +73,7 @@
+@@ -93,7 +93,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2498,10 +2508,10 @@ index eccd95d1fe..975fd59a88 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
-index e229f617e9..2e1be96d17 100644
+index e5763343ce..1d476c8628 100644
 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
 +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/dataindex/QuarkusDataIndexClient.java
-@@ -21,10 +21,10 @@ import java.net.URL;
+@@ -23,10 +23,10 @@ import java.net.URL;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -2516,10 +2526,10 @@ index e229f617e9..2e1be96d17 100644
  import org.kie.kogito.svg.ProcessSVGException;
  import org.slf4j.Logger;
 diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
-index 7783ae1d08..7159a14f65 100644
+index 31e75cd256..c18ee17d72 100644
 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
 +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/rest/ProcessSvgResource.java
-@@ -17,15 +17,15 @@ package org.kie.kogito.svg.rest;
+@@ -20,15 +20,15 @@ package org.kie.kogito.svg.rest;
  
  import java.util.Optional;
  
@@ -2545,10 +2555,10 @@ index 7783ae1d08..7159a14f65 100644
  import org.kie.kogito.svg.ProcessSvgService;
  
 diff --git a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
-index 295de81ef7..e85b0f8c09 100644
+index a648a30cd3..05618b33e1 100644
 --- a/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
 +++ b/quarkus/addons/process-svg/runtime/src/main/java/org/kie/kogito/svg/service/QuarkusProcessSvgService.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.svg.service;
+@@ -20,8 +20,8 @@ package org.kie.kogito.svg.service;
  
  import java.util.Optional;
  
@@ -2560,10 +2570,10 @@ index 295de81ef7..e85b0f8c09 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.kie.kogito.svg.AbstractProcessSvgService;
 diff --git a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
-index 9316ad12b6..fc98d52f66 100644
+index f32843b94b..cfc673a546 100644
 --- a/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
 +++ b/quarkus/addons/python/runtime/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonWorkItemHandlerConfig.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.quarkus.serverless.workflow.python;
  
@@ -2577,10 +2587,10 @@ index 9316ad12b6..fc98d52f66 100644
  import org.kie.kogito.internal.process.runtime.KogitoWorkItemHandler;
  import org.kie.kogito.process.impl.CachedWorkItemHandlerConfig;
 diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml
-index d0ffa42730..abbc56828f 100644
+index 12b7491c88..bfbffcd8d6 100644
 --- a/quarkus/addons/rest-exception-handler/pom.xml
 +++ b/quarkus/addons/rest-exception-handler/pom.xml
-@@ -47,9 +47,10 @@
+@@ -67,9 +67,10 @@
        <scope>test</scope>
      </dependency>
      <dependency>
@@ -2589,16 +2599,16 @@ index d0ffa42730..abbc56828f 100644
 +      <groupId>jakarta.xml.bind</groupId>
 +      <artifactId>jakarta.xml.bind-api</artifactId>
        <scope>test</scope>
-+      <version>4.0.0</version>
++      <version>4.0.1</version>
      </dependency>
    </dependencies>
  </project>
 \ No newline at end of file
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java
-index 552b181be1..c0f2343e57 100644
+index febb17b17d..21b70e76d7 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2610,10 +2620,10 @@ index 552b181be1..c0f2343e57 100644
  public abstract class BaseExceptionMapper<E extends Throwable> implements ExceptionMapper<E> {
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java
-index febd898043..cf610ebd00 100644
+index cdff6f06a0..ec1bd6679d 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ExceptionsHandler.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2627,10 +2637,10 @@ index febd898043..cf610ebd00 100644
  public class ExceptionsHandler extends BaseExceptionsHandler<Response> {
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java
-index cfec173331..dd6db2f01a 100644
+index 92199a0057..56a734a511 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/IllegalArgumentExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2642,10 +2652,10 @@ index cfec173331..dd6db2f01a 100644
  @Provider
  public class IllegalArgumentExceptionMapper extends BaseExceptionMapper<IllegalArgumentException> {
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
-index 9fea8b1f57..88a31e44c0 100644
+index 8ff7cbe62f..976baa4bfc 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidLifeCyclePhaseExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2657,10 +2667,10 @@ index 9fea8b1f57..88a31e44c0 100644
  import org.kie.kogito.process.workitem.InvalidLifeCyclePhaseException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
-index 8bdb1363e3..aedc88e1e4 100644
+index 209d2207db..ef21f6b61b 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/InvalidTransitionExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2672,10 +2682,10 @@ index 8bdb1363e3..aedc88e1e4 100644
  import org.kie.kogito.process.workitem.InvalidTransitionException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
-index 09df31e7ef..0086bbaa99 100644
+index be499edcf0..f1f131945e 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeInstanceNotFoundExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2687,10 +2697,10 @@ index 09df31e7ef..0086bbaa99 100644
  import org.kie.kogito.process.NodeInstanceNotFoundException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
-index c2be7ac83b..d68ab1112f 100644
+index 539aa490e7..4ac3965b2c 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NodeNotFoundExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2702,10 +2712,10 @@ index c2be7ac83b..d68ab1112f 100644
  import org.kie.kogito.process.NodeNotFoundException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
-index 428edf84a5..6374caac49 100644
+index d12161df80..29e5056652 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/NotAuthorizedExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2717,10 +2727,10 @@ index 428edf84a5..6374caac49 100644
  import org.kie.kogito.process.workitem.NotAuthorizedException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
-index 88ac4af0bc..5f743d623e 100644
+index 02ab996453..59bec8b102 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceDuplicatedExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2732,10 +2742,10 @@ index 88ac4af0bc..5f743d623e 100644
  import org.kie.kogito.process.ProcessInstanceDuplicatedException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
-index 2b4691c932..c972e25972 100644
+index 895f9db741..4d450420eb 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceExecutionExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2747,10 +2757,10 @@ index 2b4691c932..c972e25972 100644
  import org.kie.kogito.process.ProcessInstanceExecutionException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
-index 5bff8c2d3b..fc7bee1281 100644
+index 7bbbaeee51..27391a3a31 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/ProcessInstanceNotFoundExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2762,10 +2772,10 @@ index 5bff8c2d3b..fc7bee1281 100644
  import org.kie.kogito.process.ProcessInstanceNotFoundException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
-index f53b96b25a..3fa0018a5e 100644
+index ba6b6318b8..ce80911352 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/VariableViolationExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2776,11 +2786,26 @@ index f53b96b25a..3fa0018a5e 100644
  
  import org.kie.kogito.process.VariableViolationException;
  
+diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
+index 73bdac8cc7..201c6180cc 100644
+--- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
++++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemExecutionExceptionMapper.java
+@@ -18,8 +18,8 @@
+  */
+ package org.kie.kogito.resource.exceptions;
+ 
+-import javax.ws.rs.core.Response;
+-import javax.ws.rs.ext.Provider;
++import jakarta.ws.rs.core.Response;
++import jakarta.ws.rs.ext.Provider;
+ 
+ import org.kie.kogito.process.workitem.WorkItemExecutionException;
+ 
 diff --git a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
-index cadfa22489..247b456852 100644
+index 53b26200d0..0b0f3ff03a 100644
 --- a/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
 +++ b/quarkus/addons/rest-exception-handler/src/main/java/org/kie/kogito/resource/exceptions/WorkItemNotFoundExceptionMapper.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2792,10 +2817,10 @@ index cadfa22489..247b456852 100644
  import org.kie.kogito.internal.process.runtime.WorkItemNotFoundException;
  
 diff --git a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
-index d23e927288..800ab5c9b6 100644
+index 15369715df..ce16cc01af 100644
 --- a/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
 +++ b/quarkus/addons/rest-exception-handler/src/test/java/org/kie/kogito/resource/exceptions/ExceptionsHandlerTest.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.kie.kogito.resource.exceptions;
  
@@ -2811,10 +2836,10 @@ index d23e927288..800ab5c9b6 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/source-files/runtime/pom.xml b/quarkus/addons/source-files/runtime/pom.xml
-index 06f3532bfd..871eaaab54 100644
+index be08c219f5..fa74154832 100644
 --- a/quarkus/addons/source-files/runtime/pom.xml
 +++ b/quarkus/addons/source-files/runtime/pom.xml
-@@ -103,7 +103,7 @@
+@@ -123,7 +123,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -2824,10 +2849,10 @@ index 06f3532bfd..871eaaab54 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java
-index a75b317d05..45711af7c8 100644
+index ef53747f28..dc4ac4d01d 100644
 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java
 +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesProviderProducer.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.addon.source.files;
  
@@ -2841,10 +2866,10 @@ index a75b317d05..45711af7c8 100644
  @ApplicationScoped
  public final class SourceFilesProviderProducer {
 diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
-index 7583c4ed3c..aa15b5bdae 100644
+index b8d60de991..8866e3c887 100644
 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
 +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesRecorder.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.addon.source.files;
  
@@ -2854,10 +2879,10 @@ index 7583c4ed3c..aa15b5bdae 100644
  import io.quarkus.runtime.annotations.Recorder;
  
 diff --git a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
-index f4fc85e3ae..2f5364fd2d 100644
+index ab48413783..da618e2728 100644
 --- a/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
 +++ b/quarkus/addons/source-files/runtime/src/main/java/org/kie/kogito/addon/source/files/SourceFilesResource.java
-@@ -20,15 +20,15 @@ import java.io.IOException;
+@@ -23,15 +23,15 @@ import java.io.IOException;
  import java.io.InputStream;
  import java.util.Collection;
  
@@ -2883,10 +2908,10 @@ index f4fc85e3ae..2f5364fd2d 100644
  import org.kie.kogito.resource.exceptions.ExceptionsHandler;
  
 diff --git a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
-index c2ad3e8355..49a0d884af 100644
+index 926b5b0d79..82414cb6ea 100644
 --- a/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
 +++ b/quarkus/addons/source-files/runtime/src/test/java/org/kie/kogito/addon/source/files/SourceFilesResourceTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.addon.source.files;
+@@ -20,7 +20,7 @@ package org.kie.kogito.addon.source.files;
  
  import java.util.Optional;
  
@@ -2896,10 +2921,10 @@ index c2ad3e8355..49a0d884af 100644
  import org.junit.jupiter.api.BeforeEach;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/addons/task-management/runtime/pom.xml b/quarkus/addons/task-management/runtime/pom.xml
-index 02ffb5bd84..ede13669a9 100644
+index 8b32acf4d6..bf82ce020e 100644
 --- a/quarkus/addons/task-management/runtime/pom.xml
 +++ b/quarkus/addons/task-management/runtime/pom.xml
-@@ -61,7 +61,7 @@
+@@ -81,7 +81,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2909,10 +2934,10 @@ index 02ffb5bd84..ede13669a9 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
-index 24a604c875..764baaf1b7 100644
+index d3b7f7fec6..624c19a504 100644
 --- a/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
 +++ b/quarkus/addons/task-management/runtime/src/main/java/org/kie/kogito/task/management/TaskManagementResource.java
-@@ -15,20 +15,20 @@
+@@ -18,20 +18,20 @@
   */
  package org.kie.kogito.task.management;
  
@@ -2946,10 +2971,10 @@ index 24a604c875..764baaf1b7 100644
  import org.kie.kogito.process.ProcessConfig;
  import org.kie.kogito.process.Processes;
 diff --git a/quarkus/addons/task-notification/runtime/pom.xml b/quarkus/addons/task-notification/runtime/pom.xml
-index c4079745a5..587a908f17 100644
+index 742c89aa44..dac5a7dc64 100644
 --- a/quarkus/addons/task-notification/runtime/pom.xml
 +++ b/quarkus/addons/task-notification/runtime/pom.xml
-@@ -63,7 +63,7 @@
+@@ -83,7 +83,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2959,10 +2984,10 @@ index c4079745a5..587a908f17 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
-index 4d8d26c4a1..7a10464d29 100644
+index 774aa066f5..287af70636 100644
 --- a/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
 +++ b/quarkus/addons/task-notification/runtime/src/main/java/org/kie/kogito/task/notification/quarkus/NotificationEventPublisher.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.task.notification.quarkus;
+@@ -20,8 +20,8 @@ package org.kie.kogito.task.notification.quarkus;
  
  import java.util.Collection;
  
@@ -2974,10 +2999,10 @@ index 4d8d26c4a1..7a10464d29 100644
  import org.eclipse.microprofile.reactive.messaging.Channel;
  import org.eclipse.microprofile.reactive.messaging.Emitter;
 diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml
-index df07561419..e7e7a0404d 100644
+index 98b4ff95bf..1b545bebf6 100644
 --- a/quarkus/addons/tracing-decision/runtime/pom.xml
 +++ b/quarkus/addons/tracing-decision/runtime/pom.xml
-@@ -84,7 +84,7 @@
+@@ -104,7 +104,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -2987,10 +3012,10 @@ index df07561419..e7e7a0404d 100644
          <executions>
            <execution>
 diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
-index c21064a2c7..b3d9db47d7 100644
+index 1d64d0f96e..20d98853d7 100644
 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
 +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingCollector.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.tracing.decision;
+@@ -20,8 +20,8 @@ package org.kie.kogito.tracing.decision;
  
  import java.util.function.BiFunction;
  
@@ -3002,10 +3027,10 @@ index c21064a2c7..b3d9db47d7 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.config.ConfigBean;
 diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
-index a9f35085a7..c6fc70e2d0 100644
+index c6a39d43bd..586cd9df64 100644
 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
 +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusDecisionTracingListener.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.tracing.decision;
  
@@ -3017,10 +3042,10 @@ index a9f35085a7..c6fc70e2d0 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  
 diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
-index 89b34e7554..0868563be8 100644
+index fb09ff6065..01c7c4b628 100644
 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
 +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusModelEventEmitter.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.tracing.decision;
  
@@ -3032,10 +3057,10 @@ index 89b34e7554..0868563be8 100644
  import org.eclipse.microprofile.reactive.messaging.Outgoing;
  import org.kie.kogito.decision.DecisionModelResourcesProvider;
 diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
-index f6efd7ba07..33a227023b 100644
+index c836b2d634..12d3750759 100644
 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
 +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusStartupModelPublisher.java
-@@ -15,9 +15,9 @@
+@@ -18,9 +18,9 @@
   */
  package org.kie.kogito.tracing.decision;
  
@@ -3049,10 +3074,10 @@ index f6efd7ba07..33a227023b 100644
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
 diff --git a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
-index 999d129ceb..a887b5519b 100644
+index ddad3bd54e..4a12cdbad1 100644
 --- a/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
 +++ b/quarkus/addons/tracing-decision/runtime/src/main/java/org/kie/kogito/tracing/decision/QuarkusTraceEventEmitter.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.tracing.decision;
  
@@ -3062,10 +3087,10 @@ index 999d129ceb..a887b5519b 100644
  import org.eclipse.microprofile.reactive.messaging.Outgoing;
  import org.kie.kogito.tracing.EventEmitter;
 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
-index 9a0df50ab9..af28d1a5a1 100644
+index 547c7ff509..86ce83223a 100644
 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
 +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/main/java/org/kie/kogito/quarkus/dmn/CustomEndpoint.java
-@@ -18,12 +18,12 @@ package org.kie.kogito.quarkus.dmn;
+@@ -20,12 +20,12 @@ package org.kie.kogito.quarkus.dmn;
  
  import java.util.Map;
  
@@ -3085,10 +3110,10 @@ index 9a0df50ab9..af28d1a5a1 100644
  import org.kie.kogito.incubation.application.AppRoot;
  import org.kie.kogito.incubation.common.DataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml
-index 50d0cb7aae..6c32e85a60 100644
+index fe43491fb1..8b3e9445b5 100644
 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml
 +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/pom.xml
-@@ -70,7 +70,7 @@
+@@ -90,7 +90,7 @@
              </plugin>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -3098,11 +3123,11 @@ index 50d0cb7aae..6c32e85a60 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
-index 39023f0739..fcb868edf2 100644
+index dc27f3b512..0880e67b40 100644
 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
 +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionIdFactory.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.core.decision.incubation.quarkus.support;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3111,30 +3136,29 @@ index 39023f0739..fcb868edf2 100644
  import org.kie.kogito.incubation.decisions.DecisionIds;
  
 diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
-index 3c7cf9db4b..39d6329064 100644
+index 4df9c6face..5955532e49 100644
 --- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
 +++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions/src/main/java/org/kie/kogito/core/decision/incubation/quarkus/support/QuarkusDecisionService.java
-@@ -16,11 +16,11 @@
- 
+@@ -18,10 +18,10 @@
+  */
  package org.kie.kogito.core.decision.incubation.quarkus.support;
  
 -import javax.annotation.PostConstruct;
 -import javax.enterprise.context.ApplicationScoped;
 -import javax.enterprise.inject.Instance;
 -import javax.inject.Inject;
++import jakarta.annotation.PostConstruct;
 +import jakarta.enterprise.context.ApplicationScoped;
 +import jakarta.enterprise.inject.Instance;
 +import jakarta.inject.Inject;
  
-+import jakarta.annotation.PostConstruct;
  import org.kie.kogito.decision.DecisionModels;
  import org.kie.kogito.incubation.common.DataContext;
- import org.kie.kogito.incubation.common.ExtendedDataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
-index 5cf6bb523d..35d95e87c9 100644
+index 74c5c39f45..ac27b0fac9 100644
 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
 +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common-deployment/src/main/java/org/kie/kogito/quarkus/common/deployment/KogitoAssetsProcessor.java
-@@ -28,8 +28,8 @@ import java.util.function.Function;
+@@ -31,8 +31,8 @@ import java.util.function.Function;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
@@ -3146,10 +3170,10 @@ index 5cf6bb523d..35d95e87c9 100644
  import org.drools.codegen.common.DroolsModelBuildContext;
  import org.drools.codegen.common.GeneratedFile;
 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
-index 3612fdd487..d1406ec93a 100644
+index b7353762b0..751caf201e 100644
 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
 +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/pom.xml
-@@ -75,7 +75,7 @@
+@@ -95,7 +95,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -3159,10 +3183,10 @@ index 3612fdd487..d1406ec93a 100644
              </plugin>
              <plugin>
 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
-index 4c1d53c7ae..d46f2249d3 100644
+index 8fb4babbf4..5ec28db8f0 100644
 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
 +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/auth/QuarkusIdentityProvider.java
-@@ -20,10 +20,10 @@ import java.util.Collection;
+@@ -22,10 +22,10 @@ import java.util.Collection;
  import java.util.Collections;
  import java.util.Optional;
  
@@ -3178,10 +3202,10 @@ index 4c1d53c7ae..d46f2249d3 100644
  import org.kie.kogito.auth.IdentityProvider;
  
 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
-index e0af805b1f..2147548e66 100644
+index f928cb9a56..24be9f3449 100644
 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
 +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/config/ConfigBean.java
-@@ -17,9 +17,9 @@ package org.kie.kogito.quarkus.config;
+@@ -20,9 +20,9 @@ package org.kie.kogito.quarkus.config;
  
  import java.util.Optional;
  
@@ -3194,12 +3218,31 @@ index e0af805b1f..2147548e66 100644
  
  import org.kie.kogito.KogitoGAV;
  import org.kie.kogito.config.StaticConfigBean;
+diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
+index 4ec977733a..0a03ee61e8 100644
+--- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
++++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/registry/ProcessDefinitionRegistration.java
+@@ -18,10 +18,10 @@
+  */
+ package org.kie.kogito.quarkus.registry;
+ 
+-import javax.enterprise.context.ApplicationScoped;
+-import javax.enterprise.event.Observes;
+-import javax.enterprise.inject.Instance;
+-import javax.inject.Inject;
++import jakarta.enterprise.context.ApplicationScoped;
++import jakarta.enterprise.event.Observes;
++import jakarta.enterprise.inject.Instance;
++import jakarta.inject.Inject;
+ 
+ import org.kie.kogito.Application;
+ import org.kie.kogito.process.Processes;
 diff --git a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
-index e6d50f5e81..653aebc762 100644
+index 4d18223a60..9d3e90724f 100644
 --- a/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
 +++ b/quarkus/extensions/kogito-quarkus-extension-common/kogito-quarkus-common/src/main/java/org/kie/kogito/quarkus/runtime/SSLWebClientOptionsProducer.java
-@@ -16,8 +16,8 @@
- 
+@@ -18,8 +18,8 @@
+  */
  package org.kie.kogito.quarkus.runtime;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3210,10 +3253,10 @@ index e6d50f5e81..653aebc762 100644
  import io.quarkus.arc.DefaultBean;
  import io.vertx.ext.web.client.WebClientOptions;
 diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java
-index a54f09d2e0..b7e7f82682 100644
+index 3fb44ee20c..2e0a9279f2 100644
 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java
 +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/classic-inst/src/main/java/control/RestControl.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package control;
  
@@ -3231,10 +3274,10 @@ index a54f09d2e0..b7e7f82682 100644
  
  @Path("/control")
 diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java
-index a54f09d2e0..b7e7f82682 100644
+index 3fb44ee20c..2e0a9279f2 100644
 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java
 +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test-maven-devmode/src/test/resources/projects/simple-dmn/src/main/java/control/RestControl.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package control;
  
@@ -3252,10 +3295,10 @@ index a54f09d2e0..b7e7f82682 100644
  
  @Path("/control")
 diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java
-index fa64bd910a..4aac344b05 100644
+index cb8d547dba..2d90b5f644 100644
 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java
 +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/main/java/io/quarkus/it/kogito/jbpm/CalculationService.java
-@@ -18,7 +18,7 @@ package io.quarkus.it.kogito.jbpm;
+@@ -21,7 +21,7 @@ package io.quarkus.it.kogito.jbpm;
  import java.security.SecureRandom;
  import java.util.Random;
  
@@ -3265,10 +3308,10 @@ index fa64bd910a..4aac344b05 100644
  @ApplicationScoped
  public class CalculationService {
 diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
-index e19a919615..1419d03903 100644
+index 1d5033a13c..c12bae9814 100644
 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
 +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-integration-test/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessIT.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.quarkus.jbpm;
+@@ -21,8 +21,8 @@ package org.kie.kogito.quarkus.jbpm;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -3280,10 +3323,10 @@ index e19a919615..1419d03903 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.Model;
 diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
-index f41f347b1a..6e6c5d59c8 100644
+index bd42c3e73b..357b8df343 100644
 --- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
 +++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
-@@ -50,7 +50,7 @@
+@@ -70,7 +70,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -3293,11 +3336,11 @@ index f41f347b1a..6e6c5d59c8 100644
          <executions>
            <execution>
 diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
-index 6620bc463a..265fb4f880 100644
+index 6d4ee21f09..9cd782e06d 100644
 --- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
 +++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/application/quarkus/QuarkusAppRoot.java
-@@ -16,9 +16,9 @@
- 
+@@ -18,9 +18,9 @@
+  */
  package org.kie.kogito.incubation.application.quarkus;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3310,10 +3353,10 @@ index 6620bc463a..265fb4f880 100644
  import org.kie.kogito.incubation.application.AppRoot;
  import org.kie.kogito.incubation.common.ComponentRoot;
 diff --git a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
-index 97c1287afc..cc7a8e11ff 100644
+index ca4a9c9527..1145293a40 100644
 --- a/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
 +++ b/quarkus/extensions/kogito-quarkus-incubation-common/src/main/java/org/kie/kogito/incubation/common/objectmapper/quarkus/QuarkusInternalObjectMapper.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.incubation.common.objectmapper.quarkus;
+@@ -20,7 +20,7 @@ package org.kie.kogito.incubation.common.objectmapper.quarkus;
  
  import java.util.Map;
  
@@ -3323,10 +3366,10 @@ index 97c1287afc..cc7a8e11ff 100644
  import org.kie.kogito.incubation.common.DataContext;
  import org.kie.kogito.incubation.common.ExtendedDataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
-index b4d754eb99..d1a28b41e2 100644
+index 4ab172fe53..904bb0f277 100644
 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
 +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/src/main/java/org/kie/kogito/quarkus/pmml/CustomEndpoint.java
-@@ -18,12 +18,12 @@ package org.kie.kogito.quarkus.pmml;
+@@ -20,12 +20,12 @@ package org.kie.kogito.quarkus.pmml;
  
  import java.util.Map;
  
@@ -3346,10 +3389,10 @@ index b4d754eb99..d1a28b41e2 100644
  import org.kie.kogito.incubation.application.AppRoot;
  import org.kie.kogito.incubation.common.DataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
-index 7dc55c08c8..0b22d355ad 100644
+index ee2a675854..a0e1e88ab6 100644
 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
 +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
-@@ -42,7 +42,7 @@
+@@ -62,7 +62,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -3359,11 +3402,11 @@ index 7dc55c08c8..0b22d355ad 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
-index 049ed0266b..0a8522f043 100644
+index b3e0792efa..bdea4a5b87 100644
 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
 +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionIds.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.core.prediction.incubation.quarkus.support;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3372,11 +3415,11 @@ index 049ed0266b..0a8522f043 100644
  import org.kie.kogito.incubation.predictions.PredictionIds;
  
 diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
-index c168a06b34..3b6391cbc9 100644
+index ed5b13d980..c2c727b1f3 100644
 --- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
 +++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/src/main/java/org/kie/kogito/core/prediction/incubation/quarkus/support/QuarkusPredictionService.java
-@@ -16,10 +16,10 @@
- 
+@@ -18,10 +18,10 @@
+  */
  package org.kie.kogito.core.prediction.incubation.quarkus.support;
  
 -import javax.annotation.PostConstruct;
@@ -3391,10 +3434,10 @@ index c168a06b34..3b6391cbc9 100644
  import org.kie.kogito.incubation.common.DataContext;
  import org.kie.kogito.incubation.common.ExtendedDataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java
-index afa85f97fa..48d597db45 100644
+index 41d5b44612..4b3aad3e64 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test-hot-reload/src/test/java/io/quarkus/it/kogito/process/HotReloadTestHelper.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package io.quarkus.it.kogito.process;
  
@@ -3404,10 +3447,10 @@ index afa85f97fa..48d597db45 100644
  /**
   * HotReloadTestHelper
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
-index 17b400d4a5..a677c45868 100644
+index 608707a960..6b0f0863ce 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/main/java/org/acme/GreetingResource.java
-@@ -18,15 +18,15 @@ package org.acme;
+@@ -20,15 +20,15 @@ package org.acme;
  
  import java.util.Map;
  
@@ -3433,10 +3476,10 @@ index 17b400d4a5..a677c45868 100644
  import org.kie.kogito.Model;
  import org.kie.kogito.incubation.application.AppRoot;
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
-index e98e388939..0903d20f57 100644
+index 3af88368d9..f0c911c32d 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes-integration-test/src/test/java/org/acme/StatefulProcessResourceTest.java
-@@ -19,7 +19,7 @@ package org.acme;
+@@ -21,7 +21,7 @@ package org.acme;
  import java.util.List;
  import java.util.Map;
  
@@ -3446,10 +3489,10 @@ index e98e388939..0903d20f57 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.incubation.application.AppRoot;
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml
-index 7f4d1a6fa0..5c7e77f9cd 100644
+index ca1a41e505..569fdcb392 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/pom.xml
-@@ -40,7 +40,7 @@
+@@ -60,7 +60,7 @@
      <plugins>
        <plugin>
          <groupId>io.quarkus</groupId>
@@ -3459,11 +3502,11 @@ index 7f4d1a6fa0..5c7e77f9cd 100644
          <executions>
            <execution>
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
-index b544a00c13..dd476ea3e3 100644
+index 041d0992e5..e50d19ccd6 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusHumanTaskService.java
-@@ -16,11 +16,11 @@
- 
+@@ -18,11 +18,11 @@
+  */
  package org.kie.kogito.core.process.incubation.quarkus.support;
  
 -import javax.annotation.PostConstruct;
@@ -3479,11 +3522,11 @@ index b544a00c13..dd476ea3e3 100644
  import org.kie.kogito.incubation.common.DataContext;
  import org.kie.kogito.incubation.common.ExtendedDataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
-index 1a037d855e..b6b1fdd7db 100644
+index 7ea23a236f..dac1728920 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusProcessIdFactory.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.core.process.incubation.quarkus.support;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3492,11 +3535,11 @@ index 1a037d855e..b6b1fdd7db 100644
  import org.kie.kogito.incubation.processes.ProcessIds;
  
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
-index 806d8b690c..302011ee7f 100644
+index 2e40f0f880..0e2d7dff0d 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStatefulProcessService.java
-@@ -16,11 +16,11 @@
- 
+@@ -18,11 +18,11 @@
+  */
  package org.kie.kogito.core.process.incubation.quarkus.support;
  
 -import javax.annotation.PostConstruct;
@@ -3512,11 +3555,11 @@ index 806d8b690c..302011ee7f 100644
  import org.kie.kogito.incubation.common.DataContext;
  import org.kie.kogito.incubation.common.ExtendedDataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
-index 1f66512e9f..807d060370 100644
+index 3f009c5579..0875bfbc3c 100644
 --- a/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
 +++ b/quarkus/extensions/kogito-quarkus-processes-extension/kogito-quarkus-processes/src/main/java/org/kie/kogito/core/process/incubation/quarkus/support/QuarkusStraightThroughProcessService.java
-@@ -16,11 +16,11 @@
- 
+@@ -18,11 +18,11 @@
+  */
  package org.kie.kogito.core.process.incubation.quarkus.support;
  
 -import javax.annotation.PostConstruct;
@@ -3532,10 +3575,10 @@ index 1f66512e9f..807d060370 100644
  import org.kie.kogito.incubation.common.Id;
  import org.kie.kogito.incubation.processes.services.StraightThroughProcessService;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
-index 93979d672b..5aa0d04570 100644
+index 66a42383c3..5ab246a52d 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/AnotherService.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.quarkus.drools;
  
@@ -3547,10 +3590,10 @@ index 93979d672b..5aa0d04570 100644
  import org.drools.ruleunits.api.DataStore;
  import org.drools.ruleunits.api.RuleUnitData;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
-index 6a1abd751f..57876ca809 100644
+index c249f1faf0..a6d15cf7e8 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/main/java/org/kie/kogito/quarkus/drools/CustomEndpoint.java
-@@ -19,12 +19,12 @@ package org.kie.kogito.quarkus.drools;
+@@ -21,12 +21,12 @@ package org.kie.kogito.quarkus.drools;
  import java.util.Map;
  import java.util.Optional;
  
@@ -3570,10 +3613,10 @@ index 6a1abd751f..57876ca809 100644
  import org.kie.kogito.incubation.application.AppRoot;
  import org.kie.kogito.incubation.common.DataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
-index 2f25251277..c5bfb4e3cc 100644
+index 21ea877b5d..3673790aad 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/RuleUnitMetaDataContextSerializationTest.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.quarkus.drools;
+@@ -20,7 +20,7 @@ package org.kie.kogito.quarkus.drools;
  
  import java.util.Map;
  
@@ -3583,10 +3626,10 @@ index 2f25251277..c5bfb4e3cc 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.incubation.common.EmptyDataContext;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
-index f748c5d240..eae5b1a543 100644
+index a9e445e1b8..6b273c673e 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules-integration-test/src/test/java/org/kie/kogito/quarkus/drools/StatefulRuleUnitServiceTest.java
-@@ -19,7 +19,7 @@ import java.util.List;
+@@ -22,7 +22,7 @@ import java.util.List;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
@@ -3596,10 +3639,10 @@ index f748c5d240..eae5b1a543 100644
  import org.drools.ruleunits.api.DataSource;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml
-index 790727329c..e1d80e9abb 100644
+index 7f8290145d..ebdc6a35f5 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/pom.xml
-@@ -45,7 +45,7 @@
+@@ -65,7 +65,7 @@
          <plugins>
              <plugin>
                  <groupId>io.quarkus</groupId>
@@ -3609,10 +3652,10 @@ index 790727329c..e1d80e9abb 100644
                  <executions>
                      <execution>
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
-index f79b9b275c..a2e4368642 100644
+index 20991fef11..50c0b4724a 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/DataSourceProvider.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.core.rules.incubation.quarkus.support;
  
@@ -3624,10 +3667,10 @@ index f79b9b275c..a2e4368642 100644
  import org.drools.ruleunits.api.DataSource;
  import org.drools.ruleunits.api.DataStore;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
-index 745a82c7a5..29926d40e0 100644
+index d4e780492e..d5cc44b16e 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusDataSourceService.java
-@@ -15,11 +15,11 @@
+@@ -18,11 +18,11 @@
   */
  package org.kie.kogito.core.rules.incubation.quarkus.support;
  
@@ -3644,11 +3687,11 @@ index 745a82c7a5..29926d40e0 100644
  import org.kie.kogito.incubation.common.LocalId;
  import org.kie.kogito.incubation.rules.data.DataId;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
-index 29d477383c..cffab27b70 100644
+index 8fd6c24146..6ec9b87446 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitIdFactory.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.core.rules.incubation.quarkus.support;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3657,10 +3700,10 @@ index 29d477383c..cffab27b70 100644
  import org.kie.kogito.incubation.rules.RuleUnitIds;
  
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
-index 8365343e6a..a6b55dd0b9 100644
+index 80368286a2..5fe045b532 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusRuleUnitService.java
-@@ -18,11 +18,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
+@@ -20,11 +20,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
  
  import java.util.stream.Stream;
  
@@ -3677,10 +3720,10 @@ index 8365343e6a..a6b55dd0b9 100644
  import org.kie.kogito.incubation.common.DataContext;
  import org.kie.kogito.incubation.common.Id;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
-index 512ab03669..943b6c197b 100644
+index 842cb11c73..0019bdad1e 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/QuarkusStatefulRuleUnitService.java
-@@ -17,11 +17,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
+@@ -20,11 +20,11 @@ package org.kie.kogito.core.rules.incubation.quarkus.support;
  
  import java.util.stream.Stream;
  
@@ -3697,11 +3740,11 @@ index 512ab03669..943b6c197b 100644
  import org.kie.kogito.incubation.common.ExtendedReferenceContext;
  import org.kie.kogito.incubation.common.LocalId;
 diff --git a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
-index 6c3bc7471b..6d23aa87de 100644
+index e5bb3dd487..05071bef84 100644
 --- a/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
 +++ b/quarkus/extensions/kogito-quarkus-rules-extension/kogito-quarkus-rules/src/main/java/org/kie/kogito/core/rules/incubation/quarkus/support/RuleUnitDataObjectCustomizer.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.core.rules.incubation.quarkus.support;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3710,10 +3753,10 @@ index 6c3bc7471b..6d23aa87de 100644
  import com.fasterxml.jackson.databind.ObjectMapper;
  
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
-index c44ad0c604..c476df0aa1 100644
+index 73f2ecc13b..8a7edf8736 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/asyncapi/AsyncAPIInfoConverter.java
-@@ -24,9 +24,9 @@ import org.kie.kogito.serverless.workflow.asyncapi.AsyncChannelInfo;
+@@ -27,9 +27,9 @@ import org.kie.kogito.serverless.workflow.asyncapi.AsyncChannelInfo;
  import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfo;
  import org.kie.kogito.serverless.workflow.asyncapi.AsyncInfoConverter;
  
@@ -3727,10 +3770,10 @@ index c44ad0c604..c476df0aa1 100644
  import io.quarkiverse.asyncapi.config.AsyncAPIRegistry;
  
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
-index 4940e8a246..7be51afdd0 100644
+index ba1fa4ba9b..765cbcf449 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/deployment/livereload/LiveReloadProcessor.java
-@@ -27,7 +27,7 @@ import java.util.ServiceLoader;
+@@ -30,7 +30,7 @@ import java.util.ServiceLoader;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
@@ -3740,10 +3783,10 @@ index 4940e8a246..7be51afdd0 100644
  import org.drools.codegen.common.GeneratedFile;
  import org.drools.codegen.common.GeneratedFileType;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
-index 315815dde1..e89e5681d7 100644
+index f502b34a83..b14f123a0b 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/openapi/WorkflowOpenApiHandlerGenerator.java
-@@ -19,8 +19,8 @@ import java.lang.annotation.Annotation;
+@@ -22,8 +22,8 @@ import java.lang.annotation.Annotation;
  import java.util.Map;
  import java.util.stream.Stream;
  
@@ -3755,10 +3798,10 @@ index 315815dde1..e89e5681d7 100644
  import org.jboss.jandex.AnnotationInstance;
  import org.jboss.jandex.ClassInfo;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
-index f3669957d8..cb8ac2d291 100644
+index 37127f0604..e6144f96c4 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/rpc/WorkflowRPCHandlerGenerator.java
-@@ -19,8 +19,8 @@ import java.util.Collection;
+@@ -22,8 +22,8 @@ import java.util.Collection;
  import java.util.Collections;
  import java.util.stream.Collectors;
  
@@ -3770,10 +3813,10 @@ index f3669957d8..cb8ac2d291 100644
  import org.eclipse.microprofile.config.inject.ConfigProperty;
  import org.jboss.jandex.IndexView;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
-index 4ca73cc492..e98166a412 100644
+index 30a50a9eef..881d80ea18 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/src/main/java/org/kie/kogito/serverless/workflow/io/QuarkusResourceCache.java
-@@ -18,10 +18,11 @@ package org.kie.kogito.serverless.workflow.io;
+@@ -21,10 +21,11 @@ package org.kie.kogito.serverless.workflow.io;
  import java.net.URI;
  import java.util.function.Function;
  
@@ -3788,10 +3831,10 @@ index 4ca73cc492..e98166a412 100644
  import io.quarkus.runtime.Startup;
  
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java
-index 509b193727..2b0fa6b37f 100644
+index 38415e9b46..91a4f9e910 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/AgePersonService.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.workflows.services;
+@@ -20,7 +20,7 @@ package org.kie.kogito.workflows.services;
  
  import java.util.Date;
  
@@ -3801,10 +3844,10 @@ index 509b193727..2b0fa6b37f 100644
  @ApplicationScoped
  public class AgePersonService {
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java
-index dc3118ee0d..177ea936b4 100644
+index 10bcefb642..13f31b359c 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/EvenService.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.workflows.services;
  
@@ -3814,10 +3857,10 @@ index dc3118ee0d..177ea936b4 100644
  @ApplicationScoped
  public class EvenService {
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
-index 48da214211..ad0690a10e 100644
+index 838f60172b..12f949e1c3 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/GreetResource.java
-@@ -18,13 +18,13 @@ package org.kie.kogito.workflows.services;
+@@ -20,13 +20,13 @@ package org.kie.kogito.workflows.services;
  
  import java.util.Map;
  
@@ -3839,11 +3882,11 @@ index 48da214211..ad0690a10e 100644
  import org.kie.kogito.Model;
  import org.kie.kogito.process.Process;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
-index a8bbd59754..926bdf0a01 100644
+index d9175ba155..5e4db1e3bc 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/JavaSerializationProducer.java
-@@ -16,10 +16,10 @@
- 
+@@ -18,10 +18,10 @@
+  */
  package org.kie.kogito.workflows.services;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3858,11 +3901,11 @@ index a8bbd59754..926bdf0a01 100644
  import org.kie.kogito.addon.quarkus.messaging.common.ChannelFormat;
  import org.kie.kogito.event.CloudEventUnmarshallerFactory;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
-index 0823a2e051..9c0eccaadd 100644
+index abe000d6f7..419aa07937 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/NodeInstanceTriggerEventListener.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.workflows.services;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -3871,10 +3914,10 @@ index 0823a2e051..9c0eccaadd 100644
  import org.kie.api.event.process.ProcessNodeLeftEvent;
  import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java
-index bdd7d1720c..7e552f59ef 100644
+index 7011b3f04f..36197c0232 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/PersonService.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.workflows.services;
  
@@ -3884,10 +3927,10 @@ index bdd7d1720c..7e552f59ef 100644
  @ApplicationScoped
  public class PersonService {
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
-index a6c5a651fa..f0dd659b43 100644
+index 942c0709d8..2851f80580 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandler.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.workflows.services;
+@@ -20,7 +20,7 @@ package org.kie.kogito.workflows.services;
  
  import java.util.Map;
  
@@ -3897,10 +3940,10 @@ index a6c5a651fa..f0dd659b43 100644
  import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
  import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
-index 6912f78a63..4dd30499c3 100644
+index 40748ec9fb..a33e0658d6 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/RPCCustomWorkItemHandlerConfig.java
-@@ -15,10 +15,10 @@
+@@ -18,10 +18,10 @@
   */
  package org.kie.kogito.workflows.services;
  
@@ -3915,10 +3958,10 @@ index 6912f78a63..4dd30499c3 100644
  
  @ApplicationScoped
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java
-index 36bf8b0aea..935196b5b6 100644
+index 4a93f89081..f72348a510 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/java/org/kie/kogito/workflows/services/SquareService.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.workflows.services;
+@@ -21,7 +21,7 @@ package org.kie.kogito.workflows.services;
  import java.util.Collection;
  import java.util.stream.Collectors;
  
@@ -3928,10 +3971,10 @@ index 36bf8b0aea..935196b5b6 100644
  @ApplicationScoped
  public class SquareService {
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java
-index 65062209a1..d153dc8aec 100644
+index 007127ec48..7ffa1481b7 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExternalServiceMock.java
-@@ -31,8 +31,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
+@@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
  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;
@@ -3943,10 +3986,10 @@ index 65062209a1..d153dc8aec 100644
  public class ExternalServiceMock implements QuarkusTestResourceLifecycleManager {
  
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java
-index be7ad20898..0bde93b19a 100644
+index 5bd6325ac3..67d3d66bcc 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/KeycloakServiceMock.java
-@@ -28,9 +28,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+@@ -31,9 +31,9 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
  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;
@@ -3960,10 +4003,10 @@ index be7ad20898..0bde93b19a 100644
  /**
   * Lightweight Keycloak mock to use when an OidcClient is required, and we don't want/need to start a full Keycloak
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
-index 4664345ac0..7a143bd0f8 100644
+index 93f7844f2b..8457c1846f 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/SubFlowsIT.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.quarkus.workflows;
+@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows;
  import java.time.Duration;
  import java.util.UUID;
  
@@ -3973,10 +4016,10 @@ index 4664345ac0..7a143bd0f8 100644
  import org.junit.jupiter.api.Test;
  
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
-index a28a8819d5..654097b817 100644
+index 0802aed3d1..0c42b4214a 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationExternalServicesMock.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.quarkus.workflows;
+@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows;
  import java.util.Collections;
  import java.util.Map;
  
@@ -3985,7 +4028,7 @@ index a28a8819d5..654097b817 100644
  
  import com.github.tomakehurst.wiremock.WireMockServer;
  
-@@ -31,8 +31,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
+@@ -33,8 +33,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
  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;
@@ -3997,10 +4040,10 @@ index a28a8819d5..654097b817 100644
  
  public class TokenPropagationExternalServicesMock implements QuarkusTestResourceLifecycleManager {
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
-index c8cbb16e26..13b3381075 100644
+index 12c7faa5b6..d7194e46fe 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/TokenPropagationIT.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.quarkus.workflows;
+@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.workflows;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -4023,10 +4066,10 @@ index 2f0c60b687..4022c85adb 100644
          <executions>
            <execution>
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
-index f7aac47075..26198b71e0 100644
+index 9070b5e922..2ed35472f4 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/expr/jq/JqQuarkusExtension.java
-@@ -15,11 +15,10 @@
+@@ -18,11 +18,11 @@
   */
  package org.kie.kogito.expr.jq;
  
@@ -4035,20 +4078,19 @@ index f7aac47075..26198b71e0 100644
 +import jakarta.inject.Inject;
  
  import io.quarkus.runtime.Startup;
--
+ 
 +import jakarta.annotation.PostConstruct;
  import net.thisptr.jackson.jq.Scope;
  
  @Startup
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
-index 633f653b51..efbde37ba8 100644
+index 9fa0551c10..33fc2e550c 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/secret/QuarkusConfigResolverRegister.java
-@@ -14,9 +14,7 @@
-  * limitations under the License.
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.secret;
--
+ 
 -import javax.annotation.PostConstruct;
 -
 +import jakarta.annotation.PostConstruct;
@@ -4056,11 +4098,11 @@ index 633f653b51..efbde37ba8 100644
  
  import io.quarkus.runtime.Startup;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
-index af5f61d1f0..767c7ea624 100644
+index 54c0614393..9d5030bd2f 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/config/ServerlessWorkflowWorkItemHandlerConfig.java
-@@ -16,11 +16,11 @@
- 
+@@ -18,11 +18,11 @@
+  */
  package org.kie.kogito.serverless.workflow.config;
  
 -import javax.annotation.PostConstruct;
@@ -4076,10 +4118,10 @@ index af5f61d1f0..767c7ea624 100644
  import org.kie.kogito.serverless.workflow.WorkflowWorkItemHandler;
  import org.slf4j.Logger;
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
-index 128d514ba0..0a3adc2946 100644
+index d07051612e..b6d051eebe 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/mapper/ObjectMapperConfig.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.serverless.workflow.mapper;
  
@@ -4089,10 +4131,10 @@ index 128d514ba0..0a3adc2946 100644
  import org.kie.kogito.jackson.utils.JsonNodeFactoryListener;
  
 diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
-index dcbc67d4a7..56149fd8a8 100644
+index 6ef78bbf19..c2929e721b 100644
 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
 +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/java/org/kie/kogito/serverless/workflow/openapi/OpenApiWorkItemHandler.java
-@@ -20,9 +20,9 @@ import java.lang.reflect.ParameterizedType;
+@@ -23,9 +23,9 @@ import java.lang.reflect.ParameterizedType;
  import java.util.Collections;
  import java.util.Map;
  
@@ -4106,10 +4148,10 @@ index dcbc67d4a7..56149fd8a8 100644
  import org.kie.kogito.event.cloudevents.extension.ProcessMeta;
  import org.kie.kogito.internal.process.runtime.KogitoWorkItem;
 diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
-index 99e6bd898a..2994328d72 100644
+index 26a0a3c852..e9b6c51100 100644
 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
 +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/KogitoBeanProducer.java
-@@ -17,9 +17,9 @@ package org.kie.kogito.quarkus.workflow;
+@@ -20,9 +20,9 @@ package org.kie.kogito.quarkus.workflow;
  
  import java.util.concurrent.ScheduledExecutorService;
  
@@ -4123,10 +4165,10 @@ index 99e6bd898a..2994328d72 100644
  import org.kie.kogito.config.ConfigBean;
  import org.kie.kogito.correlation.CorrelationService;
 diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
-index d4216b1cc3..41a44c6592 100644
+index bf02d1fa33..69b83fc1bd 100644
 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
 +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/devservices/DataIndexEventPublisher.java
-@@ -19,9 +19,9 @@ package org.kie.kogito.quarkus.workflow.devservices;
+@@ -21,9 +21,9 @@ package org.kie.kogito.quarkus.workflow.devservices;
  import java.util.Collection;
  import java.util.Optional;
  
@@ -4139,10 +4181,10 @@ index d4216b1cc3..41a44c6592 100644
  import org.kie.kogito.event.DataEvent;
  import org.kie.kogito.event.EventPublisher;
 diff --git a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
-index bb23b74c6a..5b6e48e020 100644
+index 56552ca660..d8701e2c33 100644
 --- a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
 +++ b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common/src/main/java/org/kie/kogito/quarkus/workflow/jobs/QuarkusScheduledExecutorService.java
-@@ -20,8 +20,8 @@ import java.util.concurrent.ScheduledFuture;
+@@ -22,8 +22,8 @@ import java.util.concurrent.ScheduledFuture;
  import java.util.concurrent.ScheduledThreadPoolExecutor;
  import java.util.concurrent.TimeUnit;
  
@@ -4154,10 +4196,10 @@ index bb23b74c6a..5b6e48e020 100644
  import org.eclipse.microprofile.context.ThreadContext;
  import org.kie.kogito.services.jobs.impl.InMemoryJobService;
 diff --git a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java
-index 9a8f24e3b8..2bfa200841 100644
+index fe93bfc22d..09baf63f1a 100644
 --- a/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java
 +++ b/quarkus/integration-tests/integration-tests-kogito-plugin/src/it/integration-tests-kogito-plugin-it/src/test/java/org/acme/travels/PersonProcessTest.java
-@@ -23,8 +23,8 @@ import java.util.HashMap;
+@@ -26,8 +26,8 @@ import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
@@ -4169,10 +4211,10 @@ index 9a8f24e3b8..2bfa200841 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.Model;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
-index 1b82df7f43..f7595d1337 100644
+index 02276572fb..5585554ba5 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/main/java/org/kie/kogito/integrationtests/InjectDecisionModels.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.integrationtests;
  
@@ -4182,10 +4224,10 @@ index 1b82df7f43..f7595d1337 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.decision.DecisionConfig;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
-index fc7c733c6a..c151b850f2 100644
+index 589908d1d9..5763a15314 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-legacy-rules/src/main/java/org/kie/kogito/legacy/rules/TmsEndpoint.java
-@@ -15,12 +15,12 @@
+@@ -18,12 +18,12 @@
   */
  package org.kie.kogito.legacy.rules;
  
@@ -4202,10 +4244,10 @@ index fc7c733c6a..c151b850f2 100644
  import org.kie.api.runtime.KieRuntimeBuilder;
  import org.kie.api.runtime.KieSession;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
-index 3c7c37692c..e8bc6621b7 100644
+index 4d86f0a465..146f7d6eaa 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/dmn/TrafficViolationTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.quarkus.dmn;
+@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.dmn;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -4215,10 +4257,10 @@ index 3c7c37692c..e8bc6621b7 100644
  import org.junit.jupiter.api.Test;
  import org.kie.dmn.api.core.DMNResult;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
-index 889297c7de..fc16ed3100 100644
+index 0ab9fb60d2..2235b94b67 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/drools/HelloTest.java
-@@ -19,7 +19,7 @@ import java.util.List;
+@@ -22,7 +22,7 @@ import java.util.List;
  import java.util.Map;
  import java.util.stream.Collectors;
  
@@ -4228,10 +4270,10 @@ index 889297c7de..fc16ed3100 100644
  import org.drools.ruleunits.api.RuleUnit;
  import org.drools.ruleunits.api.RuleUnitInstance;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
-index 801e347eb1..b5f41bc4b0 100644
+index 7cbcbf9f89..2dbbb9ca44 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/jbpm/ProcessTest.java
-@@ -18,8 +18,8 @@ package org.kie.kogito.quarkus.jbpm;
+@@ -21,8 +21,8 @@ package org.kie.kogito.quarkus.jbpm;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -4243,10 +4285,10 @@ index 801e347eb1..b5f41bc4b0 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.Model;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
-index c98969bc15..a39f4dab3a 100644
+index f994995181..54f197106d 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-norest/src/test/java/org/kie/kogito/quarkus/pmml/PMMLRegressionTest.java
-@@ -18,7 +18,7 @@ package org.kie.kogito.quarkus.pmml;
+@@ -21,7 +21,7 @@ package org.kie.kogito.quarkus.pmml;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -4256,10 +4298,10 @@ index c98969bc15..a39f4dab3a 100644
  import org.assertj.core.data.Offset;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
-index 99b30ac17f..5b6fa14e9e 100644
+index e998425a4c..4e81f33110 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/HelloService.java
-@@ -17,7 +17,7 @@ package org.kie.kogito;
+@@ -20,7 +20,7 @@ package org.kie.kogito;
  
  import java.io.IOException;
  
@@ -4269,11 +4311,11 @@ index 99b30ac17f..5b6fa14e9e 100644
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
-index 44abbe8aed..a2eebd6c1b 100644
+index 641a4f922a..91629e1559 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/NodeInstanceTriggerEventListener.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -4282,10 +4324,10 @@ index 44abbe8aed..a2eebd6c1b 100644
  import org.kie.api.event.process.ProcessNodeLeftEvent;
  import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
-index 950134a0d3..4d09e25ca5 100644
+index abd03d0669..31c65cd8d0 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/main/java/org/kie/kogito/wih/WIHRegister.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.wih;
  
@@ -4295,10 +4337,10 @@ index 950134a0d3..4d09e25ca5 100644
  import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
  
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
-index b46eefab97..3ff04416a9 100644
+index ba823a3788..1ea029587c 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/acme/WIHRegister.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.acme;
  
@@ -4308,10 +4350,10 @@ index b46eefab97..3ff04416a9 100644
  import org.kie.kogito.process.impl.DefaultWorkItemHandlerConfig;
  
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
-index 2f55304136..b529b767ac 100644
+index e3de3ba4b9..f8ec56ee6a 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/ApprovalResource.java
-@@ -18,14 +18,14 @@ package org.kie.kogito.integrationtests;
+@@ -20,14 +20,14 @@ package org.kie.kogito.integrationtests;
  
  import java.util.Map;
  
@@ -4335,10 +4377,10 @@ index 2f55304136..b529b767ac 100644
  import org.kie.kogito.Model;
  import org.kie.kogito.process.Process;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java
-index ad9fcf92e7..d8e741d714 100644
+index 9498c0e032..031fbc0759 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/EventListenerResource.java
-@@ -19,12 +19,12 @@ package org.kie.kogito.integrationtests;
+@@ -21,12 +21,12 @@ package org.kie.kogito.integrationtests;
  import java.util.HashMap;
  import java.util.Map;
  
@@ -4358,10 +4400,10 @@ index ad9fcf92e7..d8e741d714 100644
  @Path("/events")
  @Produces(MediaType.APPLICATION_JSON)
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
-index 407dd562f3..4d42a1ff24 100755
+index 7cc318736f..026e1caad3 100755
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/HelloService.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.integrationtests;
+@@ -20,7 +20,7 @@ package org.kie.kogito.integrationtests;
  
  import java.io.IOException;
  
@@ -4371,10 +4413,10 @@ index 407dd562f3..4d42a1ff24 100755
  import org.kie.kogito.integrationtests.excetpion.ServiceException;
  import org.slf4j.Logger;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
-index 9153cb6f83..31aed8f893 100644
+index 86dcce9cf3..919b2ef874 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/InjectProcesses.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.integrationtests;
  
@@ -4384,11 +4426,11 @@ index 9153cb6f83..31aed8f893 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.process.ProcessConfig;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
-index 11f3fb7952..2a42e77dee 100644
+index 171e26f73d..28a845f88f 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/NodeInstanceTriggerEventListener.java
-@@ -16,7 +16,7 @@
- 
+@@ -18,7 +18,7 @@
+  */
  package org.kie.kogito.integrationtests;
  
 -import javax.enterprise.context.ApplicationScoped;
@@ -4397,10 +4439,10 @@ index 11f3fb7952..2a42e77dee 100644
  import org.kie.api.event.process.ProcessNodeLeftEvent;
  import org.kie.kogito.internal.process.event.DefaultKogitoProcessEventListener;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
-index 018115ac57..866eec1fe4 100644
+index 1b7f2c85d1..818720a584 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/main/java/org/kie/kogito/integrationtests/UnitOfWorkTestEventListener.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.integrationtests;
+@@ -21,7 +21,7 @@ package org.kie.kogito.integrationtests;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -4410,10 +4452,10 @@ index 018115ac57..866eec1fe4 100644
  import org.kie.kogito.uow.events.UnitOfWorkAbortEvent;
  import org.kie.kogito.uow.events.UnitOfWorkEndEvent;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
-index 59f6147d63..e564a0d7c2 100644
+index 448036c580..662b572bf8 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-processes/src/test/java/org/kie/kogito/integrationtests/quarkus/TaskIT.java
-@@ -23,7 +23,7 @@ import java.util.Collections;
+@@ -26,7 +26,7 @@ import java.util.Collections;
  import java.util.Map;
  import java.util.Set;
  
@@ -4423,10 +4465,10 @@ index 59f6147d63..e564a0d7c2 100644
  import org.acme.travels.Traveller;
  import org.junit.jupiter.api.Test;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
-index a1aa6749ff..7a969aed5e 100644
+index 13e4d2789b..74309f3c16 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-rules/src/main/java/org/kie/kogito/integrationtests/InjectRuleUnits.java
-@@ -15,7 +15,7 @@
+@@ -18,7 +18,7 @@
   */
  package org.kie.kogito.integrationtests;
  
@@ -4436,10 +4478,10 @@ index a1aa6749ff..7a969aed5e 100644
  import org.kie.kogito.Application;
  import org.kie.kogito.rules.RuleConfig;
 diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
-index 2d2627a412..51acce14b8 100644
+index d15814e745..effee0cf27 100644
 --- a/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
 +++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/src/main/java/org/kie/kogito/examples/CalculationService.java
-@@ -17,7 +17,7 @@ package org.kie.kogito.examples;
+@@ -20,7 +20,7 @@ package org.kie.kogito.examples;
  
  import java.util.Random;
  
@@ -4449,10 +4491,10 @@ index 2d2627a412..51acce14b8 100644
  import org.kie.kogito.examples.demo.Order;
  
 diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java
-index 0e56b7f4c1..1f6d444cc9 100644
+index fa81bad963..1fce37229b 100644
 --- a/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java
 +++ b/quarkus/test/src/main/java/org/kie/kogito/test/quarkus/QuarkusTestProperty.java
-@@ -19,7 +19,7 @@ package org.kie.kogito.test.quarkus;
+@@ -21,7 +21,7 @@ package org.kie.kogito.test.quarkus;
  import java.lang.annotation.Retention;
  import java.lang.annotation.Target;
  
@@ -4462,10 +4504,10 @@ index 0e56b7f4c1..1f6d444cc9 100644
  import static java.lang.annotation.ElementType.FIELD;
  import static java.lang.annotation.RetentionPolicy.RUNTIME;
 diff --git a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
-index 08e30d5db9..b15e15a4d3 100644
+index e081fccc33..8b6513edf2 100644
 --- a/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
 +++ b/quarkus/test/src/main/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResource.java
-@@ -20,8 +20,7 @@ import java.util.Collections;
+@@ -23,8 +23,7 @@ import java.util.Collections;
  import java.util.Map;
  import java.util.Optional;
  
@@ -4476,10 +4518,10 @@ index 08e30d5db9..b15e15a4d3 100644
  import org.testcontainers.containers.Container;
  
 diff --git a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
-index bacb17a6be..ebcc399a59 100644
+index 4dc9222f13..1f22146992 100644
 --- a/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
 +++ b/quarkus/test/src/test/java/org/kie/kogito/test/resources/ConditionalQuarkusTestResourceTest.java
-@@ -18,8 +18,7 @@ package org.kie.kogito.test.resources;
+@@ -21,8 +21,7 @@ package org.kie.kogito.test.resources;
  import java.util.Collections;
  import java.util.Map;
  
@@ -4490,10 +4532,10 @@ index bacb17a6be..ebcc399a59 100644
  import org.junit.jupiter.api.Test;
  import org.junit.jupiter.api.extension.ExtendWith;
 diff --git a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
-index 8188a297f6..1486a4b523 100644
+index 813b8448b5..9b38468d83 100644
 --- a/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
 +++ b/springboot/addons/events/decisions/src/main/java/org/kie/kogito/eventdriven/decision/SpringBootEventDrivenDecisionController.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.eventdriven.decision;
  
@@ -4504,11 +4546,11 @@ index 8188a297f6..1486a4b523 100644
  import org.kie.kogito.decision.DecisionModels;
  import org.kie.kogito.event.EventEmitter;
 diff --git a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
-index e9280cdeda..6c15897b1a 100644
+index 8ab43d6c7e..e08186b651 100644
 --- a/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
 +++ b/springboot/addons/events/mongodb/src/main/java/org/kie/kogito/events/mongodb/SpringbootMongoDBEventPublisher.java
-@@ -16,8 +16,7 @@
- 
+@@ -18,8 +18,7 @@
+  */
  package org.kie.kogito.events.mongodb;
  
 -import javax.annotation.PostConstruct;
@@ -4518,10 +4560,10 @@ index e9280cdeda..6c15897b1a 100644
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.beans.factory.annotation.Value;
 diff --git a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
-index 4cbb0cd60b..0fd5c48b70 100644
+index ede3ff7785..14a6d41dfc 100644
 --- a/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
 +++ b/springboot/addons/events/predictions/src/main/java/org/kie/kogito/eventdriven/predictions/SpringBootEventDrivenPredictionsController.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.eventdriven.predictions;
  
@@ -4532,10 +4574,10 @@ index 4cbb0cd60b..0fd5c48b70 100644
  import org.kie.kogito.event.EventEmitter;
  import org.kie.kogito.event.EventReceiver;
 diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml
-index ec8e361691..0abe916c34 100644
+index 8a5537d588..c61418cb3f 100644
 --- a/springboot/addons/jobs/pom.xml
 +++ b/springboot/addons/jobs/pom.xml
-@@ -33,8 +33,8 @@
+@@ -53,8 +53,8 @@
        <artifactId>kogito-spring-boot-starter</artifactId>
      </dependency>
      <dependency>
@@ -4547,10 +4589,10 @@ index ec8e361691..0abe916c34 100644
      <dependency>
        <groupId>org.slf4j</groupId>
 diff --git a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
-index 5c27e4c987..81e7c521de 100644
+index d143618383..a4902cead8 100644
 --- a/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
 +++ b/springboot/addons/jobs/src/main/java/org/kie/kogito/jobs/management/springboot/SpringRestJobsService.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.jobs.management.springboot;
  
@@ -4561,10 +4603,10 @@ index 5c27e4c987..81e7c521de 100644
  import org.kie.kogito.jobs.ProcessJobDescription;
  import org.kie.kogito.jobs.management.RestJobsService;
 diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
-index 97b9d51aac..1d51253270 100644
+index cc049ab883..4264e3fd48 100644
 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
 +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringBootKogitoExtensionInitializer.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.addon.cloudevents.spring;
  
@@ -4575,10 +4617,10 @@ index 97b9d51aac..1d51253270 100644
  import org.kie.kogito.event.cloudevents.extension.KogitoPredictionsExtension;
  import org.kie.kogito.event.cloudevents.extension.KogitoProcessExtension;
 diff --git a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
-index 6e5523f955..74f5aa9067 100644
+index 349d576ea6..5330d48cc8 100644
 --- a/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
 +++ b/springboot/addons/messaging/implementation/src/main/java/org/kie/kogito/addon/cloudevents/spring/SpringKafkaCloudEventReceiver.java
-@@ -23,8 +23,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
+@@ -26,8 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  import java.util.concurrent.ExecutionException;
  import java.util.function.Function;
  
@@ -4589,10 +4631,10 @@ index 6e5523f955..74f5aa9067 100644
  import org.kie.kogito.event.CloudEventUnmarshallerFactory;
  import org.kie.kogito.event.DataEvent;
 diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
-index 30ae90d94c..ec2410eacd 100644
+index 8428936c05..14b64f3ab4 100644
 --- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
 +++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootMetricsInterceptor.java
-@@ -15,8 +15,8 @@
+@@ -18,8 +18,8 @@
   */
  package org.kie.kogito.monitoring.core.springboot;
  
@@ -4604,10 +4646,10 @@ index 30ae90d94c..ec2410eacd 100644
  import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
  import org.springframework.lang.Nullable;
 diff --git a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
-index 1d869f7924..50aa932af6 100644
+index 2742bfaab2..fb29872dcc 100644
 --- a/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
 +++ b/springboot/addons/monitoring/core/src/main/java/org/kie/kogito/monitoring/core/springboot/SpringbootSystemMetricsCollectorProvider.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.monitoring.core.springboot;
  
@@ -4618,10 +4660,10 @@ index 1d869f7924..50aa932af6 100644
  import org.kie.kogito.config.ConfigBean;
  import org.kie.kogito.monitoring.core.common.system.metrics.SystemMetricsCollector;
 diff --git a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
-index 4cacb54001..996815f8a7 100644
+index 761ce48615..f1f7063f33 100644
 --- a/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
 +++ b/springboot/addons/monitoring/core/src/test/java/org/kie/kogito/monitoring/core/springboot/SpringMetricsInterceptorTest.java
-@@ -17,8 +17,8 @@ package org.kie.kogito.monitoring.core.springboot;
+@@ -20,8 +20,8 @@ package org.kie.kogito.monitoring.core.springboot;
  
  import java.util.List;
  
@@ -4633,10 +4675,10 @@ index 4cacb54001..996815f8a7 100644
  import org.junit.jupiter.api.Test;
  import org.kie.kogito.monitoring.core.common.system.interceptor.MetricsInterceptor;
 diff --git a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
-index bf643296a0..ec8ad4e9c2 100644
+index 7dff7614e1..bbec67fe8c 100644
 --- a/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
 +++ b/springboot/addons/monitoring/elastic/src/main/java/org/kie/kogito/monitoring/elastic/springboot/SpringbootElasticRegistryProvider.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.monitoring.elastic.springboot;
  
@@ -4647,10 +4689,10 @@ index bf643296a0..ec8ad4e9c2 100644
  import org.kie.kogito.monitoring.elastic.common.ElasticRegistry;
  import org.kie.kogito.monitoring.elastic.common.KogitoElasticConfig;
 diff --git a/springboot/addons/process-svg/pom.xml b/springboot/addons/process-svg/pom.xml
-index 96f541caac..a1a275b651 100644
+index 4ee9fa3172..ff6a94dbdd 100644
 --- a/springboot/addons/process-svg/pom.xml
 +++ b/springboot/addons/process-svg/pom.xml
-@@ -47,8 +47,8 @@
+@@ -67,8 +67,8 @@
        <scope>provided</scope>
      </dependency>
      <dependency>
@@ -4662,10 +4704,10 @@ index 96f541caac..a1a275b651 100644
      <dependency>
        <groupId>org.slf4j</groupId>
 diff --git a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
-index a0919f003a..fd9c31ee5f 100644
+index ae7baf53b8..69f490e5ce 100644
 --- a/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
 +++ b/springboot/addons/process-svg/src/main/java/org/kie/kogito/svg/dataindex/SpringBootDataIndexClient.java
-@@ -19,8 +19,7 @@ package org.kie.kogito.svg.dataindex;
+@@ -21,8 +21,7 @@ package org.kie.kogito.svg.dataindex;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -4676,10 +4718,10 @@ index a0919f003a..fd9c31ee5f 100644
  import org.kie.kogito.svg.ProcessSVGException;
  import org.slf4j.Logger;
 diff --git a/springboot/addons/tracing-decision/pom.xml b/springboot/addons/tracing-decision/pom.xml
-index 1896563401..e13646549a 100644
+index 01db69293a..fa79d6152d 100644
 --- a/springboot/addons/tracing-decision/pom.xml
 +++ b/springboot/addons/tracing-decision/pom.xml
-@@ -29,8 +29,8 @@
+@@ -49,8 +49,8 @@
      </dependency>
  
      <dependency>
@@ -4691,10 +4733,10 @@ index 1896563401..e13646549a 100644
  
      <dependency>
 diff --git a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
-index 5b7f0e8a75..712d3d1e17 100644
+index b40973043d..da10bdb18b 100644
 --- a/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
 +++ b/springboot/addons/tracing-decision/src/main/java/org/kie/kogito/tracing/decision/SpringBootModelEventEmitter.java
-@@ -15,8 +15,7 @@
+@@ -18,8 +18,7 @@
   */
  package org.kie.kogito.tracing.decision;
  
@@ -4705,10 +4747,10 @@ index 5b7f0e8a75..712d3d1e17 100644
  import org.springframework.beans.factory.annotation.Autowired;
  import org.springframework.beans.factory.annotation.Value;
 diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
-index 8247d78ce6..10b6eff566 100644
+index 898384e80d..929f2d93ba 100644
 --- a/springboot/bom/pom.xml
 +++ b/springboot/bom/pom.xml
-@@ -22,10 +22,9 @@
+@@ -42,10 +42,9 @@
      <version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
      <version.org.spockframework>1.3-groovy-2.4</version.org.spockframework>
      <!-- Spring Boot Cloud aligned with Spring Boot Framework version. See: https://spring.io/projects/spring-cloud -->
@@ -4720,7 +4762,7 @@ index 8247d78ce6..10b6eff566 100644
    </properties>
    
    <dependencyManagement>
-@@ -63,11 +62,6 @@
+@@ -83,11 +82,6 @@
          <artifactId>spring-cloud-starter-kubernetes-fabric8</artifactId>
          <version>${version.org.springframework.cloud.kubernetes.fabric8}</version>
        </dependency>
@@ -4733,10 +4775,10 @@ index 8247d78ce6..10b6eff566 100644
    </dependencyManagement>
    <build>
 diff --git a/springboot/starters/pom.xml b/springboot/starters/pom.xml
-index 97d40cc694..657f222c75 100644
+index 6e7adc0e41..91a0cb673a 100644
 --- a/springboot/starters/pom.xml
 +++ b/springboot/starters/pom.xml
-@@ -44,12 +44,12 @@
+@@ -64,12 +64,12 @@
        <artifactId>kogito-api</artifactId>
      </dependency>
      <dependency>
@@ -4754,10 +4796,10 @@ index 97d40cc694..657f222c75 100644
      <dependency>
        <groupId>io.swagger.core.v3</groupId>
 diff --git a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
-index 7b04631699..62fc719e1b 100644
+index 532c5c34be..a946de2658 100644
 --- a/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
 +++ b/springboot/test/src/main/java/org/kie/kogito/test/springboot/kafka/KafkaTestClient.java
-@@ -26,8 +26,7 @@ import java.util.concurrent.TimeUnit;
+@@ -29,8 +29,7 @@ import java.util.concurrent.TimeUnit;
  import java.util.concurrent.TimeoutException;
  import java.util.function.Consumer;
  
diff --git a/.ci/environments/quarkus-3/quarkus3.yml b/.ci/environments/quarkus-3/quarkus3.yml
index 587fcf4dbe..e6ce9ca4ab 100644
--- a/.ci/environments/quarkus-3/quarkus3.yml
+++ b/.ci/environments/quarkus-3/quarkus3.yml
@@ -3,7 +3,7 @@ description: Update Quarkus version and refactor imports and resources if needed
 type: specs.openrewrite.org/v1beta/recipe
 recipeList:
 - org.openrewrite.maven.ChangePropertyValue: {
-    newValue: 3.0.0.Final,
+    newValue: 3.2.9.Final,
     key: version.io.quarkus
   }
 - org.openrewrite.maven.ChangePropertyValue: {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org