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 <[email protected]> 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 -->
