diff --git a/appserver/tests/tck/cdi/cdi-full/pom.xml b/appserver/tests/tck/cdi/cdi-full/pom.xml index dbbff5c736c..173ea8e73b3 100644 --- a/appserver/tests/tck/cdi/cdi-full/pom.xml +++ b/appserver/tests/tck/cdi/cdi-full/pom.xml @@ -205,6 +205,12 @@ ${htmlunit.version} test + + + org.jboss.weld + weld-lite-extension-translator + ${weld.version} + org.testng @@ -351,7 +357,6 @@ ${excluded.groups} jakarta.enterprise:cdi-tck-core-impl - jakarta.enterprise:cdi-tck-web-impl 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 index 3c4d1c91dac..7ab133611c6 100644 --- 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 });