From 01fe7c1af2e862dcffd8fe5451439c95862e59dc Mon Sep 17 00:00:00 2001
From: Daniel Kec <daniel.kec@oracle.com>
Date: Wed, 5 Oct 2022 14:04:28 +0200
Subject: [PATCH] 5068 mock connector beans xml 4x (#5070)

* Bad beans.xml name fix #5068

Signed-off-by: Daniel Kec <daniel.kec@oracle.com>
---
 .../connectors/mock/src/main/java/module-info.java | 14 +++++++++-----
 .../resources/META-INF/{bean.xml => beans.xml}     | 13 ++++++-------
 .../messaging/core/src/main/java/module-info.java  |  3 +++
 3 files changed, 18 insertions(+), 12 deletions(-)
 rename messaging/connectors/mock/src/main/resources/META-INF/{bean.xml => beans.xml} (71%)

diff --git a/messaging/connectors/mock/src/main/java/module-info.java b/messaging/connectors/mock/src/main/java/module-info.java
index f524874e062..c15c033bf28 100644
--- a/messaging/connectors/mock/src/main/java/module-info.java
+++ b/messaging/connectors/mock/src/main/java/module-info.java
@@ -19,12 +19,16 @@
  */
 module helidon.messaging.mock {
     requires java.logging;
-    requires io.helidon.common.reactive;
-    requires microprofile.reactive.messaging.api;
-    requires microprofile.reactive.streams.operators.api;
+
+    requires static jakarta.cdi;
+    requires static jakarta.inject;
     requires org.reactivestreams;
+    requires io.helidon.common.reactive;
+    requires transitive microprofile.reactive.messaging.api;
+    requires transitive microprofile.reactive.streams.operators.api;
     requires hamcrest.all;
     requires microprofile.config.api;
-    requires jakarta.cdi;
-    requires jakarta.inject;
+
+
+    exports io.helidon.messaging.connectors.mock;
 }
\ No newline at end of file
diff --git a/messaging/connectors/mock/src/main/resources/META-INF/bean.xml b/messaging/connectors/mock/src/main/resources/META-INF/beans.xml
similarity index 71%
rename from messaging/connectors/mock/src/main/resources/META-INF/bean.xml
rename to messaging/connectors/mock/src/main/resources/META-INF/beans.xml
index 746874a6c41..4a5ec955fb7 100644
--- a/messaging/connectors/mock/src/main/resources/META-INF/bean.xml
+++ b/messaging/connectors/mock/src/main/resources/META-INF/beans.xml
@@ -16,11 +16,10 @@
     limitations under the License.
 
 -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-                           http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
-       version="2.0"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+                           https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       version="3.0"
        bean-discovery-mode="annotated">
-</beans>
\ No newline at end of file
+</beans>
diff --git a/microprofile/messaging/core/src/main/java/module-info.java b/microprofile/messaging/core/src/main/java/module-info.java
index 4412933148f..6b918691dc4 100644
--- a/microprofile/messaging/core/src/main/java/module-info.java
+++ b/microprofile/messaging/core/src/main/java/module-info.java
@@ -37,5 +37,8 @@
 
     exports io.helidon.microprofile.messaging;
 
+    // this is needed for CDI extensions that use non-public observer methods
+    opens io.helidon.microprofile.messaging to weld.core.impl, io.helidon.microprofile.cdi;
+
     provides jakarta.enterprise.inject.spi.Extension with io.helidon.microprofile.messaging.MessagingCdiExtension;
 }