You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by fj...@apache.org on 2023/12/04 14:17:06 UTC

(incubator-kie-kogito-runtimes) branch quarkus-3.2LTS updated: Formatting (#3306)

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

fjtiradosarti pushed a commit to branch quarkus-3.2LTS
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git


The following commit(s) were added to refs/heads/quarkus-3.2LTS by this push:
     new 3c77caf253 Formatting (#3306)
3c77caf253 is described below

commit 3c77caf25337b1f6f7a555523a008a19ea194903
Author: Francisco Javier Tirado Sarti <65...@users.noreply.github.com>
AuthorDate: Mon Dec 4 15:17:01 2023 +0100

    Formatting (#3306)
    
    MVn sort imports alphabetically, Jakarta is now before Java
---
 .../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 +++----
 .../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 ++-
 183 files changed, 592 insertions(+), 589 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/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;


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