This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 786bc69379034165cd939be9ea14919e34399578 Author: Mark Struberg <strub...@apache.org> AuthorDate: Wed Nov 8 13:29:45 2023 +0100 OWB-1430 BeanContainer in BeanManagerBean The BeanManagerBean must now also sattisfy the new BeanContainer interface --- pom.xml | 2 +- .../main/java/org/apache/webbeans/component/BeanManagerBean.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 76960e323..75f7a4115 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ <httpclient.version>4.5.14</httpclient.version> <xbean.version>4.22</xbean.version> <arquillian.version>1.7.0.Alpha13</arquillian.version> - <cdi.tck.version>4.0.7</cdi.tck.version> + <cdi.tck.version>4.0.9</cdi.tck.version> <osgi.servlet.range>4.0</osgi.servlet.range> <osgi.el.range>4.0</osgi.el.range> diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java index d76c81f0c..4092047bc 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java @@ -18,8 +18,7 @@ */ package org.apache.webbeans.component; -import java.lang.reflect.Type; - +import jakarta.enterprise.inject.spi.BeanContainer; import jakarta.enterprise.inject.spi.BeanManager; import org.apache.webbeans.config.WebBeansContext; @@ -33,7 +32,8 @@ public class BeanManagerBean extends BuiltInOwbBean<BeanManager> { super(webBeansContext, WebBeansType.MANAGER, - new BeanAttributesImpl<>(CollectionUtil.<Type>unmodifiableSet(BeanManager.class, Object.class), AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET), + new BeanAttributesImpl<>(CollectionUtil.unmodifiableSet(BeanManager.class, BeanContainer.class, Object.class), + AnnotationUtil.DEFAULT_AND_ANY_ANNOTATION_SET), BeanManager.class, new SimpleProducerFactory<>(new BeanManagerProducer(webBeansContext))); }