Integrate Weld 5.1.1.SP1

Doesn't need workaround anymore that 5.1.1 needed Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Jul 11, 2023 · e74f139 · e74f139
1 parent f3af216
commit e74f139
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/appserver/pom.xml b/appserver/pom.xml
@@ -143,7 +143,7 @@
 
         <!-- Jakarta CDI -->
         <jakarta.cdi-api.version>4.0.1</jakarta.cdi-api.version>
-        <weld.version>5.1.1.Final</weld.version>
+        <weld.version>5.1.1.SP1</weld.version>
         <jboss.classfilewriter.version>1.3.0.Final</jboss.classfilewriter.version>
 
         <!-- Jakarta MVC -->

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIServiceImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIServiceImpl.java
@@ -383,17 +383,7 @@ public <T> T createInterceptorInstance(Class<T> interceptorClass, EjbDescriptor
             // Using the ejb's creationalContext so we don't have to do any cleanup.
             // the cleanup will be handled by weld when it cleans up the ejb.
 
-            Object instance = null;
-            if (beanManager instanceof BeanManagerImpl) {
-                // Since Weld 5.1.1 the default beanManager.getReference method doesn't create a creational context
-                // for the Interceptor.
-                BeanManagerImpl beanManagerImpl = (BeanManagerImpl) beanManager;
-                instance = beanManagerImpl.getReference(interceptor, interceptorClass, creationalContext, false);
-            } else {
-                instance = beanManager.getReference(interceptor, interceptorClass, creationalContext);
-            }
-
-            return (T) instance;
+            return (T) beanManager.getReference(interceptor, interceptorClass, creationalContext);
         }
 
         // Check to see if the interceptor was defined as a Bean.

diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
@@ -138,7 +138,7 @@
 
         <commons-io.version>2.13.0</commons-io.version>
         <jboss.logging.annotation.version>2.2.1.Final</jboss.logging.annotation.version>
-        <jboss.logging.version>3.5.2.Final</jboss.logging.version>
+        <jboss.logging.version>3.5.3.Final</jboss.logging.version>
         <javassist.version>3.29.2-GA</javassist.version>
         <asm.version>9.5</asm.version>
         <jsch.version>0.2.9</jsch.version>