Upgrade Weld API to 6.0.Alpha2; make ForwardingBeanManager implement …

…EL-aware BM
weld · Dec 11, 2023 · da7f2b2 · da7f2b2
1 parent 19076fe
commit da7f2b2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -30,7 +30,7 @@
     </developers>
 
     <properties>
-        <weld.api.bom.version>6.0.Alpha1</weld.api.bom.version>
+        <weld.api.bom.version>6.0.Alpha2</weld.api.bom.version>
         <gpg.plugin.version>3.0.1</gpg.plugin.version>
         <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url>
         <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>

diff --git a/impl/src/main/java/org/jboss/weld/util/ForwardingBeanManager.java b/impl/src/main/java/org/jboss/weld/util/ForwardingBeanManager.java
@@ -47,13 +47,14 @@
 import jakarta.enterprise.inject.spi.Interceptor;
 import jakarta.enterprise.inject.spi.ObserverMethod;
 import jakarta.enterprise.inject.spi.ProducerFactory;
+import jakarta.enterprise.inject.spi.el.ELAwareBeanManager;
 
 /**
  * Forwarding implementation of {@link BeanManager}.
  *
  * @author Martin Kouba
  */
-public abstract class ForwardingBeanManager implements BeanManager, Serializable {
+public abstract class ForwardingBeanManager implements ELAwareBeanManager, Serializable {
 
     private static final long serialVersionUID = -3116833950882475733L;
 

diff --git a/jboss-as/pom.xml b/jboss-as/pom.xml
@@ -32,7 +32,7 @@
         as the release plugin won't deal with double evaluation -->
         <weld.update.version>6.0.0-SNAPSHOT</weld.update.version>
         <!-- These are *NOT* automatically updated and should be reviewed if the relevant profile is to be used -->
-        <cdi.update.version>4.1.0.Alpha1</cdi.update.version>
+        <cdi.update.version>4.1.0-M1</cdi.update.version>
         <interceptors.update.version>2.2.0-RC1</interceptors.update.version>
     </properties>
 
@@ -77,6 +77,11 @@
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <version>${cdi.update.version}</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
+            <version>${cdi.update.version}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.lang-model</artifactId>
@@ -85,7 +90,7 @@
         <dependency>
             <groupId>jakarta.interceptor</groupId>
             <artifactId>jakarta.interceptor-api</artifactId>
-            <version>2.2.0-RC1</version>
+            <version>${interceptors.update.version}</version>
         </dependency>
     </dependencies>
     <profiles>
@@ -251,6 +256,7 @@
                                         <property name="module.interceptor.dir" value="${jboss.home}/modules//system/layers/base/jakarta/interceptor/api" />
 
                                         <property name="cdi.api.file" value="jakarta.enterprise.cdi-api-${cdi.update.version}.jar" />
+                                        <property name="cdi.el.api.file" value="jakarta.enterprise.cdi-el-api-${cdi.update.version}.jar" />
                                         <property name="cdi.lang.model.file" value="jakarta.enterprise.lang-model-${cdi.update.version}.jar" />
                                         <property name="interceptor.api.file" value="jakarta.interceptor-api-${interceptors.update.version}.jar" />
 
@@ -263,6 +269,7 @@
                                             <fileset dir="target/dependency/lib">
                                                 <include name="${cdi.api.file}" />
                                                 <include name="${cdi.lang.model.file}" />
+                                                <include name="${cdi.el.api.file}" />
                                             </fileset>
                                         </copy>
 
@@ -272,8 +279,8 @@
                                             </fileset>
                                         </copy>
 
-
-                                        <replaceregexp file="${module.dir}/main/module.xml" match="path=&quot;jakarta.enterprise.cdi-api.*?&quot;" replace="path=&quot;${cdi.api.file}&quot;" byline="true" />
+                                        <!-- WFLY doesn't yet have dep. on the EL API part of CDI, this forcibly adds it -->
+                                        <replaceregexp file="${module.dir}/main/module.xml" match="path=&quot;jakarta.enterprise.cdi-api.*?&quot;" replace="path=&quot;${cdi.api.file}&quot;/>&lt;resource-root path=&quot;${cdi.el.api.file}&quot;" byline="true" />
                                         <replaceregexp file="${module.dir}/main/module.xml" match="path=&quot;jakarta.enterprise.lang-model.*?&quot;" replace="path=&quot;${cdi.lang.model.file}&quot;" byline="true" />
                                         <replaceregexp file="${module.interceptor.dir}/main/module.xml" match="path=&quot;jakarta.interceptor-api.*?&quot;" replace="path=&quot;${interceptor.api.file}&quot;" byline="true" />
                                     </target>
@@ -342,7 +349,7 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
                             <overWriteSnapshots>true</overWriteSnapshots>
-                            <includeArtifactIds>jakarta.enterprise.cdi-api,jakarta.enterprise.lang-model,jakarta.interceptor-api,weld-api,weld-core-impl,weld-lite-extension-translator,weld-jsf,weld-ejb,weld-jta,weld-web,weld-spi,cdi-tck-ext-lib</includeArtifactIds>
+                            <includeArtifactIds>jakarta.enterprise.cdi-api,jakarta.enterprise.cdi-el-api,jakarta.enterprise.lang-model,jakarta.interceptor-api,weld-api,weld-core-impl,weld-lite-extension-translator,weld-jsf,weld-ejb,weld-jta,weld-web,weld-spi,cdi-tck-ext-lib</includeArtifactIds>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/pom.xml b/pom.xml
@@ -90,7 +90,7 @@
         <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version>
         <shrinkwrap.resolver.version>3.1.4</shrinkwrap.resolver.version>
         <testng.version>7.4.0</testng.version>
-        <weld.api.version>6.0.Alpha1</weld.api.version>
+        <weld.api.version>6.0.Alpha2</weld.api.version>
         <weld.logging.tools.version>1.0.3.Final</weld.logging.tools.version>
         <wildfly.arquillian.version>5.0.0.Alpha5</wildfly.arquillian.version>
     </properties>