From 640f1e4847d95ef5c88a14a1a75d3bbfc28cfaf7 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Mon, 7 Dec 2020 14:33:26 +0100
Subject: [PATCH] WFLY-14172 Update Weld 4 for EE 9 WFLY. Also try to align
 Weld SE version used by tests.

---
 ee-9/feature-pack/pom.xml | 15 ++-------------
 pom.xml                   |  3 +--
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/ee-9/feature-pack/pom.xml b/ee-9/feature-pack/pom.xml
index 385790b30ad6..8a17b4220cef 100644
--- a/ee-9/feature-pack/pom.xml
+++ b/ee-9/feature-pack/pom.xml
@@ -85,12 +85,8 @@
         <version.org.glassfish.jakarta.json>2.0.0</version.org.glassfish.jakarta.json>
         <version.org.hibernate.validator>7.0.0.Alpha6</version.org.hibernate.validator>
         <version.org.jboss.metadata>14.0.0.Alpha1</version.org.jboss.metadata>
-        <version.org.jboss.weld.weld>4.0.0.Beta5</version.org.jboss.weld.weld>
-        <!-- TODO in the main pom this is a different version from the rest of weld. Why? -->
-        <!-- It's just a test dep so don't override it for now
-        <version.org.jboss.weld.se.weld-se-core>${version.org.jboss.weld.weld}</version.org.jboss.weld.se.weld-se-core>
-        -->
-        <version.org.jboss.weld.weld-api>4.0.Beta1</version.org.jboss.weld.weld-api>
+        <version.org.jboss.weld.weld>4.0.0.CR1</version.org.jboss.weld.weld>
+        <version.org.jboss.weld.weld-api>4.0.CR1</version.org.jboss.weld.weld-api>
 
         <!-- TODO Glassfish uses org.glassfish:jakarta-el for this, which we use for the impl
              but we have a separate API jar -->
@@ -1009,13 +1005,6 @@
             </exclusions>
         </dependency>
 
-        <!--<dependency>
-            <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se-core</artifactId>
-            <version>${version.org.jboss.weld.se.weld-se-core}</version>
-            <scope>test</scope>
-        </dependency>-->
-
         <!-- Misc -->
         <dependency>
             <groupId>org.jboss.spec.javax.xml.rpc</groupId>
diff --git a/pom.xml b/pom.xml
index bbe1c96c2d86..c0e6c04b9cb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -419,7 +419,6 @@
         <version.org.jboss.spec.javax.xml.ws.jboss-jaxws-api_2.3_spec>2.0.0.Final</version.org.jboss.spec.javax.xml.ws.jboss-jaxws-api_2.3_spec>
         <version.org.jboss.weld.weld>3.1.5.Final</version.org.jboss.weld.weld>
         <version.org.jboss.weld.weld-api>3.1.SP3</version.org.jboss.weld.weld-api>
-        <version.org.jboss.weld.se.weld-se-core>3.0.5.Final</version.org.jboss.weld.se.weld-se-core>
         <version.org.jboss.ws.api>1.1.2.Final</version.org.jboss.ws.api>
         <version.org.jboss.ws.common>3.3.3.Final</version.org.jboss.ws.common>
         <version.org.jboss.ws.common.tools>1.3.2.Final</version.org.jboss.ws.common.tools>
@@ -5854,7 +5853,7 @@
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
                 <artifactId>weld-se-core</artifactId>
-                <version>${version.org.jboss.weld.se.weld-se-core}</version>
+                <version>${version.org.jboss.weld.weld}</version>
                 <scope>test</scope>
             </dependency>