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

Fish 8722 upgrade expression language api to 6 #6736

Merged
merged 1 commit into from
May 25, 2024
Merged

Fish 8722 upgrade expression language api to 6 #6736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions appserver/packager/external/jakarta-ee11-shim/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@
<artifactId>jakarta.annotation-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- jakarta.el-->
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Downgrade shim for HK2 3.0 (now 4.0) as Jersey not yet upgraded to 4.0 and InSight not upgraded for EE11.
Remove once Jersey upgraded to 4.0 and InSight upgraded to a version aligned with Payara 7 (presumably 3.0), or
Expand Down Expand Up @@ -114,7 +120,9 @@
comment with which other component still requires the downgrade shim. -->
org.glassfish.hk2.api,
org.glassfish.hk2.locator,
org.glassfish.hk2.utils
org.glassfish.hk2.utils,
<!-- jakarta.el-->
jakarta.el-api
</Require-Bundle>
<!-- Manually specify the shim versions of packages to be exported via this bundle -->
<!-- Note the "shortened" syntax here: For every API the packages are delimited with
Expand All @@ -128,7 +136,8 @@
jakarta.annotation;
jakarta.annotation.security;
jakarta.annotation.sql;version="3.0.99";shim=true,

<!-- el previous version-->
jakarta.el;version="5.0.99";shim=true,
<!-- Downgrade shim for HK2 3.0 (now 4.0) as Jersey not yet upgraded to 4.0 and
InSight not upgraded for EE11. Remove once Jersey upgraded to 4.0 and InSight
upgraded to a version aligned with Payara 7 (presumably 3.0), or update this
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<cdi-api.version>4.1.0-M1</cdi-api.version>
<grizzly.version>4.0.0.payara-p1</grizzly.version>
<servlet-api.version>6.0.0</servlet-api.version>
<jakarta.el-api.version>5.0.1</jakarta.el-api.version>
<jakarta.el-api.version>6.0.0</jakarta.el-api.version>
<expressly.version>5.0.0</expressly.version>
<microprofile-config.version>3.1</microprofile-config.version>
<parsson.version>1.1.5.payara-p1</parsson.version>
Expand Down