Merge pull request #12223 from bstansberry/WFLY-11979

[WFLY-11979] Stop using jboss fork of glassfish el impl; move to v3.0.2

bean-validation/pom.xml

@@ -60,7 +60,7 @@
             <!-- Needed for Hibernate Validator since it asserts the existence of javax.el during bootstrap in the
                   default configuration-->
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.el-impl</artifactId>
+            <artifactId>jakarta.el</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml

@@ -54,7 +54,7 @@
         <module name="javax.xml.bind.api" export="true"/>
         <module name="javax.xml.soap.api" export="true"/>
         <module name="javax.xml.ws.api" export="true"/>
-        <module name="org.glassfish.javax.el" export="true"/>
+        <module name="org.glassfish.jakarta.el" export="true"/>
 
         <!-- TODO WFLY-5966 validate the need for these and remove if not needed.
              Prior to WFLY-5922 they were exported by javax.ejb.api. -->

feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml

@@ -30,7 +30,7 @@
         <module name="javax.servlet.jsp.api" export="true"/>
         <module name="javax.servlet.jstl.api" export="true"/>
         <module name="javax.validation.api" export="true"/>
-        <module name="org.glassfish.javax.el" export="true"/>
+        <module name="org.glassfish.jakarta.el" export="true"/>
         <module name="javax.api"/>
         <module name="javax.websocket.api"/>
     </dependencies>

feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml

@@ -33,7 +33,7 @@
     <module name="javax.persistence.api"/>
     <module name="javax.validation.api"/>
     <module name="javax.xml.bind.api"/>
-    <module name="org.glassfish.javax.el"/>
+    <module name="org.glassfish.jakarta.el"/>
     <module name="org.jboss.logging"/>
     <module name="org.jboss.weld.core"/>
     <module name="org.jboss.weld.spi"/>

feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml

@@ -75,7 +75,7 @@
         <module name="org.wildfly.clustering.spi"/>
         <module name="org.wildfly.clustering.service"/>
         <module name="org.wildfly.common"/>
-        <module name="org.glassfish.javax.el"/>
+        <module name="org.glassfish.jakarta.el"/>
     </dependencies>
 
 </module>

feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml

@@ -54,7 +54,7 @@
         <module name="javax.servlet.jsp.api"/>
         <module name="javax.transaction.api"/>
         <module name="javax.validation.api"/>
-        <module name="org.glassfish.javax.el" />
+        <module name="org.glassfish.jakarta.el" />
         <module name="org.jboss.jandex"/>
         <module name="org.jboss.staxmapper"/>
         <module name="org.jboss.as.controller"/>

feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml

@@ -45,7 +45,7 @@
         <module name="javax.servlet.api"/>
         <module name="javax.transaction.api"/>
         <module name="javax.validation.api"/>
-        <module name="org.glassfish.javax.el" />
+        <module name="org.glassfish.jakarta.el" />
         <module name="org.jboss.classfilewriter"/>
         <module name="org.jboss.weld.api" export="true"/>
         <module name="org.jboss.weld.spi" export="true"/>

jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml

@@ -30,7 +30,7 @@
         <module name="javax.servlet.jsp.api" export="true"/>
         <module name="javax.servlet.jstl.api" export="true"/>
         <module name="javax.validation.api" export="true"/>
-        <module name="org.glassfish.javax.el" export="true"/>
+        <module name="org.glassfish.jakarta.el" export="true"/>
         <module name="javax.api"/>
         <module name="javax.websocket.api"/>
     </dependencies>

jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml

@@ -29,7 +29,7 @@
         <module name="javax.servlet.jsp.api" export="true"/>
         <module name="javax.servlet.jstl.api" export="true"/>
         <module name="javax.validation.api" export="true"/>
-        <module name="org.glassfish.javax.el" export="true"/>
+        <module name="org.glassfish.jakarta.el" export="true"/>
         <module name="javax.api"/>
 
         <!-- extra dependencies for MyFaces 1.1

pom.xml

@@ -307,7 +307,7 @@
         <version.org.eclipse.microprofile.rest.client.api>1.0.1</version.org.eclipse.microprofile.rest.client.api>
         <version.org.eclipse.yasson>1.0.3</version.org.eclipse.yasson>
         <version.org.eclipselink.version>2.7.3</version.org.eclipselink.version>
-        <version.org.glassfish.javax.el>3.0.1-b08-jbossorg-1</version.org.glassfish.javax.el>
+        <version.org.glassfish.jakarta.el>3.0.2</version.org.glassfish.jakarta.el>
         <version.org.glassfish.javax.enterprise.concurrent>1.0</version.org.glassfish.javax.enterprise.concurrent>
         <version.org.glassfish.soteria>1.0</version.org.glassfish.soteria>
         <version.org.hibernate>5.3.9.Final</version.org.hibernate>
@@ -3979,14 +3979,8 @@
             <!-- EL3 RI implementation -->
             <dependency>
                 <groupId>org.glassfish</groupId>
-                <artifactId>javax.el-impl</artifactId>
-                <version>${version.org.glassfish.javax.el}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.glassfish</groupId>
-                        <artifactId>javax.el-api</artifactId>
-                    </exclusion>
-                </exclusions>
+                <artifactId>jakarta.el</artifactId>
+                <version>${version.org.glassfish.jakarta.el}</version>
             </dependency>
 
             <!-- JSR-236 RI -->

servlet-feature-pack/pom.xml

@@ -150,7 +150,7 @@
 
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.el-impl</artifactId>
+            <artifactId>jakarta.el</artifactId>
         </dependency>
 
         <dependency>

servlet-feature-pack/src/license/servlet-feature-pack-licenses.xml

@@ -161,11 +161,11 @@
     </dependency>
     <dependency>
       <groupId>org.glassfish</groupId>
-      <artifactId>javax.el-impl</artifactId>
+      <artifactId>jakarta.el</artifactId>
       <licenses>
         <license>
-          <name>Common Development and Distribution License 1.1</name>
-          <url>https://javaee.github.io/glassfish/LICENSE</url>
+          <name>Eclipse Public License 2.0</name>
+          <url>http://www.eclipse.org/legal/epl-2.0</url>
           <distribution>repo</distribution>
         </license>
         <license>