From 8fecaa2c3008ec6a9f9653b991e017caa84423ed Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 6 Nov 2023 15:57:43 -0600
Subject: [PATCH] WN-5141

- CDI:  update beans.xml for Jakarta EE 9
- use "annotated=all" as "FooService.java" does not have a CDI annotation
---
 plugins/cdi/pom.xml                               | 6 ++----
 plugins/cdi/src/test/resources/META-INF/beans.xml | 7 ++++++-
 pom.xml                                           | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index 00ad8e265..1f0c0d0a0 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -42,14 +42,12 @@
 
         <dependency>
             <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-core</artifactId>
-            <scope>provided</scope>
+            <artifactId>weld-core-impl</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se</artifactId>
-            <scope>test</scope>
+            <artifactId>weld-se-core</artifactId>
         </dependency>
 
         <dependency>
diff --git a/plugins/cdi/src/test/resources/META-INF/beans.xml b/plugins/cdi/src/test/resources/META-INF/beans.xml
index a02ea94b9..0c119baa0 100644
--- a/plugins/cdi/src/test/resources/META-INF/beans.xml
+++ b/plugins/cdi/src/test/resources/META-INF/beans.xml
@@ -19,4 +19,9 @@
  * under the License.
  */
 -->
-<beans></beans>
\ No newline at end of file
+<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"
+bean-discovery-mode="all">
+</beans>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 93fc4040d..7dd6a1835 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1075,14 +1075,14 @@
 
             <dependency>
                 <groupId>org.jboss.weld</groupId>
-                <artifactId>weld-core</artifactId>
-                <version>2.4.8.Final</version>
+                <artifactId>weld-core-impl</artifactId>
+                <version>5.1.2.Final</version>
             </dependency>
 
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
-                <artifactId>weld-se</artifactId>
-                <version>2.4.8.Final</version>
+                <artifactId>weld-se-core</artifactId>
+                <version>5.1.2.Final</version>
             </dependency>
 
             <dependency>