Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WELD-2769 Support the ELAwareBeanManager #182

Merged
merged 2 commits into from
Dec 11, 2023
Merged

WELD-2769 Support the ELAwareBeanManager #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654a0e4
WELD-2769 Support the ELAwareBeanManager
arjantijms Dec 11, 2023
81d809d
WELD-2769 Add exlusion for EL API dep
manovotn Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${cdi.api.version}</version>
<exclusions>
<!-- The CDI cre artifact still declares dep on EL API for deprecated BM methods -->
<!-- Can be removed once we remove deprecated methods (likely in CDI 5) -->
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
Expand All @@ -189,6 +191,18 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-el-api</artifactId>
<version>${cdi.api.version}</version>
<exclusions>
<exclusion>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Copy link
Contributor

@manovotn manovotn Dec 11, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we'll also need to add an exclusion for EL API artifact here.
I'll check and add on to your PR if needed.


<!-- Configure non-API dependencies (e.g. testing)-->
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion weld-spi/src/main/java/org/jboss/weld/manager/api/WeldManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.enterprise.inject.spi.InjectionTarget;
import jakarta.enterprise.inject.spi.el.ELAwareBeanManager;

import org.jboss.weld.bootstrap.api.ServiceRegistry;
import org.jboss.weld.construction.api.WeldCreationalContext;
Expand All @@ -41,7 +42,7 @@
*
* @author Pete Muir
*/
public interface WeldManager extends BeanManager, Serializable {
public interface WeldManager extends BeanManager, ELAwareBeanManager, Serializable {

/**
* The injection target for the given EJB, or null if Weld was not given this descriptor in the deployment.
Expand Down
5 changes: 5 additions & 0 deletions weld/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-el-api</artifactId>
</dependency>

<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand Down