Use weld shaded, add slf4j-jdk14 to QA tomcat 10

camunda · Jun 12, 2024 · 2ca04cc · 2ca04cc
1 parent defb085
commit 2ca04cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/qa/integration-tests-engine-jakarta/pom.xml b/qa/integration-tests-engine-jakarta/pom.xml
@@ -71,7 +71,7 @@
       <!-- Deployed programmatically by DeploymentHelper -->
       <dependency>
         <groupId>org.jboss.weld.servlet</groupId>
-        <artifactId>weld-servlet-core</artifactId>
+        <artifactId>weld-servlet-shaded</artifactId>
         <version>${weld.version}</version>
       </dependency>
 
@@ -613,27 +613,10 @@
           <type>pom</type>
         </dependency>
 
-        <dependency>
-          <groupId>jakarta.enterprise.concurrent</groupId>
-          <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-          <version>3.0.3</version>
-        </dependency>
-
-        <dependency>
-          <groupId>jakarta.transaction</groupId>
-          <artifactId>jakarta.transaction-api</artifactId>
-          <version>2.0.1</version>
-        </dependency>
-
         <dependency>
           <groupId>org.jboss.weld.servlet</groupId>
-          <artifactId>weld-servlet-core</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>jakarta.inject</groupId>
-          <artifactId>jakarta.inject-api</artifactId>
-          <version>2.0.1</version>
+          <artifactId>weld-servlet-shaded</artifactId>
+          <scope>test</scope>
         </dependency>
 
         <!-- This dependency can be updated when arquillian releases the managed tomcat 10 artifact -->

diff --git a/...s-engine-jakarta/src/test/java/org/camunda/bpm/integrationtest/util/DeploymentHelper.java b/...s-engine-jakarta/src/test/java/org/camunda/bpm/integrationtest/util/DeploymentHelper.java
@@ -48,10 +48,7 @@ protected static JavaArchive[] getWeld(String engineCdiArtifactName) {
     } else {
 
       JavaArchive[] archives = resolveDependenciesFromPomXml(engineCdiArtifactName,
-              "org.jboss.weld.servlet:weld-servlet-core",
-              "jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api",
-              "jakarta.transaction:jakarta.transaction-api",
-              "jakarta.inject:jakarta.inject-api"
+              "org.jboss.weld.servlet:weld-servlet-shaded"
       );
 
       if(archives.length == 0) {
@@ -78,7 +75,7 @@ protected static JavaArchive[] resolveDependenciesFromPomXml(String engineCdiArt
               .workOffline()
               .loadPomFromFile("pom.xml")
               .resolve(engineCdiArtifactName, dependencyName)
-              .withTransitivity()
+              .withoutTransitivity()
               .as(JavaArchive.class);
   }
 

diff --git a/qa/tomcat-runtime/pom.xml b/qa/tomcat-runtime/pom.xml
@@ -40,12 +40,19 @@
       <artifactId>jython</artifactId>
       <scope>runtime</scope>
     </dependency>
+
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm.qa</groupId>
       <artifactId>camunda-qa-ensure-clean-db</artifactId>