From f10ab67928045cea533e246d2dd26a6dbd5cb08e Mon Sep 17 00:00:00 2001
From: Jan Supol <jan.supol@oracle.com>
Date: Sat, 24 Oct 2020 11:07:46 +0200
Subject: [PATCH] Fix CDI-SE module

Signed-off-by: Jan Supol <jan.supol@oracle.com>
---
 .../cdi/se/injector/JerseyInjectionTarget.java  |  7 +++++++
 tests/e2e-inject/cdi2-se/pom.xml                | 17 -----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/injector/JerseyInjectionTarget.java b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/injector/JerseyInjectionTarget.java
index eab0859bf4..879e0a8272 100644
--- a/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/injector/JerseyInjectionTarget.java
+++ b/inject/cdi2-se/src/main/java/org/glassfish/jersey/inject/cdi/se/injector/JerseyInjectionTarget.java
@@ -126,6 +126,13 @@ public JerseyInjectionTarget(EnhancedAnnotatedType<T> annotatedType, BasicInject
         this.injector = Values.lazy((Value<JerseyInstanceInjector<T>>) () -> new JerseyInstanceInjector<>(bean, this.resolvers));
     }
 
+    @Override
+    protected void checkDelegateInjectionPoints() {
+        if (getAnnotatedType().getAnnotation(jakarta.decorator.Decorator.class) == null) {
+            super.checkDelegateInjectionPoints();
+        }
+    }
+
     @Override
     public void inject(T instance, CreationalContext<T> ctx) {
         /*
diff --git a/tests/e2e-inject/cdi2-se/pom.xml b/tests/e2e-inject/cdi2-se/pom.xml
index a3bcba1570..6fe091ff9b 100644
--- a/tests/e2e-inject/cdi2-se/pom.xml
+++ b/tests/e2e-inject/cdi2-se/pom.xml
@@ -73,23 +73,6 @@
                 <surefire.security.argline />
             </properties>
         </profile>
-        <profile>
-            <id>jakartification_exclude_tests</id> <!-- TODO remove after jakartification -->
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>sonar</id>
             <build>