Update to Micronaut 3.0.0-M2

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.*;
 

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:

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 {
 

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 {
 

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 {
 

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> {
 

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

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 {
 

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

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

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.

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.

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.

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.

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)

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;

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;
 

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}.
  *

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;
 
 /**

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 {

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 {

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.
  *

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;

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;
 

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}.
  *

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;