Merge pull request #139 from shadogray/master

Profile Weld: update properties and dependencies
apache · Jan 11, 2024 · 87c2e97 · 87c2e97
2 parents d67e6bb + 3af6970
commit 87c2e97
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/...re/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java b/...re/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleExtension.java
@@ -147,7 +147,7 @@ protected void installMessageBundleProducerBeans(@Observes AfterBeanDiscovery ab
                             (MessageBundleInvocationHandler)
                                 beanManager.getReference(invocationHandlerBean, MessageBundleInvocationHandler.class, cc));
                     })
-                .read(mbType)
+                .read((AnnotatedType)mbType)
                 .types(mbType.getJavaClass(), Object.class, Serializable.class)
                 .addQualifier(Default.Literal.INSTANCE)
                 .scope(ApplicationScoped.class) // needs to be a normalscope due to a bug in older Weld versions

diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml
@@ -42,7 +42,10 @@
         <validation.artifactId>geronimo-validation_1.0_spec</validation.artifactId>
         <jboss.as.version>7.1.1.Final</jboss.as.version>
         <wildfly.version>10.1.0.Final</wildfly.version>
-        <wildfly.arquillian.version>1.0.2.Final</wildfly.arquillian.version>
+        <wildfly.jakarta.version>29.0.1.Final</wildfly.jakarta.version>
+        <weld.el.api>5.0.0</weld.el.api>
+        <weld.sfl4j>2.0.11</weld.sfl4j>
+        <wildfly.arquillian.version>5.0.1.Final</wildfly.arquillian.version>
         <glassfish3.version>3.1.2.2</glassfish3.version>
         <glassfish4.version>4.0</glassfish4.version>
         <payara.version>4.1.2.181</payara.version>
@@ -369,9 +372,13 @@
             <!-- use this profile to compile and test DeltaSpike with JBoss Weld 3.x on an embedded container -->
             <id>Weld</id>
 
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+
             <properties>
                 <!-- Actual Weld version used with this profile -->
-                <weld.version>3.1.3.Final</weld.version>
+                <weld.version>5.0.1.Final</weld.version>
                 <cdicontainer.version>weld-${weld.version}</cdicontainer.version>
             </properties>
 
@@ -436,19 +443,21 @@
 
                 <!--Other than Weld dependencies-->
                 <dependency>
-                    <groupId>javax.el</groupId>
-                    <artifactId>el-api</artifactId>
+                    <groupId>jakarta.el</groupId>
+                    <artifactId>jakarta.el-api</artifactId>
                     <version>${weld.el.api}</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    <groupId>jakarta.transaction</groupId>
+                    <artifactId>jakarta.transaction-api</artifactId>
+                    <version>2.0.1</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+                    <groupId>jakarta.interceptor</groupId>
+                    <artifactId>jakarta.interceptor-api</artifactId>
+                    <version>2.1.0</version>
                 </dependency>
 
                 <!-- Test dependencies -->
@@ -461,11 +470,12 @@
                 <dependency>
                     <groupId>org.hibernate</groupId>
                     <artifactId>hibernate-validator</artifactId>
+                    <version>8.0.0.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+                    <artifactId>arquillian-weld-embedded</artifactId>
                     <version>${arquillian-weld.version}</version>
                     <scope>test</scope>
                 </dependency>

diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
@@ -85,7 +85,7 @@
 
         <jacoco.version>0.7.4.201502262128</jacoco.version>
 
-        <arquillian-weld.version>1.0.0.Final</arquillian-weld.version>
+        <arquillian-weld.version>4.0.0.Final</arquillian-weld.version>
         <arquillian-weld3.version>2.1.0.Final</arquillian-weld3.version>
 
         <!-- OSGi bundles properties -->