remove deprecated methods from BeanManager

This commit also removes the EL dependencies from the `api` module. The `el` module is the only module that depends on EL now.
jakartaee · May 24, 2024 · 778d0bf · 778d0bf
1 parent b3677cc
commit 778d0bf
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -152,12 +152,6 @@
 				<version>${atinject.api.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>jakarta.el</groupId>
-				<artifactId>jakarta.el-api</artifactId>
-				<version>${uel.api.version}</version>
-			</dependency>
-
 			<dependency>
 				<groupId>jakarta.interceptor</groupId>
 				<artifactId>jakarta.interceptor-api</artifactId>
@@ -177,11 +171,6 @@
 			<artifactId>jakarta.annotation-api</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>jakarta.el</groupId>
-			<artifactId>jakarta.el-api</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>jakarta.interceptor</groupId>
 			<artifactId>jakarta.interceptor-api</artifactId>
@@ -307,7 +296,6 @@
 							jakarta.enterprise.*;version=5.0,
 						</Export-Package>
 						<Import-Package>
-							jakarta.el;version=6.0,
 							*
 						</Import-Package>
 					</instructions>

diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java
@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Set;
 
-import jakarta.el.ELResolver;
-import jakarta.el.ExpressionFactory;
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.AmbiguousResolutionException;
@@ -221,28 +219,6 @@ public interface BeanManager extends BeanContainer {
      */
     public int getInterceptorBindingHashCode(Annotation interceptorBinding);
 
-    /**
-     * Returns a {@link jakarta.el.ELResolver} that resolves beans by EL name.
-     *
-     * @deprecated use {@code ELAwareBeanManager}, this method will be removed in CDI 5.0
-     * @return the {@link jakarta.el.ELResolver}
-     */
-    @Deprecated(since = "4.1", forRemoval = true)
-    public ELResolver getELResolver();
-
-    /**
-     * Returns a wrapper {@link jakarta.el.ExpressionFactory} that delegates {@link jakarta.el.MethodExpression} and
-     * {@link jakarta.el.ValueExpression} creation to the given {@link jakarta.el.ExpressionFactory}. When a Unified EL
-     * expression is evaluated using a {@link jakarta.el.MethodExpression} or {@link jakarta.el.ValueExpression} returned by the
-     * wrapper {@link jakarta.el.ExpressionFactory}, the container handles destruction of objects with scope {@link Dependent}.
-     *
-     * @deprecated use {@code ELAwareBeanManager}, this method will be removed in CDI 5.0
-     * @param expressionFactory the {@link jakarta.el.ExpressionFactory} to wrap
-     * @return the wrapped {@link jakarta.el.ExpressionFactory}
-     */
-    @Deprecated(since = "4.1", forRemoval = true)
-    public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory);
-
     /**
      * Obtain an {@link AnnotatedType} that may be used to read the annotations of the given class or interface.
      *

diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
@@ -33,12 +33,11 @@
     requires transitive jakarta.interceptor;
     requires transitive jakarta.cdi.lang.model;
     requires transitive jakarta.inject;
-    requires static jakarta.el;
     // For javadoc
     requires static java.naming;
     //TODO: requires static jakarta.transation;
 
     uses jakarta.enterprise.inject.se.SeContainerInitializer;
     uses jakarta.enterprise.inject.spi.CDIProvider;
     uses jakarta.enterprise.inject.build.compatible.spi.BuildServices;
-}
+}