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

Updates #818

Merged
merged 4 commits into from
May 24, 2024
Merged

Updates #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c277a57
move from 5.0.1.Alpha1-SNAPSHOT to 5.0.0.Alpha1-SNAPSHOT
Ladicek May 21, 2024
b9d36d9
move the base Java level to 17
Ladicek May 21, 2024
925bea8
move a few forgotten references from 4.1 to 5.0
Ladicek May 21, 2024
1c7af87
remove deprecated methods from BeanManager
Ladicek May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-parent</artifactId>
<version>5.0.1.Alpha1-SNAPSHOT</version>
<version>5.0.0.Alpha1-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.cdi-api</artifactId>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -303,11 +292,10 @@
<instructions>
<Automatic-Module-Name>jakarta.cdi</Automatic-Module-Name>
<Export-Package>
jakarta.decorator;version=4.1,
jakarta.enterprise.*;version=4.1,
jakarta.decorator;version=5.0,
jakarta.enterprise.*;version=5.0,
</Export-Package>
<Import-Package>
jakarta.el;version=5.0,
*
</Import-Package>
</instructions>
Expand Down
24 changes: 0 additions & 24 deletions api/src/main/java/jakarta/enterprise/inject/spi/BeanManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Ladicek marked this conversation as resolved.
Show resolved Hide resolved
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.
*
Expand Down
3 changes: 1 addition & 2 deletions api/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
4 changes: 2 additions & 2 deletions el/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-parent</artifactId>
<version>5.0.1.Alpha1-SNAPSHOT</version>
<version>5.0.0.Alpha1-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.cdi-el-api</artifactId>
Expand Down Expand Up @@ -99,7 +99,7 @@
<configuration>
<instructions>
<Export-Package>
jakarta.enterprise.inject.spi.el;version="4.1";uses:="jakarta.el"
jakarta.enterprise.inject.spi.el;version="5.0";uses:="jakarta.el"
</Export-Package>
<Import-Package>
jakarta.el;version="6.0",jakarta.enterprise.context,jakarta.enterprise.inject.spi
Expand Down
4 changes: 2 additions & 2 deletions ide-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-parent</artifactId>
<version>5.0.1.Alpha1-SNAPSHOT</version>
<version>5.0.0.Alpha1-SNAPSHOT</version>
</parent>

<artifactId>cdi-ide-config</artifactId>
Expand All @@ -23,7 +23,7 @@
<description>Formatting config and import sorting</description>

<properties>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
</properties>

</project>
4 changes: 2 additions & 2 deletions lang-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-parent</artifactId>
<version>5.0.1.Alpha1-SNAPSHOT</version>
<version>5.0.0.Alpha1-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.lang-model</artifactId>
Expand Down Expand Up @@ -72,7 +72,7 @@
<configuration>
<instructions>
<Export-Package>
jakarta.enterprise.lang.model.*;version=4.1,
jakarta.enterprise.lang.model.*;version=5.0,
</Export-Package>
</instructions>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-parent</artifactId>
<packaging>pom</packaging>
<version>5.0.1.Alpha1-SNAPSHOT</version>
<version>5.0.0.Alpha1-SNAPSHOT</version>

<description>Parent module for CDI Specification</description>

Expand Down Expand Up @@ -125,7 +125,7 @@

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>

<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
Expand Down
4 changes: 2 additions & 2 deletions spec/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-parent</artifactId>
<version>5.0.1.Alpha1-SNAPSHOT</version>
<version>5.0.0.Alpha1-SNAPSHOT</version>
</parent>

<artifactId>jakarta.enterprise.cdi-spec-doc</artifactId>
Expand All @@ -30,7 +30,7 @@
<license-file>asl2</license-file>
<!-- Draft for non-final releases, or Final for spec release -->
<revremark>Draft(M1)</revremark>
<revnumber>4.1</revnumber> <!-- major.minor only -->
<revnumber>5.0</revnumber> <!-- major.minor only -->
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
<revisiondate>${maven.build.timestamp}</revisiondate>
</properties>
Expand Down