From f20153bdcf1f8f5430133d6decb3e28160f55c08 Mon Sep 17 00:00:00 2001
From: Gaurav Gupta <gaurav.gupta@payara.fish>
Date: Thu, 8 Apr 2021 11:57:45 +0530
Subject: [PATCH] FISH-1280 Jakarta EE9:  Distribute EL API

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
---
 api/payara-bom/pom.xml                   | 20 ++++++++++----------
 appserver/packager/glassfish-web/pom.xml |  4 ++++
 appserver/pom.xml                        |  8 ++++----
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/api/payara-bom/pom.xml b/api/payara-bom/pom.xml
index cf05a389c9b..3209bba8953 100644
--- a/api/payara-bom/pom.xml
+++ b/api/payara-bom/pom.xml
@@ -283,16 +283,6 @@
                 <artifactId>jakarta.validation-api</artifactId>
                 <version>${jakarta.validation.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.el</groupId>
-                <artifactId>jakarta.el-api</artifactId>
-                <version>${jakarta.el-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta.mail</groupId>
-                <artifactId>jakarta.mail-api</artifactId>
-                <version>${mail.version}</version>
-            </dependency>
             <dependency>
                 <groupId>jakarta.annotation</groupId>
                 <artifactId>jakarta.annotation-api</artifactId>
@@ -522,11 +512,21 @@
                 <artifactId>hibernate-validator-cdi</artifactId>
                 <version>${hibernate.validator-cdi.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.el</groupId>
+                <artifactId>jakarta.el-api</artifactId>
+                <version>${jakarta.el-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
                 <artifactId>jakarta.el</artifactId>
                 <version>${jakarta.el.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>${mail.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.sun.mail</groupId>
                 <artifactId>jakarta.mail</artifactId>
diff --git a/appserver/packager/glassfish-web/pom.xml b/appserver/packager/glassfish-web/pom.xml
index 775b51f3a6b..56fdd3e054b 100644
--- a/appserver/packager/glassfish-web/pom.xml
+++ b/appserver/packager/glassfish-web/pom.xml
@@ -262,6 +262,10 @@
             <artifactId>jakarta.security.enterprise</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.el</artifactId>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index d106185530c..8efbb3d5ffc 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -489,11 +489,11 @@
                         </spec>
                         <spec>
                             <artifact>
-                                <groupId>org.glassfish</groupId>
-                                <artifactId>jakarta.el</artifactId>
-                                <version>${jakarta.el.version}</version>
+                                <groupId>jakarta.el</groupId>
+                                <artifactId>jakarta.el-api</artifactId>
+                                <version>${jakarta.el-api.version}</version>
                             </artifact>
-                            <jarType>impl</jarType>
+                            <jarType>api</jarType>
                             <specVersion>3.0</specVersion>
                             <implVersion>${jakarta.el.version}</implVersion>
                             <apiPackage>jakarta.el</apiPackage>