feat(quarkus): update to quarkus3

related to camunda#3416
vivekchand · Jun 21, 2023 · 66f2e64 · 66f2e64
1 parent 8ef21f7
commit 66f2e64
Show file tree

Hide file tree

Showing 32 changed files with 103 additions and 94 deletions.
diff --git a/engine-cdi/core/pom.xml b/engine-cdi/core/pom.xml
@@ -241,21 +241,6 @@
           <useDefaultManifestFile combine.self="override" />
         </configuration>
         <executions>
-          <!-- create test jar that is consumed by the quarkus qa -->
-          <execution>
-            <id>create-test-jar-quarkus</id>
-            <phase>package</phase>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <classifier>tests-quarkus</classifier>
-              <forceCreation>true</forceCreation>
-              <excludes>
-                <exclude>org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.class</exclude>
-              </excludes>
-            </configuration>
-          </execution>
           <!-- create test jar that is consumed by the weld3 tests -->
           <execution>
             <id>create-test-jar-weld</id>

diff --git a/engine-cdi/jakarta/pom.xml b/engine-cdi/jakarta/pom.xml
@@ -18,7 +18,7 @@
     <arquillian.junit.version>1.7.0.Alpha14</arquillian.junit.version>
     <weld.version>5.0.1.Final</weld.version>
   </properties>
-  
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -87,7 +87,7 @@
       <artifactId>jakarta.interceptor-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-weld-embedded</artifactId>
@@ -134,7 +134,7 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
@@ -146,7 +146,7 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
@@ -369,6 +369,21 @@
               <forceCreation>true</forceCreation>
             </configuration>
           </execution>
+          <!-- create test jar that is consumed by the quarkus qa -->
+          <execution>
+            <id>create-test-jar-quarkus</id>
+            <phase>package</phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <classifier>tests-quarkus</classifier>
+              <forceCreation>true</forceCreation>
+              <excludes>
+                <exclude>org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.class</exclude>
+              </excludes>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -18,7 +18,7 @@
   </description>
 
   <properties>
-    <version.quarkus>2.16.4.Final</version.quarkus>
+    <version.quarkus>3.1.1.Final</version.quarkus>
     <version.spring.framework>5.3.27</version.spring.framework>
     <version.spring.framework6>6.0.9</version.spring.framework6>
     <version.spring-boot>2.7.12</version.spring-boot>

diff --git a/...java/org/camunda/bpm/quarkus/engine/extension/deployment/impl/CamundaEngineProcessor.java b/...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/...loyment/src/test/java/org/camunda/bpm/quarkus/engine/test/BusinessProcessContextTest.java b/...loyment/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/...ment/src/test/java/org/camunda/bpm/quarkus/engine/test/ConfigurableProcessEngineTest.java b/...ment/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/...ployment/src/test/java/org/camunda/bpm/quarkus/engine/test/EmbeddedProcessEngineTest.java b/...ployment/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/.../deployment/src/test/java/org/camunda/bpm/quarkus/engine/test/ManagedJobExecutorTest.java b/.../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/...src/test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigFileTest.java b/...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/...java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineConfigurationConfigTest.java b/...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/.../test/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineDefaultConfigTest.java b/.../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/...t/java/org/camunda/bpm/quarkus/engine/test/config/CamundaEngineJobExecutorConfigTest.java b/...t/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/...rg/camunda/bpm/quarkus/engine/test/config/CamundaEngineProgrammaticAndConfigFileTest.java b/...rg/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/...a/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineMultipleDeploymentTest.java b/...a/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/...ava/org/camunda/bpm/quarkus/engine/test/deployment/ProcessEngineSingleDeploymentTest.java b/...ava/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/...ment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/ConfigureDbIdGeneratorTest.java b/...ment/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/...ployment/src/test/java/org/camunda/bpm/quarkus/engine/test/id/DefaultIdGeneratorTest.java b/...ployment/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/...ent/src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/BeanWithProducerMethods.java b/...ent/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/.../src/test/java/org/camunda/bpm/quarkus/engine/test/lookup/ProgrammaticBeanLookupTest.java b/.../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/...test/java/org/camunda/bpm/quarkus/engine/test/persistence/TransactionIntegrationTest.java b/...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/.../java/org/camunda/bpm/quarkus/engine/test/persistence/UserTransactionIntegrationTest.java b/.../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/...g/camunda/bpm/quarkus/engine/test/persistence/conf/ChooseDatasourceConfigurationTest.java b/...g/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/...ava/org/camunda/bpm/quarkus/engine/test/persistence/conf/DatasourceConfigurationTest.java b/...ava/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/...amunda/bpm/quarkus/engine/test/persistence/conf/NoDefaultDatasourceConfigurationTest.java b/...amunda/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
@@ -11,7 +11,7 @@
   <name>Camunda Platform - Quarkus Extension - Engine - CDI QA</name>
 
   <properties>
-    <arquillian.version>1.5.0.Final</arquillian.version>
+    <arquillian.version>1.7.0.Final</arquillian.version>
   </properties>
 
   <dependencyManagement>
@@ -44,7 +44,7 @@
           </systemPropertyVariables>
 
           <dependenciesToScan>
-            <dependency>org.camunda.bpm:camunda-engine-cdi</dependency>
+            <dependency>org.camunda.bpm:camunda-engine-cdi-jakarta</dependency>
           </dependenciesToScan>
 
           <excludes>
@@ -70,7 +70,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-cdi</artifactId>
+      <artifactId>camunda-engine-cdi-jakarta</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <classifier>tests-quarkus</classifier>

diff --git a/...ion/engine/qa/src/test/java/org/camunda/bpm/engine/cdi/test/CdiProcessEngineTestCase.java b/...ion/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/...c/test/java/org/camunda/bpm/engine/cdi/test/bean/QuarkusDeclarativeProcessController.java b/...c/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
@@ -23,7 +23,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-cdi</artifactId>
+      <artifactId>camunda-engine-cdi-jakarta</artifactId>
     </dependency>
 
     <dependency>