Merge pull request #24991 from arjantijms/8_0_CDI_TCK_fixes

Fixed for CDI 4.1 TCK. Now passes all tests.
eclipse-ee4j · Jun 19, 2024 · a12b269 · a12b269
2 parents 7404c24 + 8337789
commit a12b269
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/appserver/tests/tck/cdi/cdi-full/pom.xml b/appserver/tests/tck/cdi/cdi-full/pom.xml
@@ -205,6 +205,12 @@
             <version>${htmlunit.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-lite-extension-translator</artifactId>
+            <version>${weld.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.testng</groupId>
@@ -351,7 +357,6 @@
                     <excludedGroups>${excluded.groups}</excludedGroups>
                     <dependenciesToScan>
                         <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
-                        <dependency>jakarta.enterprise:cdi-tck-web-impl</dependency>
                     </dependenciesToScan>
                     <properties>
                         <property>

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -227,10 +227,14 @@ public BeanDeploymentArchive loadBeanDeploymentArchive(Class<?> beanClass) {
             LOG.log(FINE, LOAD_BEAN_DEPLOYMENT_ARCHIVE_ADD_NEW_BDA_TO_ROOTS, new Object[] {});
         }
 
+        // Add the new archive to all existing archives
         for (BeanDeploymentArchive beanDeploymentArchive : beanDeploymentArchives) {
             beanDeploymentArchive.getBeanDeploymentArchives().add(newBeanDeploymentArchive);
         }
 
+        // Add the existing archives archives to the new archive
+        newBeanDeploymentArchive.getBeanDeploymentArchives().addAll(beanDeploymentArchives);
+
         if (LOG.isLoggable(FINE)) {
             LOG.log(FINE, LOAD_BEAN_DEPLOYMENT_ARCHIVE_RETURNING_NEWLY_CREATED_BDA,
                     new Object[] { beanClass, newBeanDeploymentArchive });