You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2025/10/22 07:00:20 UTC

(openwebbeans) branch cdi-4.1 updated (0765c15b7 -> 1bec71ba2)

This is an automated email from the ASF dual-hosted git repository.

struberg pushed a change to branch cdi-4.1
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git


    from 0765c15b7 OWB-1451 initial setup for CDI-4.1
     new 999d4e710 OWB-1451 TCK requires interceptors-2.2 :(
     new 1bec71ba2 OWB-1451 upgrade to interceptors-2.2

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                              |  4 +++-
 .../intercept/AbstractInvocationContext.java         | 20 ++++++++++++++++++++
 webbeans-tck/pom.xml                                 | 16 ----------------
 webbeans-tck/testng-dev.xml                          |  2 +-
 4 files changed, 24 insertions(+), 18 deletions(-)


(openwebbeans) 02/02: OWB-1451 upgrade to interceptors-2.2

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch cdi-4.1
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git

commit 1bec71ba2629f2309f78a7873c13a75593a04309
Author: Mark Struberg <st...@apache.org>
AuthorDate: Wed Oct 22 08:56:57 2025 +0200

    OWB-1451 upgrade to interceptors-2.2
    
    The CDI TCK requires interceptors-2.1 albeit the spec only requires 2.1.
    The EE 11 umbrella spec mentions both specs.
    I'd say we aim for the newer, more capable spec version.
---
 pom.xml                                              |  3 +--
 .../intercept/AbstractInvocationContext.java         | 20 ++++++++++++++++++++
 webbeans-tck/pom.xml                                 |  4 ----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39adfc66b..22a81fc35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,7 @@
         <jakarta.atinject-api.version>2.0.1</jakarta.atinject-api.version>
         <jakarta.cdi-api.version>4.1.0</jakarta.cdi-api.version>
 
-        <!-- attention, in CDI-4.1 the min required version is interceptors-2.1, but the TCK requires interceptors-2.2 :( -->
-        <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
+        <jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>
 
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
         <jakarta.el-api.version>6.0.0</jakarta.el-api.version>
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
index 6144c80f6..12d8be056 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/intercept/AbstractInvocationContext.java
@@ -18,12 +18,14 @@
  */
 package org.apache.webbeans.intercept;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import jakarta.inject.Provider;
 import jakarta.interceptor.InvocationContext;
@@ -128,4 +130,22 @@ public abstract class AbstractInvocationContext<T> implements InvocationContext
         }
         return null;
     }
+
+    @Override
+    public <T extends Annotation> T getInterceptorBinding(Class<T> annotationType)
+    {
+        return InvocationContext.super.getInterceptorBinding(annotationType);
+    }
+
+    @Override
+    public Set<Annotation> getInterceptorBindings()
+    {
+        return InvocationContext.super.getInterceptorBindings();
+    }
+
+    @Override
+    public <T extends Annotation> Set<T> getInterceptorBindings(Class<T> annotationType)
+    {
+        return InvocationContext.super.getInterceptorBindings(annotationType);
+    }
 }
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index 37468eb29..9f2f9ad33 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -31,10 +31,6 @@
     <packaging>jar</packaging>
     <description>All TCK tests for the Apache OpenWebBeans Implementation</description>
 
-    <properties>
-        <jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>
-    </properties>
-
     <dependencies>
 
         <!-- Those dependencies are required for standalone TCK testing -->


(openwebbeans) 01/02: OWB-1451 TCK requires interceptors-2.2 :(

Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch cdi-4.1
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git

commit 999d4e71084dfa23511fe6b77d0faff643f3d953
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Oct 21 16:31:42 2025 +0200

    OWB-1451 TCK requires interceptors-2.2 :(
---
 pom.xml                     |  3 +++
 webbeans-tck/pom.xml        | 18 +++---------------
 webbeans-tck/testng-dev.xml |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index d7ae09ec8..39adfc66b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,10 @@
 
         <jakarta.atinject-api.version>2.0.1</jakarta.atinject-api.version>
         <jakarta.cdi-api.version>4.1.0</jakarta.cdi-api.version>
+
+        <!-- attention, in CDI-4.1 the min required version is interceptors-2.1, but the TCK requires interceptors-2.2 :( -->
         <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
+
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
         <jakarta.el-api.version>6.0.0</jakarta.el-api.version>
         <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
diff --git a/webbeans-tck/pom.xml b/webbeans-tck/pom.xml
index 0b0944c56..37468eb29 100644
--- a/webbeans-tck/pom.xml
+++ b/webbeans-tck/pom.xml
@@ -31,25 +31,13 @@
     <packaging>jar</packaging>
     <description>All TCK tests for the Apache OpenWebBeans Implementation</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <!--X
-                        <dependency>
-                            <groupId>org.jboss.arquillian</groupId>
-                            <artifactId>arquillian-bom</artifactId>
-                            <version>${arquillian.version}</version>
-                            <type>pom</type>
-                            <scope>import</scope>
-                        </dependency>
-            -->
-        </dependencies>
-    </dependencyManagement>
+    <properties>
+        <jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>
+    </properties>
 
     <dependencies>
 
         <!-- Those dependencies are required for standalone TCK testing -->
-
-
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
diff --git a/webbeans-tck/testng-dev.xml b/webbeans-tck/testng-dev.xml
index 00a9c0fa9..654cf0992 100644
--- a/webbeans-tck/testng-dev.xml
+++ b/webbeans-tck/testng-dev.xml
@@ -19,7 +19,7 @@
     <test name="JSR-346 TCK">
 
         <classes>
-            <class name="org.jboss.cdi.tck.tests.definition.bean.types.ManagedBeanTypesTest" >
+            <class name="org.jboss.cdi.tck.interceptors.tests.contract.invocationContext.InvocationContextTest" >
                 <methods>
 <!--
                     <include name="testNonContextualInstanceIsIntercepted"/>