diff --git a/README.md b/README.md
index c2378a55..fd52045d 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ When starting the application you'll see the log output: `Deploying model: class
 
 Inject the process engine or any of the Camunda services using constructor injection:
 ```java
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.RuntimeService;
 
@@ -170,7 +170,7 @@ You can then for example use the `runtimeService` to start new processes instanc
 To invoke a Java delegate create a bean and reference it in your process model using an expression, e.g. `${loggerDelegate}`:
 
 ```java
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
 
@@ -187,7 +187,7 @@ public class LoggerDelegate implements JavaDelegate {
 ```
 
 Internally, the bean will be resolved using `io.micronaut.inject.qualifiers.Qualifiers.byName(...)`.
-Therefore, you can use the annotation `javax.inject.Named` to define an explicit bean name and use that name in your expression.
+Therefore, you can use the annotation `jakarta.inject.Named` to define an explicit bean name and use that name in your expression.
 
 ## Configuration
 
@@ -488,7 +488,7 @@ Every bean that implements the interface `org.camunda.bpm.engine.impl.cfg.Proces
 
 You can either
 * implement a bean factory with `@io.micronaut.context.annotation.Factory` and add one or more methods returning `ProcessEnginePlugin` instances and annotate each with a bean scope annotation
-* annotate your class with `@javax.inject.Singleton` and implement the `ProcessEnginePlugin` interface
+* annotate your class with `@jakarta.inject.Singleton` and implement the `ProcessEnginePlugin` interface
 
 Example with the LDAP plugin:
 
@@ -500,7 +500,7 @@ implementation("org.camunda.bpm.identity:camunda-identity-ldap:7.15.0")
 import io.micronaut.context.annotation.Factory;
 import org.camunda.bpm.engine.impl.cfg.ProcessEnginePlugin;
 import org.camunda.bpm.identity.impl.ldap.plugin.LdapIdentityProviderPlugin;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Factory
 public class PluginConfiguration {
@@ -527,7 +527,7 @@ With the following bean it's possible to customize the process engine configurat
 import info.novatec.micronaut.camunda.bpm.feature.MnProcessEngineConfiguration;
 import info.novatec.micronaut.camunda.bpm.feature.ProcessEngineConfigurationCustomizer;
 import io.micronaut.context.annotation.Replaces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Replaces(ProcessEngineConfigurationCustomizer.class)
@@ -546,7 +546,7 @@ With the following bean it's possible to customize the job executor:
 import info.novatec.micronaut.camunda.bpm.feature.JobExecutorCustomizer;
 import info.novatec.micronaut.camunda.bpm.feature.MnJobExecutor;
 import io.micronaut.context.annotation.Replaces;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Replaces(JobExecutorCustomizer.class)
@@ -743,7 +743,7 @@ import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import static org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareTests.*;
 
diff --git a/gradle.properties b/gradle.properties
index a949c040..7e358ddb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # The project property 'version' is overwritten via .github/workflows/publish-release.yml
 version=0.0.1-SNAPSHOT
 kotlinVersion=1.5.0
-micronautVersion=2.5.12
+micronautVersion=3.0.0-M2
 micronautApplicationPluginVersion=1.5.4
 micronautLibraryPluginVersion=1.5.4
 # The matching versions can be found here:
diff --git a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/LoggerDelegate.java b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/LoggerDelegate.java
index 833c080f..6672b95b 100644
--- a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/LoggerDelegate.java
+++ b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/LoggerDelegate.java
@@ -15,13 +15,12 @@
  */
 package info.novatec.micronaut.camunda.bpm.example;
 
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
-
 @Singleton
 public class LoggerDelegate implements JavaDelegate {
 
diff --git a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/SampleEventListener.java b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/SampleEventListener.java
index a1c4c2f7..8081c9c9 100644
--- a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/SampleEventListener.java
+++ b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/SampleEventListener.java
@@ -19,12 +19,11 @@
 import info.novatec.micronaut.camunda.bpm.feature.eventing.ExecutionEvent;
 import info.novatec.micronaut.camunda.bpm.feature.eventing.TaskEvent;
 import io.micronaut.runtime.event.annotation.EventListener;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.impl.history.event.HistoryEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
-
 @Singleton
 public class SampleEventListener {
 
diff --git a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/CreateCustomer.java b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/CreateCustomer.java
index 7529489c..1cdff4cf 100644
--- a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/CreateCustomer.java
+++ b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/CreateCustomer.java
@@ -15,13 +15,12 @@
  */
 package info.novatec.micronaut.camunda.bpm.example.onboarding;
 
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
-
 @Singleton
 public class CreateCustomer implements JavaDelegate {
 
diff --git a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/OnboardingProcessInstanceCreator.java b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/OnboardingProcessInstanceCreator.java
index becc457a..a5818686 100644
--- a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/OnboardingProcessInstanceCreator.java
+++ b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/OnboardingProcessInstanceCreator.java
@@ -19,10 +19,9 @@
 import io.micronaut.runtime.server.event.ServerStartupEvent;
 import io.micronaut.scheduling.TaskExecutors;
 import io.micronaut.scheduling.annotation.ExecuteOn;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.RuntimeService;
 
-import javax.inject.Singleton;
-
 @Singleton
 public class OnboardingProcessInstanceCreator implements ApplicationEventListener<ServerStartupEvent> {
 
diff --git a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/ScoreCustomer.java b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/ScoreCustomer.java
index 0d74d9e3..c918282a 100644
--- a/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/ScoreCustomer.java
+++ b/micronaut-camunda-bpm-example/src/main/java/info/novatec/micronaut/camunda/bpm/example/onboarding/ScoreCustomer.java
@@ -15,12 +15,12 @@
  */
 package info.novatec.micronaut.camunda.bpm.example.onboarding;
 
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import java.util.concurrent.ThreadLocalRandom;
 
 @Singleton
diff --git a/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/ApplicationTest.java b/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/ApplicationTest.java
index 18bdaf00..a1ad6718 100644
--- a/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/ApplicationTest.java
+++ b/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/ApplicationTest.java
@@ -17,11 +17,10 @@
 
 import io.micronaut.runtime.EmbeddedApplication;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
-
 @MicronautTest
 class ApplicationTest {
 
diff --git a/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/CamundaControllerTest.java b/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/CamundaControllerTest.java
index 4b762630..ce3d8bc3 100644
--- a/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/CamundaControllerTest.java
+++ b/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/CamundaControllerTest.java
@@ -19,10 +19,9 @@
 import io.micronaut.http.client.RxHttpClient;
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 @MicronautTest
diff --git a/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/HelloWorldProcessTest.java b/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/HelloWorldProcessTest.java
index fda90b34..0c01b3ce 100644
--- a/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/HelloWorldProcessTest.java
+++ b/micronaut-camunda-bpm-example/src/test/java/info/novatec/micronaut/camunda/bpm/example/HelloWorldProcessTest.java
@@ -16,14 +16,13 @@
 package info.novatec.micronaut.camunda.bpm.example;
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Inject;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.RuntimeService;
 import org.camunda.bpm.engine.runtime.ProcessInstance;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
-
 import static org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareTests.*;
 
 @MicronautTest
diff --git a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestCustomConfigurationTest.kt b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestCustomConfigurationTest.kt
index e658824b..9e6c8dc1 100644
--- a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestCustomConfigurationTest.kt
+++ b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestCustomConfigurationTest.kt
@@ -24,12 +24,12 @@ import io.micronaut.http.client.annotation.Client
 import io.micronaut.http.client.exceptions.HttpClientResponseException
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
 import org.eclipse.jetty.server.Server
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import javax.inject.Inject
 
 /**
  * Test the customized REST API on Jetty.
diff --git a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestTest.kt b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestTest.kt
index f35bf1ff..04ac6bef 100644
--- a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestTest.kt
+++ b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyRestTest.kt
@@ -21,10 +21,10 @@ import io.micronaut.http.HttpRequest
 import io.micronaut.http.client.RxHttpClient
 import io.micronaut.http.client.annotation.Client
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.eclipse.jetty.server.Server
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 /**
  * Test the REST API on Jetty.
diff --git a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappCustomConfigurationTest.kt b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappCustomConfigurationTest.kt
index 236f7b3e..32a9612d 100644
--- a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappCustomConfigurationTest.kt
+++ b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappCustomConfigurationTest.kt
@@ -25,12 +25,12 @@ import io.micronaut.http.client.annotation.Client
 import io.micronaut.http.client.exceptions.HttpClientResponseException
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
 import org.eclipse.jetty.server.Server
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import javax.inject.Inject
 
 /**
  * Test the customized Webapps on Jetty.
diff --git a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappTest.kt b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappTest.kt
index 25557318..b46af4e1 100644
--- a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappTest.kt
+++ b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/JettyWebappTest.kt
@@ -23,10 +23,10 @@ import io.micronaut.http.HttpStatus
 import io.micronaut.http.client.RxHttpClient
 import io.micronaut.http.client.annotation.Client
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.eclipse.jetty.server.Server
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 /**
  * Test the Webapps on Jetty.
diff --git a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RedirectToWebappsControllerTest.kt b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RedirectToWebappsControllerTest.kt
index 88852764..f5da2fe0 100644
--- a/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RedirectToWebappsControllerTest.kt
+++ b/micronaut-camunda-bpm-feature/jetty-webapp-and-rest/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RedirectToWebappsControllerTest.kt
@@ -21,10 +21,10 @@ import io.micronaut.http.client.annotation.Client
 import io.micronaut.http.client.exceptions.HttpClientResponseException
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import javax.inject.Inject
 
 @MicronautTest
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/AdminUserCreator.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/AdminUserCreator.java
index ffb3c195..66eb5916 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/AdminUserCreator.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/AdminUserCreator.java
@@ -20,6 +20,7 @@
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
 import io.micronaut.transaction.SynchronousTransactionManager;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.AuthorizationService;
 import org.camunda.bpm.engine.IdentityService;
 import org.camunda.bpm.engine.authorization.Resource;
@@ -30,7 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import java.sql.Connection;
 
 import static org.camunda.bpm.engine.authorization.Authorization.ANY;
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ApplicationServerFactory.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ApplicationServerFactory.java
index 0c3c138a..be980a2f 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ApplicationServerFactory.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/ApplicationServerFactory.java
@@ -24,11 +24,11 @@
 import io.micronaut.servlet.tomcat.TomcatServer;
 import io.micronaut.servlet.undertow.UndertowServer;
 import io.undertow.Version;
+import jakarta.inject.Singleton;
 import org.apache.catalina.util.ServerInfo;
 import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServer;
 import org.eclipse.jetty.util.Jetty;
 
-import javax.inject.Singleton;
 import java.util.Map;
 import java.util.Optional;
 
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaServicesFactory.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaServicesFactory.java
index 54c03e26..b79303dd 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaServicesFactory.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaServicesFactory.java
@@ -16,10 +16,9 @@
 package info.novatec.micronaut.camunda.bpm.feature;
 
 import io.micronaut.context.annotation.Factory;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.*;
 
-import javax.inject.Singleton;
-
 /**
  * This factory provides all Camunda Services based on the current @{@link ProcessEngine}.
  *
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaVersion.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaVersion.java
index 7ef2365c..7dd364d7 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaVersion.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/CamundaVersion.java
@@ -15,9 +15,9 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature;
 
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ProcessEngine;
 
-import javax.inject.Singleton;
 import java.util.Optional;
 
 /**
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultJobExecutorCustomizer.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultJobExecutorCustomizer.java
index a5e15ff0..afdee19e 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultJobExecutorCustomizer.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultJobExecutorCustomizer.java
@@ -15,7 +15,7 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class DefaultJobExecutorCustomizer implements JobExecutorCustomizer {
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultProcessEngineConfigurationCustomizer.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultProcessEngineConfigurationCustomizer.java
index 37244653..28349108 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultProcessEngineConfigurationCustomizer.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/DefaultProcessEngineConfigurationCustomizer.java
@@ -15,7 +15,7 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class DefaultProcessEngineConfigurationCustomizer implements ProcessEngineConfigurationCustomizer {
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/FilterAllTaskCreator.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/FilterAllTaskCreator.java
index 3c330f4f..dd6809cb 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/FilterAllTaskCreator.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/FilterAllTaskCreator.java
@@ -18,13 +18,12 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.filter.Filter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
-
 /**
  * Create a simple "show all" filter if {@code camunda.filter.create} property is present.
  *
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/JettyServerCustomizer.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/JettyServerCustomizer.java
index bb0dbefa..98c587a8 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/JettyServerCustomizer.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/JettyServerCustomizer.java
@@ -19,6 +19,7 @@
 import info.novatec.micronaut.camunda.bpm.feature.webapp.*;
 import io.micronaut.context.event.BeanCreatedEvent;
 import io.micronaut.context.event.BeanCreatedEventListener;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.admin.impl.web.bootstrap.AdminContainerBootstrap;
 import org.camunda.bpm.cockpit.impl.web.bootstrap.CockpitContainerBootstrap;
 import org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter;
@@ -44,7 +45,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import javax.servlet.*;
 import java.util.EnumSet;
 import java.util.HashMap;
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/LicenseKeyConfiguration.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/LicenseKeyConfiguration.java
index e2bcfffb..08e7de38 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/LicenseKeyConfiguration.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/LicenseKeyConfiguration.java
@@ -18,11 +18,11 @@
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ManagementService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import java.net.URL;
 import java.util.Scanner;
 
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnArtifactFactory.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnArtifactFactory.java
index f7215ef7..8c03521a 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnArtifactFactory.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnArtifactFactory.java
@@ -17,11 +17,10 @@
 
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.exceptions.NoSuchBeanException;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ArtifactFactory;
 import org.camunda.bpm.engine.impl.DefaultArtifactFactory;
 
-import javax.inject.Singleton;
-
 /**
  * Micronaut specific implementation of {@link ArtifactFactory} to resolve classes from the {@link ApplicationContext}.
  *
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnBeansResolverFactory.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnBeansResolverFactory.java
index cbd5c37d..f68a39f3 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnBeansResolverFactory.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnBeansResolverFactory.java
@@ -21,12 +21,12 @@
 import io.micronaut.core.naming.NameResolver;
 import io.micronaut.inject.BeanDefinition;
 import io.micronaut.inject.qualifiers.Qualifiers;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.VariableScope;
 import org.camunda.bpm.engine.impl.scripting.engine.Resolver;
 import org.camunda.bpm.engine.impl.scripting.engine.ResolverFactory;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnJobExecutor.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnJobExecutor.java
index f818fa44..b8af1cc1 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnJobExecutor.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnJobExecutor.java
@@ -16,13 +16,14 @@
 package info.novatec.micronaut.camunda.bpm.feature;
 
 import io.micronaut.scheduling.TaskExecutors;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
+import org.camunda.bpm.engine.impl.ProcessEngineImpl;
+import org.camunda.bpm.engine.impl.jobexecutor.JobExecutor;
+
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
-import javax.inject.Named;
-import javax.inject.Singleton;
-import org.camunda.bpm.engine.impl.ProcessEngineImpl;
-import org.camunda.bpm.engine.impl.jobexecutor.JobExecutor;
 
 /**
  * Micronaut specific implementation of the {@link org.camunda.bpm.engine.impl.jobexecutor.JobExecutor}
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java
index 503b75a9..94045c32 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnProcessEngineConfiguration.java
@@ -24,6 +24,7 @@
 import io.micronaut.core.beans.BeanProperty;
 import io.micronaut.jdbc.BasicJdbcConfiguration;
 import io.micronaut.transaction.SynchronousTransactionManager;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.ProcessEngineConfiguration;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
@@ -32,7 +33,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.time.Instant;
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnTelemetryRegistry.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnTelemetryRegistry.java
index 2d76fd3f..dfddc8a7 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnTelemetryRegistry.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/MnTelemetryRegistry.java
@@ -15,12 +15,12 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature;
 
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.impl.telemetry.TelemetryRegistry;
 import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import java.util.Optional;
 
 /**
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java
index 9a2f352f..db617559 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/EventingPublisherPlugin.java
@@ -18,6 +18,7 @@
 
 import info.novatec.micronaut.camunda.bpm.feature.Configuration;
 import io.micronaut.context.annotation.Requires;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.impl.bpmn.parser.BpmnParseListener;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
@@ -26,7 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import java.util.ArrayList;
 
 /**
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java
index 544b5cc6..1eaec6b5 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishDelegateParseListener.java
@@ -18,6 +18,7 @@
 
 import info.novatec.micronaut.camunda.bpm.feature.Configuration;
 import io.micronaut.context.event.ApplicationEventPublisher;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.ExecutionListener;
 import org.camunda.bpm.engine.delegate.TaskListener;
 import org.camunda.bpm.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
@@ -30,7 +31,6 @@
 import org.camunda.bpm.engine.impl.util.xml.Element;
 import org.camunda.bpm.engine.impl.variable.VariableDeclaration;
 
-import javax.inject.Singleton;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishHistoryEventHandler.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishHistoryEventHandler.java
index fa60098d..005e4e03 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishHistoryEventHandler.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/eventing/PublishHistoryEventHandler.java
@@ -17,10 +17,10 @@
 package info.novatec.micronaut.camunda.bpm.feature.eventing;
 
 import io.micronaut.context.event.ApplicationEventPublisher;
+import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.impl.history.event.HistoryEvent;
 import org.camunda.bpm.engine.impl.history.handler.HistoryEventHandler;
 
-import javax.inject.Singleton;
 import java.util.List;
 
 /**
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/tx/MnTransactionContext.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/tx/MnTransactionContext.java
index 6f27d53f..5de638a4 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/tx/MnTransactionContext.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/tx/MnTransactionContext.java
@@ -15,7 +15,7 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature.tx;
 
-import edu.umd.cs.findbugs.annotations.NonNull;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.transaction.SynchronousTransactionManager;
 import io.micronaut.transaction.support.TransactionSynchronization;
 import io.micronaut.transaction.support.TransactionSynchronizationAdapter;
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/CockpitRuntimeDelegateInitializer.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/CockpitRuntimeDelegateInitializer.java
index 144bd7af..8b2024c8 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/CockpitRuntimeDelegateInitializer.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/CockpitRuntimeDelegateInitializer.java
@@ -20,6 +20,7 @@
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
 import io.micronaut.transaction.SynchronousTransactionManager;
+import jakarta.inject.Singleton;
 import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
 import org.camunda.bpm.cockpit.Cockpit;
 import org.camunda.bpm.cockpit.CockpitRuntimeDelegate;
@@ -29,7 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
 import java.sql.Connection;
 
 /**
diff --git a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/JettyRuntimeMissing.java b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/JettyRuntimeMissing.java
index b393740c..43f3ae87 100644
--- a/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/JettyRuntimeMissing.java
+++ b/micronaut-camunda-bpm-feature/src/main/java/info/novatec/micronaut/camunda/bpm/feature/webapp/JettyRuntimeMissing.java
@@ -20,11 +20,10 @@
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.runtime.server.event.ServerStartupEvent;
 import io.micronaut.servlet.jetty.JettyServer;
+import jakarta.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Singleton;
-
 /**
  * Log a warning if Webapps or REST are enabled but not supported on the current server runtime.
  *
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/AdminUserCreatorTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/AdminUserCreatorTest.kt
index 17beb7e7..722cd771 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/AdminUserCreatorTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/AdminUserCreatorTest.kt
@@ -22,6 +22,7 @@ import io.micronaut.runtime.server.EmbeddedServer
 import io.micronaut.runtime.server.event.ServerStartupEvent
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.ProcessEngine
 import org.camunda.bpm.engine.authorization.Authorization.ANY
 import org.camunda.bpm.engine.authorization.Groups.CAMUNDA_ADMIN
@@ -34,7 +35,6 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.mockito.Mockito.mock
 import java.util.*
-import javax.inject.Inject
 
 /**
  * Tests for [info.novatec.micronaut.camunda.bpm.feature.AdminUserCreator]
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/BeanInvocationTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/BeanInvocationTest.kt
index 75f23041..26cca0f4 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/BeanInvocationTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/BeanInvocationTest.kt
@@ -16,6 +16,8 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
+import jakarta.inject.Named
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.RuntimeService
 import org.camunda.bpm.engine.delegate.DelegateExecution
@@ -24,9 +26,8 @@ import org.camunda.bpm.model.bpmn.Bpmn
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentMatchers
-import org.mockito.Mockito.*
-import javax.inject.Inject
-import javax.inject.Named
+import org.mockito.Mockito.reset
+import org.mockito.Mockito.verify
 
 @MicronautTest
 class BeanInvocationTest {
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaServicesFactoryTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaServicesFactoryTest.kt
index c1ff8b88..eec9d2e6 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaServicesFactoryTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaServicesFactoryTest.kt
@@ -16,10 +16,10 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.*
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 @MicronautTest
 class CamundaServicesFactoryTest {
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaVersionEnterprise.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaVersionEnterprise.kt
index 7ebe3e67..1850eb25 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaVersionEnterprise.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/CamundaVersionEnterprise.kt
@@ -17,7 +17,7 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 
 import info.novatec.micronaut.camunda.bpm.feature.CamundaVersion
 import io.micronaut.context.annotation.Replaces
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 
 /**
  * @author Martin Sawilla
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DefaultPropertySourceLoaderTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DefaultPropertySourceLoaderTest.kt
index 94c138ce..ca2fa972 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DefaultPropertySourceLoaderTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DefaultPropertySourceLoaderTest.kt
@@ -18,10 +18,10 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Property
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 /**
  * Test that [info.novatec.micronaut.camunda.bpm.feature.DefaultPropertySourceLoader] handles the custom properties correctly.
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DoNothingDelegate.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DoNothingDelegate.kt
index 4792fc18..d496806f 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DoNothingDelegate.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/DoNothingDelegate.kt
@@ -15,10 +15,10 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature.test
 
+import jakarta.inject.Named
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.camunda.bpm.engine.delegate.JavaDelegate
-import javax.inject.Named
-import javax.inject.Singleton
 
 /**
  * [JavaDelegate] which doesn't do anything. This implementation may be replaced in other tests.
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt
index c3bcbe4b..ed309c85 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/EventingPublisherPluginTest.kt
@@ -21,6 +21,8 @@ import info.novatec.micronaut.camunda.bpm.feature.eventing.ExecutionEvent
 import io.micronaut.context.event.ApplicationEventListener
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.assertj.core.api.Assertions.assertThat
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.RuntimeService
@@ -28,8 +30,6 @@ import org.camunda.bpm.model.bpmn.Bpmn
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
-import javax.inject.Inject
-import javax.inject.Singleton
 
 class EventingPublisherPluginTest {
 
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/FilterAllTaskCreatorTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/FilterAllTaskCreatorTest.kt
index 4cca6b60..02362a31 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/FilterAllTaskCreatorTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/FilterAllTaskCreatorTest.kt
@@ -19,12 +19,12 @@ import info.novatec.micronaut.camunda.bpm.feature.Configuration
 import info.novatec.micronaut.camunda.bpm.feature.FilterAllTaskCreator
 import io.micronaut.context.annotation.Property
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.ProcessEngine
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import java.util.*
-import javax.inject.Inject
 
 /**
  * Tests for [FilterAllTaskCreator].
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/LicenseKeyConfigurationTests.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/LicenseKeyConfigurationTests.kt
index 96889d06..d80fd6a7 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/LicenseKeyConfigurationTests.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/LicenseKeyConfigurationTests.kt
@@ -21,12 +21,12 @@ import io.micronaut.runtime.server.EmbeddedServer
 import io.micronaut.runtime.server.event.ServerStartupEvent
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.test.support.TestPropertyProvider
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.ManagementService
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.Assertions.*
 import org.mockito.Mockito
 import java.util.*
-import javax.inject.Inject
 
 /**
  * @author Martin Sawilla
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MicronautProcessEngineConfigurationCustomizer.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MicronautProcessEngineConfigurationCustomizer.kt
index 83d62598..6cf9d1bb 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MicronautProcessEngineConfigurationCustomizer.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MicronautProcessEngineConfigurationCustomizer.kt
@@ -18,7 +18,7 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 import info.novatec.micronaut.camunda.bpm.feature.MnProcessEngineConfiguration
 import info.novatec.micronaut.camunda.bpm.feature.ProcessEngineConfigurationCustomizer
 import io.micronaut.context.annotation.Replaces
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 
 @Singleton
 @Replaces(ProcessEngineConfigurationCustomizer::class)
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnBeansResolverFactoryTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnBeansResolverFactoryTest.kt
index 70986e66..cbf7157e 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnBeansResolverFactoryTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnBeansResolverFactoryTest.kt
@@ -17,6 +17,9 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 
 import info.novatec.micronaut.camunda.bpm.feature.test.ProcessUtil.Companion.deploy
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
+import jakarta.inject.Named
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.RuntimeService
 import org.camunda.bpm.engine.ScriptEvaluationException
@@ -24,9 +27,6 @@ import org.camunda.bpm.model.bpmn.Bpmn
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
-import javax.inject.Named
-import javax.inject.Singleton
 
 /**
  * Tests for [info.novatec.micronaut.camunda.bpm.feature.MnBeansResolverFactory]
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnProcessEngineConfigurationTransactionTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnProcessEngineConfigurationTransactionTest.kt
index 30922e45..b0abb321 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnProcessEngineConfigurationTransactionTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnProcessEngineConfigurationTransactionTest.kt
@@ -19,6 +19,7 @@ import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import io.micronaut.transaction.SynchronousTransactionManager
 import io.micronaut.transaction.TransactionCallback
 import io.micronaut.transaction.TransactionStatus
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.HistoryService
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.RuntimeService
@@ -28,7 +29,6 @@ import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.sql.Connection
-import javax.inject.Inject
 
 /**
  * Executes the inherited tests with a transaction manager.
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnTelemetryRegistryTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnTelemetryRegistryTest.kt
index d84441ed..4526f342 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnTelemetryRegistryTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnTelemetryRegistryTest.kt
@@ -17,9 +17,9 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 
 import info.novatec.micronaut.camunda.bpm.feature.MnTelemetryRegistry
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 /**
  * Tests for [MnTelemetryRegistry]
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MyDelegateFactory.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MyDelegateFactory.kt
index 30f9291f..04570f37 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MyDelegateFactory.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MyDelegateFactory.kt
@@ -16,10 +16,10 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.context.annotation.Factory
+import jakarta.inject.Named
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.delegate.JavaDelegate
 import org.mockito.Mockito.*
-import javax.inject.Named
-import javax.inject.Singleton
 
 @Factory
 class MyDelegateFactory {
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryDeploymentTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryDeploymentTest.kt
index bd8a48a5..d36a4806 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryDeploymentTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryDeploymentTest.kt
@@ -18,12 +18,12 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 import info.novatec.micronaut.camunda.bpm.feature.ProcessEngineFactory
 import io.micronaut.context.annotation.Property
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.assertj.core.api.Assertions.assertThat
 import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.repository.Deployment
 import org.camunda.bpm.engine.repository.ProcessDefinition
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 @MicronautTest
 @Property(name="camunda.locations", value="classpath:.,classpath:bpm")
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryTest.kt
index 5bfcb0f1..50f49d0b 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEngineFactoryTest.kt
@@ -16,14 +16,15 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.ProcessEngine
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
 
 @MicronautTest
 class ProcessEngineFactoryTest {
+
     @Inject
     lateinit var processEngine: ProcessEngine
 
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEnginePluginsTest.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEnginePluginsTest.kt
index c6e03080..2202aee2 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEnginePluginsTest.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/ProcessEnginePluginsTest.kt
@@ -18,11 +18,11 @@ package info.novatec.micronaut.camunda.bpm.feature.test
 import info.novatec.micronaut.camunda.bpm.feature.MnProcessEngineConfiguration
 import io.micronaut.test.annotation.MockBean
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
 import org.camunda.bpm.engine.impl.cfg.ProcessEnginePlugin
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito.mock
-import javax.inject.Inject
 
 /**
  * @author Martin Sawilla
diff --git a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegate.kt b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegate.kt
index 65ecd0e5..100cc86e 100644
--- a/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegate.kt
+++ b/micronaut-camunda-bpm-feature/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegate.kt
@@ -15,9 +15,9 @@
  */
 package info.novatec.micronaut.camunda.bpm.feature.test
 
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.camunda.bpm.engine.delegate.JavaDelegate
-import javax.inject.Singleton
 
 /**
  * [JavaDelegate] which throws a [RuntimeException].
diff --git a/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnJpaProcessEngineConfigurationTransactionTest.kt b/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnJpaProcessEngineConfigurationTransactionTest.kt
index 5e36376d..2ffe8e72 100644
--- a/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnJpaProcessEngineConfigurationTransactionTest.kt
+++ b/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/MnJpaProcessEngineConfigurationTransactionTest.kt
@@ -16,14 +16,14 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.camunda.bpm.engine.delegate.JavaDelegate
 import org.camunda.bpm.model.bpmn.Bpmn
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
-import javax.inject.Singleton
 
 /**
  * Executes the inherited tests with a JPA configuration. [PersistBookDelegate] replaces [DoNothingDelegate] and persists entities.
diff --git a/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/PersistBookDelegate.kt b/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/PersistBookDelegate.kt
index 803556ba..328b7e11 100644
--- a/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/PersistBookDelegate.kt
+++ b/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/PersistBookDelegate.kt
@@ -16,10 +16,10 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.context.annotation.Replaces
+import jakarta.inject.Named
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.camunda.bpm.engine.delegate.JavaDelegate
-import javax.inject.Named
-import javax.inject.Singleton
 
 /**
  * [JavaDelegate] which replaces the [DoNothingDelegate] and included the persistence of an entity.
diff --git a/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegateJpa.kt b/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegateJpa.kt
index bffe093e..a6476a8a 100644
--- a/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegateJpa.kt
+++ b/micronaut-camunda-bpm-feature/transactional-test-data-jdbc/src/test/kotlin/info/novatec/micronaut/camunda/bpm/feature/test/RuntimeErrorDelegateJpa.kt
@@ -16,10 +16,10 @@
 package info.novatec.micronaut.camunda.bpm.feature.test
 
 import io.micronaut.context.annotation.Replaces
+import jakarta.inject.Named
+import jakarta.inject.Singleton
 import org.camunda.bpm.engine.delegate.DelegateExecution
 import org.camunda.bpm.engine.delegate.JavaDelegate
-import javax.inject.Named
-import javax.inject.Singleton
 
 /**
  * [JavaDelegate] which replaces @[RuntimeErrorDelegate] which first saves a new entity and then throws a [RuntimeException].