[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-278] ensure beans.xml configuration is used with CDI SE API

[rmannibucau]

This is an automated email from the ASF dual-hosted git repository.

rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a26af8  [MEECROWAVE-278] ensure beans.xml configuration is used with 
CDI SE API
4a26af8 is described below

commit 4a26af857bde1810fc86f3323b82ec6dd4f1479b
Author: Romain Manni-Bucau <rmannibu...@gmail.com>
AuthorDate: Sat Feb 20 18:02:02 2021 +0100

    [MEECROWAVE-278] ensure beans.xml configuration is used with CDI SE API
---
 .../apache/meecrowave/cdi/MeecrowaveProvider.java  |  6 -----
 .../openwebbeans/OWBTomcatWebScannerService.java   | 26 +++++++++++++++++++++-
 pom.xml                                            |  2 +-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git 
a/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveProvider.java
 
b/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveProvider.java
deleted file mode 100644
index 2ae3228..0000000
--- 
a/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveProvider.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.meecrowave.cdi;
-
-import org.apache.webbeans.container.OwbCDIProvider;
-
-public class MeecrowaveProvider extends OwbCDIProvider {
-}
diff --git 
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
 
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
index b3789b3..fe93efa 100644
--- 
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
+++ 
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
@@ -18,13 +18,13 @@
  */
 package org.apache.meecrowave.openwebbeans;
 
-import org.apache.meecrowave.Meecrowave;
 import org.apache.meecrowave.configuration.Configuration;
 import org.apache.meecrowave.logging.tomcat.LogFacade;
 import org.apache.tomcat.JarScanFilter;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
 import org.apache.webbeans.corespi.scanner.xbean.OwbAnnotationFinder;
+import org.apache.webbeans.spi.BDABeansXmlScanner;
 import org.apache.webbeans.spi.BdaScannerService;
 import org.apache.webbeans.spi.BeanArchiveService;
 import org.apache.webbeans.util.WebBeansUtil;
@@ -85,6 +85,30 @@ public class OWBTomcatWebScannerService extends 
WebScannerService {
     }
 
     @Override
+    public Set<URL> getBeanXmls() {
+        if (delegate == null) {
+            return super.getBeanXmls();
+        }
+        return delegate.getBeanXmls();
+    }
+
+    @Override
+    public boolean isBDABeansXmlScanningEnabled() {
+        if (delegate == null) {
+            return super.isBDABeansXmlScanningEnabled();
+        }
+        return delegate.isBDABeansXmlScanningEnabled();
+    }
+
+    @Override
+    public BDABeansXmlScanner getBDABeansXmlScanner() {
+        if (delegate == null) {
+            return super.getBDABeansXmlScanner();
+        }
+        return delegate.getBDABeansXmlScanner();
+    }
+
+    @Override
     public OwbAnnotationFinder getFinder() {
         if (finderAccessor != null) {
             return finderAccessor.get();
diff --git a/pom.xml b/pom.xml
index 07fd87b..f36105e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
 
     <junit.version>4.13.1</junit.version>
     <tomcat.version>9.0.43</tomcat.version>
-    <openwebbeans.version>2.0.20</openwebbeans.version>
+    <openwebbeans.version>2.0.22-SNAPSHOT</openwebbeans.version>
     <cxf.version>3.4.2</cxf.version>
     <johnzon.version>1.2.8</johnzon.version>
     <log4j2.version>2.14.0</log4j2.version>