From c277a575d9580f804e73d633eab01e06f5443579 Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Tue, 21 May 2024 16:43:45 +0200 Subject: [PATCH 1/4] move from 5.0.1.Alpha1-SNAPSHOT to 5.0.0.Alpha1-SNAPSHOT --- api/pom.xml | 2 +- el/pom.xml | 2 +- ide-config/pom.xml | 2 +- lang-model/pom.xml | 2 +- pom.xml | 2 +- spec/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 07cb2446..cf766907 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 diff --git a/el/pom.xml b/el/pom.xml index 1860de52..e0a9c562 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 diff --git a/ide-config/pom.xml b/ide-config/pom.xml index 3aba3e3b..f10e197e 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 diff --git a/lang-model/pom.xml b/lang-model/pom.xml index 51aeb7f4..bc344b98 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 diff --git a/pom.xml b/pom.xml index 8b7fa90b..c3d45cb0 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 diff --git a/spec/pom.xml b/spec/pom.xml index c329204c..adc57a1f 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 From b9d36d972cd8f73ac7d7d15bbe71c6565477ca7c Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Tue, 21 May 2024 16:44:11 +0200 Subject: [PATCH 2/4] move the base Java level to 17 --- ide-config/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ide-config/pom.xml b/ide-config/pom.xml index f10e197e..7a1713f0 100644 --- a/ide-config/pom.xml +++ b/ide-config/pom.xml @@ -23,7 +23,7 @@ Formatting config and import sorting - 11 + 17 diff --git a/pom.xml b/pom.xml index c3d45cb0..aa6290fc 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ UTF-8 - 11 + 17 5.1.9 3.12.1 From 925bea85ad11d14b2c1a7b9d9e60c4d3af838bef Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Tue, 21 May 2024 16:44:54 +0200 Subject: [PATCH 3/4] move a few forgotten references from 4.1 to 5.0 --- api/pom.xml | 6 +++--- el/pom.xml | 2 +- lang-model/pom.xml | 2 +- spec/pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index cf766907..87538fe6 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -303,11 +303,11 @@ 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, + jakarta.el;version=6.0, * diff --git a/el/pom.xml b/el/pom.xml index e0a9c562..4273f182 100644 --- a/el/pom.xml +++ b/el/pom.xml @@ -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/lang-model/pom.xml b/lang-model/pom.xml index bc344b98..d8f62395 100644 --- a/lang-model/pom.xml +++ b/lang-model/pom.xml @@ -72,7 +72,7 @@ - jakarta.enterprise.lang.model.*;version=4.1, + jakarta.enterprise.lang.model.*;version=5.0, diff --git a/spec/pom.xml b/spec/pom.xml index adc57a1f..07ee2476 100644 --- a/spec/pom.xml +++ b/spec/pom.xml @@ -30,7 +30,7 @@ asl2 Draft(M1) - 4.1 + 5.0 MMMM dd, yyyy ${maven.build.timestamp} From 1c7af87491617a44b254416c7a8d8422b8b33dd2 Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Tue, 21 May 2024 16:45:52 +0200 Subject: [PATCH 4/4] 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. --- api/pom.xml | 12 ---------- .../enterprise/inject/spi/BeanManager.java | 24 ------------------- api/src/main/java/module-info.java | 3 +-- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 87538fe6..c600b949 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -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 @@ -307,7 +296,6 @@ jakarta.enterprise.*;version=5.0, - jakarta.el;version=6.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 f0367017..af512fea 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 b4f3fdd7..dc7ef3c3 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 +}