diff --git a/engine-cdi/core/pom.xml b/engine-cdi/core/pom.xml index 34c38f48094..c235ce8a2e2 100644 --- a/engine-cdi/core/pom.xml +++ b/engine-cdi/core/pom.xml @@ -241,21 +241,6 @@ - - - create-test-jar-quarkus - package - - test-jar - - - tests-quarkus - true - - org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.class - - - create-test-jar-weld diff --git a/engine-cdi/jakarta/pom.xml b/engine-cdi/jakarta/pom.xml index b4e8d474b7f..adb815e611a 100644 --- a/engine-cdi/jakarta/pom.xml +++ b/engine-cdi/jakarta/pom.xml @@ -18,7 +18,7 @@ 1.7.0.Alpha14 5.0.1.Final - + @@ -87,7 +87,7 @@ jakarta.interceptor-api provided - + org.jboss.arquillian.container arquillian-weld-embedded @@ -134,7 +134,7 @@ ch.qos.logback logback-classic test - + org.slf4j jcl-over-slf4j @@ -146,7 +146,7 @@ test - + @@ -369,6 +369,21 @@ true + + + create-test-jar-quarkus + package + + test-jar + + + tests-quarkus + true + + org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.class + + + diff --git a/parent/pom.xml b/parent/pom.xml index 662b4bec196..118aaa2502a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ - 2.16.4.Final + 3.1.1.Final 5.3.27 6.0.9 2.7.12 diff --git a/quarkus-extension/engine/deployment/src/main/java/org/camunda/bpm/quarkus/engine/extension/deployment/impl/CamundaEngineProcessor.java b/quarkus-extension/engine/deployment/src/main/java/org/camunda/bpm/quarkus/engine/extension/deployment/impl/CamundaEngineProcessor.java index a2155454509..6247c76bb4d 100644 --- a/quarkus-extension/engine/deployment/src/main/java/org/camunda/bpm/quarkus/engine/extension/deployment/impl/CamundaEngineProcessor.java +++ b/quarkus-extension/engine/deployment/src/main/java/org/camunda/bpm/quarkus/engine/extension/deployment/impl/CamundaEngineProcessor.java @@ -45,7 +45,7 @@ import org.camunda.bpm.quarkus.engine.extension.QuarkusProcessEngineConfiguration; import org.jboss.jandex.DotName; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import static io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem.ContextConfiguratorBuildItem; import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/BusinessProcessContextTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/BusinessProcessContextTest.java index 966f731f19e..554d0375b3d 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/BusinessProcessContextTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/BusinessProcessContextTest.java @@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.inject.spi.Bean; -import javax.inject.Named; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.inject.Named; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ConfigurableProcessEngineTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ConfigurableProcessEngineTest.java index 9d845210690..bdcc9c3a0d9 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ConfigurableProcessEngineTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ConfigurableProcessEngineTest.java @@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/EmbeddedProcessEngineTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/EmbeddedProcessEngineTest.java index 67215f62916..57d1324db2f 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/EmbeddedProcessEngineTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/EmbeddedProcessEngineTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.QuarkusUnitTest; import org.camunda.bpm.engine.ProcessEngine; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ManagedJobExecutorTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ManagedJobExecutorTest.java index 526232093a2..5abfed594c4 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ManagedJobExecutorTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ManagedJobExecutorTest.java @@ -35,9 +35,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigFileTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigFileTest.java index ae9a4abdbd7..bdc86a45eee 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigFileTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigFileTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.SQLException; import io.quarkus.test.QuarkusUnitTest; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigurationConfigTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigurationConfigTest.java index 73f8437fefc..1b57a8637fe 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigurationConfigTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigurationConfigTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.QuarkusUnitTest; import org.camunda.bpm.engine.ProcessEngine; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineDefaultConfigTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineDefaultConfigTest.java index 86b50f46e2e..f5c4b60229c 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineDefaultConfigTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineDefaultConfigTest.java @@ -27,9 +27,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; import static org.camunda.bpm.engine.ProcessEngineConfiguration.DB_SCHEMA_UPDATE_TRUE; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineJobExecutorConfigTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineJobExecutorConfigTest.java index 628a202baf9..6cfca367086 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineJobExecutorConfigTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineJobExecutorConfigTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; +import jakarta.inject.Inject; import io.quarkus.test.QuarkusUnitTest; import org.camunda.bpm.quarkus.engine.extension.CamundaEngineConfig; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineProgrammaticAndConfigFileTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineProgrammaticAndConfigFileTest.java index ace1147bb35..f178f017a59 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineProgrammaticAndConfigFileTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineProgrammaticAndConfigFileTest.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import java.sql.SQLException; import io.quarkus.test.QuarkusUnitTest; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineMultipleDeploymentTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineMultipleDeploymentTest.java index e702e5dd77e..e0b2c9e37d3 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineMultipleDeploymentTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineMultipleDeploymentTest.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import java.util.List; import java.util.stream.Collectors; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineSingleDeploymentTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineSingleDeploymentTest.java index 49623c13c36..2b0d2ec8ba7 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineSingleDeploymentTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineSingleDeploymentTest.java @@ -18,9 +18,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import java.util.List; import io.quarkus.test.QuarkusUnitTest; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/ConfigureDbIdGeneratorTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/ConfigureDbIdGeneratorTest.java index fae61c06f97..856c9320a59 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/ConfigureDbIdGeneratorTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/ConfigureDbIdGeneratorTest.java @@ -29,9 +29,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/DefaultIdGeneratorTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/DefaultIdGeneratorTest.java index 78e68ae5ba1..e67cb679ca8 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/DefaultIdGeneratorTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/DefaultIdGeneratorTest.java @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.inject.Inject; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/BeanWithProducerMethods.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/BeanWithProducerMethods.java index 6737c6a8b70..e8f9a5c800b 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/BeanWithProducerMethods.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/BeanWithProducerMethods.java @@ -16,9 +16,9 @@ */ package org.camunda.bpm.quarkus.engine.test.lookup; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.inject.Named; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; public class BeanWithProducerMethods { diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/ProgrammaticBeanLookupTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/ProgrammaticBeanLookupTest.java index 6dd6fa9b867..2ad2a2254a0 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/ProgrammaticBeanLookupTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/ProgrammaticBeanLookupTest.java @@ -25,11 +25,11 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.camunda.bpm.engine.cdi.impl.util.ProgrammaticBeanLookup; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Specializes; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Specializes; +import jakarta.inject.Named; import static org.assertj.core.api.Assertions.assertThat; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/TransactionIntegrationTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/TransactionIntegrationTest.java index 510ffeb68cf..182035b6ec5 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/TransactionIntegrationTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/TransactionIntegrationTest.java @@ -41,14 +41,14 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.Transactional; import javax.sql.DataSource; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.Transactional; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/UserTransactionIntegrationTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/UserTransactionIntegrationTest.java index e5ff95006b1..6b1697f6f86 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/UserTransactionIntegrationTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/UserTransactionIntegrationTest.java @@ -28,11 +28,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.inject.Named; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/ChooseDatasourceConfigurationTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/ChooseDatasourceConfigurationTest.java index 61b76619254..753a8e6b1da 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/ChooseDatasourceConfigurationTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/ChooseDatasourceConfigurationTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.SQLException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/DatasourceConfigurationTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/DatasourceConfigurationTest.java index c58ac00c276..f7e0a5d716b 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/DatasourceConfigurationTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/DatasourceConfigurationTest.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.sql.SQLException; diff --git a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/NoDefaultDatasourceConfigurationTest.java b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/NoDefaultDatasourceConfigurationTest.java index 21fddd596da..a29a776a903 100644 --- a/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/NoDefaultDatasourceConfigurationTest.java +++ b/quarkus-extension/engine/deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/persistence/conf/NoDefaultDatasourceConfigurationTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import javax.inject.Inject; +import jakarta.inject.Inject; import static org.assertj.core.api.Assertions.assertThat; public class NoDefaultDatasourceConfigurationTest { diff --git a/quarkus-extension/engine/qa/pom.xml b/quarkus-extension/engine/qa/pom.xml index 7e842a6d1a2..1dca32b36d4 100644 --- a/quarkus-extension/engine/qa/pom.xml +++ b/quarkus-extension/engine/qa/pom.xml @@ -11,7 +11,7 @@ Camunda Platform - Quarkus Extension - Engine - CDI QA - 1.5.0.Final + 1.7.0.Final @@ -44,7 +44,7 @@ - org.camunda.bpm:camunda-engine-cdi + org.camunda.bpm:camunda-engine-cdi-jakarta @@ -70,7 +70,7 @@ org.camunda.bpm - camunda-engine-cdi + camunda-engine-cdi-jakarta ${project.version} test-jar tests-quarkus diff --git a/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.java b/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.java index 0dda7a31b97..1d497e991cc 100644 --- a/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.java +++ b/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.java @@ -39,9 +39,9 @@ import org.junit.After; import org.junit.Before; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.BeanManager; import java.util.HashSet; import java.util.Set; diff --git a/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/bean/QuarkusDeclarativeProcessController.java b/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/bean/QuarkusDeclarativeProcessController.java index 387d62618c3..4d61efdeb8f 100644 --- a/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/bean/QuarkusDeclarativeProcessController.java +++ b/quarkus-extension/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/bean/QuarkusDeclarativeProcessController.java @@ -19,7 +19,7 @@ import io.quarkus.arc.Unremovable; import org.camunda.bpm.engine.cdi.test.impl.beans.DeclarativeProcessController; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; @Dependent @Unremovable diff --git a/quarkus-extension/engine/runtime/pom.xml b/quarkus-extension/engine/runtime/pom.xml index 199416bc9ea..298bd4a0de2 100644 --- a/quarkus-extension/engine/runtime/pom.xml +++ b/quarkus-extension/engine/runtime/pom.xml @@ -23,7 +23,7 @@ org.camunda.bpm - camunda-engine-cdi + camunda-engine-cdi-jakarta diff --git a/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/QuarkusProcessEngineConfiguration.java b/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/QuarkusProcessEngineConfiguration.java index 937f905206c..dbe3addb928 100644 --- a/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/QuarkusProcessEngineConfiguration.java +++ b/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/QuarkusProcessEngineConfiguration.java @@ -21,11 +21,11 @@ import org.camunda.bpm.engine.impl.interceptor.CommandContextInterceptor; import org.camunda.bpm.engine.impl.interceptor.CommandCounterInterceptor; import org.camunda.bpm.engine.impl.interceptor.CommandInterceptor; -import org.camunda.bpm.engine.impl.interceptor.JtaTransactionInterceptor; +import org.camunda.bpm.engine.impl.interceptor.JakartaTransactionInterceptor; import org.camunda.bpm.engine.impl.interceptor.LogInterceptor; import org.camunda.bpm.engine.impl.persistence.StrongUuidGenerator; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; import java.util.ArrayList; import java.util.List; @@ -52,7 +52,7 @@ public QuarkusProcessEngineConfiguration() { /** * We need to make sure, that the root command always calls {@link TransactionManager#begin} in its interceptor chain * since Agroal does not support deferred/lazy enlistment. This is why we override this method to add - * the {@link JtaTransactionInterceptor} to the interceptor chain. + * the {@link JakartaTransactionInterceptor} to the interceptor chain. */ @Override protected void initCommandExecutorDbSchemaOperations() { @@ -60,7 +60,7 @@ protected void initCommandExecutorDbSchemaOperations() { List commandInterceptorsDbSchemaOperations = new ArrayList<>(); commandInterceptorsDbSchemaOperations.add(new LogInterceptor()); commandInterceptorsDbSchemaOperations.add(new CommandCounterInterceptor(this)); - commandInterceptorsDbSchemaOperations.add(new JtaTransactionInterceptor(transactionManager, false, this)); + commandInterceptorsDbSchemaOperations.add(new JakartaTransactionInterceptor(transactionManager, false, this)); commandInterceptorsDbSchemaOperations.add(new CommandContextInterceptor(dbSchemaOperationsCommandContextFactory, this)); commandInterceptorsDbSchemaOperations.add(actualCommandExecutor); commandExecutorSchemaOperations = initInterceptorChain(commandInterceptorsDbSchemaOperations); diff --git a/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/CamundaEngineRecorder.java b/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/CamundaEngineRecorder.java index 541ff12fe91..a450ddd55e4 100644 --- a/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/CamundaEngineRecorder.java +++ b/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/CamundaEngineRecorder.java @@ -19,7 +19,7 @@ import static com.arjuna.ats.jta.TransactionManager.transactionManager; import static io.quarkus.datasource.common.runtime.DataSourceUtil.DEFAULT_DATASOURCE_NAME; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; import java.util.ArrayList; import java.util.List; diff --git a/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/InjectableBusinessProcessContext.java b/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/InjectableBusinessProcessContext.java index 927fd157a19..ef902faa2f7 100644 --- a/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/InjectableBusinessProcessContext.java +++ b/quarkus-extension/engine/runtime/src/main/java/org/camunda/bpm/quarkus/engine/extension/impl/InjectableBusinessProcessContext.java @@ -20,8 +20,8 @@ import org.camunda.bpm.engine.cdi.impl.context.BusinessProcessContext; import org.camunda.bpm.engine.cdi.impl.util.BeanManagerLookup; -import javax.enterprise.context.spi.Contextual; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.inject.spi.BeanManager; public class InjectableBusinessProcessContext extends BusinessProcessContext implements InjectableContext { @@ -32,19 +32,19 @@ protected BeanManager getBeanManager() { @Override public ContextState getState() { - // Not needed internally by Quarkus 2.0.2 + // Not needed internally by Quarkus throw new UnsupportedOperationException("io.quarkus.arc.InjectableContext#getState is unsupported"); } @Override public void destroy() { - // Not needed internally by Quarkus 2.0.2 + // Not needed internally by Quarkus throw new UnsupportedOperationException("io.quarkus.arc.InjectableContext#destroy is unsupported"); } @Override public void destroy(Contextual contextual) { - // Not needed internally by Quarkus 2.0.2 + // Not needed internally by Quarkus throw new UnsupportedOperationException("io.quarkus.arc.InjectableContext#destroy(contextual) is unsupported"); } diff --git a/quarkus-extension/pom.xml b/quarkus-extension/pom.xml index ed1dcdaaae7..6c32d5c7a80 100644 --- a/quarkus-extension/pom.xml +++ b/quarkus-extension/pom.xml @@ -28,10 +28,6 @@ - - engine - - @@ -47,4 +43,17 @@ + + + + jdk17-and-onwards + + [17,) + + + + engine + + + \ No newline at end of file