diff --git a/api/pom.xml b/api/pom.xml
index 07cb24460..c600b9491 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -18,7 +18,7 @@
jakarta.enterprise
jakarta.enterprise.cdi-parent
- 5.0.1.Alpha1-SNAPSHOT
+ 5.0.0.Alpha1-SNAPSHOT
jakarta.enterprise.cdi-api
@@ -152,12 +152,6 @@
${atinject.api.version}
-
- jakarta.el
- jakarta.el-api
- ${uel.api.version}
-
-
jakarta.interceptor
jakarta.interceptor-api
@@ -177,11 +171,6 @@
jakarta.annotation-api
-
- jakarta.el
- jakarta.el-api
-
-
jakarta.interceptor
jakarta.interceptor-api
@@ -303,11 +292,10 @@
jakarta.cdi
- jakarta.decorator;version=4.1,
- jakarta.enterprise.*;version=4.1,
+ jakarta.decorator;version=5.0,
+ jakarta.enterprise.*;version=5.0,
- jakarta.el;version=5.0,
*
diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java b/api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java
index f0367017f..af512fea6 100644
--- 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
index b4f3fdd79..dc7ef3c3b 100644
--- a/api/src/main/java/module-info.java
+++ b/api/src/main/java/module-info.java
@@ -33,7 +33,6 @@
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;
@@ -41,4 +40,4 @@
uses jakarta.enterprise.inject.se.SeContainerInitializer;
uses jakarta.enterprise.inject.spi.CDIProvider;
uses jakarta.enterprise.inject.build.compatible.spi.BuildServices;
-}
\ No newline at end of file
+}
diff --git a/el/pom.xml b/el/pom.xml
index 1860de526..4273f1828 100644
--- a/el/pom.xml
+++ b/el/pom.xml
@@ -13,7 +13,7 @@
jakarta.enterprise
jakarta.enterprise.cdi-parent
- 5.0.1.Alpha1-SNAPSHOT
+ 5.0.0.Alpha1-SNAPSHOT
jakarta.enterprise.cdi-el-api
@@ -99,7 +99,7 @@
- jakarta.enterprise.inject.spi.el;version="4.1";uses:="jakarta.el"
+ jakarta.enterprise.inject.spi.el;version="5.0";uses:="jakarta.el"
jakarta.el;version="6.0",jakarta.enterprise.context,jakarta.enterprise.inject.spi
diff --git a/ide-config/pom.xml b/ide-config/pom.xml
index 3aba3e3bf..7a1713f00 100644
--- a/ide-config/pom.xml
+++ b/ide-config/pom.xml
@@ -14,7 +14,7 @@
jakarta.enterprise
jakarta.enterprise.cdi-parent
- 5.0.1.Alpha1-SNAPSHOT
+ 5.0.0.Alpha1-SNAPSHOT
cdi-ide-config
@@ -23,7 +23,7 @@
Formatting config and import sorting
- 11
+ 17
diff --git a/lang-model/pom.xml b/lang-model/pom.xml
index 51aeb7f4c..d8f62395c 100644
--- a/lang-model/pom.xml
+++ b/lang-model/pom.xml
@@ -13,7 +13,7 @@
jakarta.enterprise
jakarta.enterprise.cdi-parent
- 5.0.1.Alpha1-SNAPSHOT
+ 5.0.0.Alpha1-SNAPSHOT
jakarta.enterprise.lang-model
@@ -72,7 +72,7 @@
- jakarta.enterprise.lang.model.*;version=4.1,
+ jakarta.enterprise.lang.model.*;version=5.0,
diff --git a/pom.xml b/pom.xml
index 8b7fa90b8..aa6290fc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
jakarta.enterprise
jakarta.enterprise.cdi-parent
pom
- 5.0.1.Alpha1-SNAPSHOT
+ 5.0.0.Alpha1-SNAPSHOT
Parent module for CDI Specification
@@ -125,7 +125,7 @@
UTF-8
- 11
+ 17
5.1.9
3.12.1
diff --git a/spec/pom.xml b/spec/pom.xml
index c329204c2..07ee24765 100644
--- a/spec/pom.xml
+++ b/spec/pom.xml
@@ -13,7 +13,7 @@
jakarta.enterprise
jakarta.enterprise.cdi-parent
- 5.0.1.Alpha1-SNAPSHOT
+ 5.0.0.Alpha1-SNAPSHOT
jakarta.enterprise.cdi-spec-doc
@@ -30,7 +30,7 @@
asl2
Draft(M1)
- 4.1
+ 5.0
MMMM dd, yyyy
${maven.build.timestamp}