Alter CDI testenricher exclusion so that embedded tests don't get it,…

… but WFLY does.
weld · Aug 28, 2020 · bcc32e5 · bcc32e5
1 parent fda39ee
commit bcc32e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -346,10 +346,6 @@
                         <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-api</artifactId>
                     </exclusion>
-                        <exclusion>
-                            <groupId>org.jboss.arquillian.testenricher</groupId>
-                            <artifactId>arquillian-testenricher-cdi</artifactId>
-                        </exclusion>
                     </exclusions>
                 <scope>test</scope>
             </dependency>

diff --git a/tests-arquillian/pom.xml b/tests-arquillian/pom.xml
@@ -143,6 +143,14 @@
         <dependency>
             <groupId>org.wildfly.arquillian</groupId>
             <artifactId>wildfly-arquillian-common</artifactId>
+            <exclusions>
+                <!-- This dep brings in Arq. testenricher for CDI in the non-jakarta version
+                which causes issues in embedded tests -->
+                <exclusion>
+                    <groupId>org.jboss.arquillian.testenricher</groupId>
+                    <artifactId>arquillian-testenricher-cdi</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Jakarta JAX/JWS are needed in jdk8+ -->
@@ -272,6 +280,11 @@
                     <artifactId>wildfly-arquillian-protocol-jmx</artifactId>
                     <scope>test</scope>
                 </dependency>
+                <!-- Due to exclusion on wildfly-arquillian-common, we need to add enricher manually for WFLY tests -->
+                <dependency>
+                    <groupId>org.jboss.arquillian.testenricher</groupId>
+                    <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
+                </dependency>
             </dependencies>
 
             <build>