The CDI 4.0 spec introduces a breaking change: An empty beans.xml fil…

…e is now treated as scanning mode annotated instead of mode all Setting an explicit scanning mode will make behaviour consistant across all versions of CDI.
OpenLiberty · Dec 11, 2023 · 3de68c0 · 3de68c0
1 parent 3aec059
commit 3de68c0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/liberty-managed/src/test/java/io/openliberty/arquillian/managed/WLPInjectionTestCase.java b/liberty-managed/src/test/java/io/openliberty/arquillian/managed/WLPInjectionTestCase.java
@@ -18,9 +18,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.BeanDiscoveryMode;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,7 +34,7 @@ public class WLPInjectionTestCase
    public static JavaArchive createDeployment() {
        JavaArchive jar = ShrinkWrap.create(JavaArchive.class)
            .addClass(Greeter.class)
-           .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+           .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml");
        return jar;
    }
 

diff --git a/...managed/src/test/java/io/openliberty/arquillian/managed/WLPIntegrationClientTestCase.java b/...managed/src/test/java/io/openliberty/arquillian/managed/WLPIntegrationClientTestCase.java
@@ -22,11 +22,13 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.BeanDiscoveryMode;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,7 +47,7 @@ public static EnterpriseArchive createDeployment()
                               .addClass(HelloServlet.class))
             .addAsModule(ShrinkWrap.create(JavaArchive.class, "test.jar")
                               .addClass(WLPIntegrationClientTestCase.class)
-                              .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+                              .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml");
    }
 
    @Test

diff --git a/liberty-managed/src/test/java/io/openliberty/arquillian/managed/WLPResourceTestCase.java b/liberty-managed/src/test/java/io/openliberty/arquillian/managed/WLPResourceTestCase.java
@@ -2,9 +2,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.BeanDiscoveryMode;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import jakarta.annotation.Resource;
@@ -16,7 +18,7 @@ public class WLPResourceTestCase {
     @Deployment
     public static JavaArchive createDeployment() {
         return ShrinkWrap.create(JavaArchive.class)
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml");
     }
 
     @Resource(lookup = "env/foo")

diff --git a/.../arquillian/managed/needssupportfeature/deploymentfailure/WLPDeploymentExceptionTest.java b/.../arquillian/managed/needssupportfeature/deploymentfailure/WLPDeploymentExceptionTest.java
@@ -22,9 +22,11 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.BeanDiscoveryMode;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -39,7 +41,7 @@ public static WebArchive buildInvalidApp() {
         WebArchive war = ShrinkWrap.create(WebArchive.class)
                                    .addPackage(WLPDeploymentExceptionTest.class.getPackage())
                                    .addAsServiceProvider(Extension.class, StartupFailureExtension.class)
-                                   .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                                   .addAsWebInfResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml");
 
         return war;
     }

diff --git a/liberty-remote/src/test/java/io/openliberty/arquillian/remote/WLPInjectionTestCase.java b/liberty-remote/src/test/java/io/openliberty/arquillian/remote/WLPInjectionTestCase.java
@@ -18,9 +18,11 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.BeanDiscoveryMode;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,7 +32,7 @@ public class WLPInjectionTestCase {
     @Deployment
     public static JavaArchive createDeployment() {
         JavaArchive jar = ShrinkWrap.create(JavaArchive.class).addClass(Greeter.class)
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml");
         return jar;
     }
 

diff --git a/...y-remote/src/test/java/io/openliberty/arquillian/remote/WLPIntegrationClientTestCase.java b/...y-remote/src/test/java/io/openliberty/arquillian/remote/WLPIntegrationClientTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010-2023, Red Hat Middleware LLC, and individual contributors
  * identified by the Git commit log. 
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,11 +21,13 @@
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.BeanDiscoveryMode
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.impl.BeansXml;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,7 +44,7 @@ public static EnterpriseArchive createDeployment() {
                 .addAsModule(ShrinkWrap.create(WebArchive.class, "test.war").addClass(HelloServlet.class))
                 .addAsModule(
                         ShrinkWrap.create(JavaArchive.class, "test.jar").addClass(WLPIntegrationClientTestCase.class)
-                                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"));
+                                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml");
     }
 
     @Test