From ffb3ed5d203eb6111214c6ffc9227cde680f0842 Mon Sep 17 00:00:00 2001
From: Ladislav Thon <lthon@redhat.com>
Date: Tue, 18 Jul 2023 13:43:01 +0200
Subject: [PATCH] Add support for InvocationContext.getInterceptorBindings()

---
 .../weld/interceptor/proxy/AbstractInvocationContext.java     | 2 +-
 pom.xml                                                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/impl/src/main/java/org/jboss/weld/interceptor/proxy/AbstractInvocationContext.java b/impl/src/main/java/org/jboss/weld/interceptor/proxy/AbstractInvocationContext.java
index 39e27b8d36c..bcb8e175004 100644
--- a/impl/src/main/java/org/jboss/weld/interceptor/proxy/AbstractInvocationContext.java
+++ b/impl/src/main/java/org/jboss/weld/interceptor/proxy/AbstractInvocationContext.java
@@ -67,7 +67,7 @@ protected AbstractInvocationContext(Object target, Method method, Method proceed
         this.parameters = parameters;
         this.timer = timer;
         this.contextData = contextData;
-        this.interceptorBindings = interceptorBindings;
+        this.interceptorBindings = interceptorBindings != null ? interceptorBindings : Collections.emptySet();
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 418da57c718..12d87e14851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <arquillian.jetty.version>1.0.0.Final</arquillian.jetty.version>
         <atinject.tck.version>2.0.1</atinject.tck.version>
         <!-- Version of the CDI 4.x release TCK -->
-        <cdi.tck-4-0.version>4.0.10</cdi.tck-4-0.version>
+        <cdi.tck-4-0.version>4.1.0-SNAPSHOT</cdi.tck-4-0.version>
         <!-- By default, each mvn profile uses corresponding file from TCK repo, see jboss-tck-runner/pom.xml -->
         <!-- We can also use our own file, needed for relaxed mode testing (see WeldMethodInterceptor) -->
         <!-- Our variant is under src/test/tck/tck-tests.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>5.0.SP3</weld.api.version>
+        <weld.api.version>5.0-SNAPSHOT</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>