Skip to content

Commit ca3b7d3

Browse files
arjantijmsarjantijms
authored
Merge pull request #23123 from smillidge/23120
Upgrades EL to RC2
2 parents 705676e + 8c1713a commit ca3b7d3

File tree

26 files changed

+108
-12
lines changed

26 files changed

+108
-12
lines changed

‎appserver/admin/admin-core/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<dependency>
6666
<groupId>jakarta.el</groupId>
6767
<artifactId>jakarta.el-api</artifactId>
68+
<scope>test</scope>
6869
</dependency>
6970
<dependency>
7071
<groupId>org.glassfish</groupId>

‎appserver/admin/template/src/main/resources/config/default-web.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@
293293
/lib/
294294
\lib\
295295
jakarta.el.jar
296+
jakarta.el-api.jar
296297
jakarta.servlet-api.jar
297298
jakarta.servlet.jsp-api.jar
298299
jakarta.servlet.jsp.jstl-api.jar

‎appserver/admingui/common/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
<groupId>jakarta.servlet.jsp</groupId>
8787
<artifactId>jakarta.servlet.jsp-api</artifactId>
8888
</dependency>
89+
<dependency>
90+
<groupId>jakarta.el</groupId>
91+
<artifactId>jakarta.el-api</artifactId>
92+
</dependency>
8993
<dependency>
9094
<groupId>org.glassfish</groupId>
9195
<artifactId>jakarta.el</artifactId>

‎appserver/admingui/war/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<archive>
4848
<manifestEntries>
4949
<Glassfish-require-services>org.glassfish.api.admingui.ConsoleProvider</Glassfish-require-services>
50-
<HK2-Import-Bundles>org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, jakarta.servlet-api, jakarta.servlet.jsp-api, com.sun.el.jakarta.el, org.glassfish.jsftemplating, org.glassfish.main.admingui.dataprovider</HK2-Import-Bundles>
50+
<HK2-Import-Bundles>org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, jakarta.servlet-api, jakarta.servlet.jsp-api, jakarta.el-api, org.glassfish.jakarta.el, org.glassfish.jsftemplating, org.glassfish.main.admingui.dataprovider</HK2-Import-Bundles>
5151
</manifestEntries>
5252
</archive>
5353
</configuration>
@@ -78,7 +78,7 @@
7878
<jar jarfile="target/admingui.war" basedir="target/temp">
7979
<manifest>
8080
<attribute name="Glassfish-require-services" value="org.glassfish.api.admingui.ConsoleProvider" />
81-
<attribute name="HK2-Import-Bundles" value="org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, jakarta.servlet-api, jakarta.servlet.jsp-api, com.sun.el.jakarta.el, org.glassfish.jsftemplating, org.glassfish.main.admingui.dataprovider" />
81+
<attribute name="HK2-Import-Bundles" value="org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, jakarta.servlet-api, jakarta.servlet.jsp-api, jakarta.el-api, org.glassfish.jakarta.el, org.glassfish.jsftemplating, org.glassfish.main.admingui.dataprovider" />
8282
</manifest>
8383
</jar>
8484
<delete dir="target/temp" />

‎appserver/connectors/admin/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@
105105
<version>${project.version}</version>
106106
<scope>test</scope>
107107
</dependency>
108+
<dependency>
109+
<groupId>jakarta.el</groupId>
110+
<artifactId>jakarta.el-api</artifactId>
111+
<scope>test</scope>
112+
</dependency>
108113
<dependency>
109114
<groupId>org.glassfish</groupId>
110115
<artifactId>jakarta.el</artifactId>

‎appserver/extras/embedded/all/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,6 +1332,11 @@
13321332
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
13331333
<optional>true</optional>
13341334
</dependency>
1335+
<dependency>
1336+
<groupId>jakarta.el</groupId>
1337+
<artifactId>jakarta.el-api</artifactId>
1338+
<optional>true</optional>
1339+
</dependency>
13351340
<dependency>
13361341
<groupId>org.glassfish</groupId>
13371342
<artifactId>jakarta.el</artifactId>

‎appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,11 @@
11541154
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
11551155
<optional>true</optional>
11561156
</dependency>
1157+
<dependency>
1158+
<groupId>jakarta.el</groupId>
1159+
<artifactId>jakarta.el-api</artifactId>
1160+
<optional>true</optional>
1161+
</dependency>
11571162
<dependency>
11581163
<groupId>org.glassfish</groupId>
11591164
<artifactId>jakarta.el</artifactId>

‎appserver/extras/embedded/web/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,6 +1064,11 @@
10641064
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
10651065
<optional>true</optional>
10661066
</dependency>
1067+
<dependency>
1068+
<groupId>jakarta.el</groupId>
1069+
<artifactId>jakarta.el-api</artifactId>
1070+
<optional>true</optional>
1071+
</dependency>
10671072
<dependency>
10681073
<groupId>org.glassfish</groupId>
10691074
<artifactId>jakarta.el</artifactId>

‎appserver/extras/javaee/manifest-jar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<configuration>
3535
<archive>
3636
<manifestEntries>
37-
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/validation.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
37+
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.management.j2ee-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/validation.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
3838
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
3939
</manifestEntries>
4040
</archive>

‎appserver/featuresets/web/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,16 @@
10461046
</exclusion>
10471047
</exclusions>
10481048
</dependency>
1049+
<dependency>
1050+
<groupId>jakarta.el</groupId>
1051+
<artifactId>jakarta.el-api</artifactId>
1052+
<exclusions>
1053+
<exclusion>
1054+
<groupId>*</groupId>
1055+
<artifactId>*</artifactId>
1056+
</exclusion>
1057+
</exclusions>
1058+
</dependency>
10491059
<dependency>
10501060
<groupId>org.glassfish</groupId>
10511061
<artifactId>jakarta.el</artifactId>

‎appserver/jdbc/admin/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@
101101
<version>${project.version}</version>
102102
<scope>test</scope>
103103
</dependency>
104+
<dependency>
105+
<groupId>jakarta.el</groupId>
106+
<artifactId>jakarta.el-api</artifactId>
107+
<scope>test</scope>
108+
</dependency>
104109
<dependency>
105110
<groupId>org.glassfish</groupId>
106111
<artifactId>jakarta.el</artifactId>

‎appserver/jdbc/jdbc-runtime/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
<version>${project.version}</version>
6666
<scope>test</scope>
6767
</dependency>
68+
<dependency>
69+
<groupId>jakarta.el</groupId>
70+
<artifactId>jakarta.el-api</artifactId>
71+
<scope>test</scope>
72+
</dependency>
6873
<dependency>
6974
<groupId>org.glassfish</groupId>
7075
<artifactId>jakarta.el</artifactId>

‎appserver/orb/orb-connector/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@
128128
<version>${project.version}</version>
129129
<scope>test</scope>
130130
</dependency>
131+
<dependency>
132+
<groupId>jakarta.el</groupId>
133+
<artifactId>jakarta.el-api</artifactId>
134+
<scope>test</scope>
135+
</dependency>
131136
<dependency>
132137
<groupId>org.glassfish</groupId>
133138
<artifactId>jakarta.el</artifactId>

‎appserver/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156
<stax2-api.version>4.2.1</stax2-api.version>
157157

158158
<!-- Jakarta Standard Tag Library -->
159-
<jstl-api.version>2.0.0-RC1</jstl-api.version>
160-
<jstl-impl.version>2.0.0-M1</jstl-impl.version>
159+
<jstl-api.version>2.0.0-RC3</jstl-api.version>
160+
<jstl-impl.version>2.0.0-M2</jstl-impl.version>
161161

162162
<!-- CDI -->
163163
<cdi-api.version>3.0.0-M4</cdi-api.version>
@@ -359,7 +359,7 @@
359359
<version>${hibernate-validator.version}</version>
360360
</dependency>
361361

362-
<!-- Jakarta Expression Language -->
362+
<!-- Jakarta Expression Language Impl -->
363363
<dependency>
364364
<groupId>org.glassfish</groupId>
365365
<artifactId>jakarta.el</artifactId>

‎appserver/resources/mail/mail-connector/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@
9090
<version>${project.version}</version>
9191
<scope>test</scope>
9292
</dependency>
93+
<dependency>
94+
<groupId>jakarta.el</groupId>
95+
<artifactId>jakarta.el-api</artifactId>
96+
<scope>test</scope>
97+
</dependency>
9398
<dependency>
9499
<groupId>org.glassfish</groupId>
95100
<artifactId>jakarta.el</artifactId>

‎appserver/resources/resources-connector/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@
102102
<version>${project.version}</version>
103103
<scope>test</scope>
104104
</dependency>
105+
<dependency>
106+
<groupId>jakarta.el</groupId>
107+
<artifactId>jakarta.el-api</artifactId>
108+
<scope>test</scope>
109+
</dependency>
105110
<dependency>
106111
<groupId>org.glassfish</groupId>
107112
<artifactId>jakarta.el</artifactId>

‎appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<target name="compile">
3737
<javac
3838
srcdir="."
39-
classpath="${env.APS_HOME}/lib/reportbuilder.jar;${env.S1AS_HOME}/modules/jakarta.el.jar"
39+
classpath="${env.APS_HOME}/lib/reportbuilder.jar;${env.S1AS_HOME}/modules/jakarta.el.jar;${env.S1AS_HOME}/modules/jakarta.el-api.jar"
4040
includes="WebTest.java"/>
4141

4242
</target>
@@ -46,6 +46,7 @@
4646
<classpath>
4747
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
4848
<pathelement location="${env.S1AS_HOME}/modules/jakarta.el.jar"/>
49+
<pathelement location="${env.S1AS_HOME}/modules/jakarta.el-api.jar"/>
4950
<pathelement location="."/>
5051
</classpath>
5152
</java>

‎appserver/verifier/verifier-impl/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
<optional>true</optional>
153153
<scope>provided</scope>
154154
</dependency>
155+
<dependency>
156+
<groupId>jakarta.el</groupId>
157+
<artifactId>jakarta.el-api</artifactId>
158+
<optional>true</optional>
159+
<scope>provided</scope>
160+
</dependency>
155161
<dependency>
156162
<groupId>org.glassfish</groupId>
157163
<artifactId>jakarta.el</artifactId>

‎appserver/web/war-util/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
<groupId>jakarta.servlet.jsp</groupId>
5858
<artifactId>jakarta.servlet.jsp-api</artifactId>
5959
</dependency>
60+
<dependency>
61+
<groupId>jakarta.el</groupId>
62+
<artifactId>jakarta.el-api</artifactId>
63+
</dependency>
6064
<dependency>
6165
<groupId>org.glassfish</groupId>
6266
<artifactId>jakarta.el</artifactId>

‎appserver/web/web-glue/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@
152152
<groupId>org.glassfish.web</groupId>
153153
<artifactId>jakarta.servlet.jsp</artifactId>
154154
</dependency>
155+
<dependency>
156+
<groupId>jakarta.el</groupId>
157+
<artifactId>jakarta.el-api</artifactId>
158+
</dependency>
155159
<dependency>
156160
<groupId>org.glassfish</groupId>
157161
<artifactId>jakarta.el</artifactId>

‎nucleus/admin/config-api/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@
113113
<version>${project.version}</version>
114114
<scope>test</scope>
115115
</dependency>
116+
<dependency>
117+
<groupId>jakarta.el</groupId>
118+
<artifactId>jakarta.el-api</artifactId>
119+
<scope>test</scope>
120+
</dependency>
116121
<dependency>
117122
<groupId>org.glassfish</groupId>
118123
<artifactId>jakarta.el</artifactId>

‎nucleus/admin/rest/rest-service/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@
133133
<artifactId>osgi.core</artifactId>
134134
<scope>provided</scope>
135135
</dependency>
136+
<dependency>
137+
<groupId>jakarta.el</groupId>
138+
<artifactId>jakarta.el-api</artifactId>
139+
<scope>test</scope>
140+
</dependency>
136141
<dependency>
137142
<groupId>org.glassfish</groupId>
138143
<artifactId>jakarta.el</artifactId>

‎nucleus/distributions/nucleus-common/src/main/resources/bin/jspc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
AS_INSTALL=`dirname $0`/..
1919
AS_INSTALL_LIB=$AS_INSTALL/modules
2020
JSP_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jar
21-
EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar
21+
EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar:$AS_INSTALL_LIB/jakarta.el-api.jar
2222
JSTL_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jstl.jar
2323
AS_LIB=$AS_INSTALL/lib
2424
JAVAEE_API=$AS_LIB/javaee.jar

‎nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ REM
1919

2020
set AS_INSTALL_LIB=%~dp0..\modules
2121
set JSP_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jar
22-
set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar
22+
set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar;%AS_INSTALL_LIB%\jakarta.el-api.jar
2323
set JSTL_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jstl.jar
2424
set AS_LIB=%~dp0..\lib
2525
set JAVAEE_API=%AS_LIB%\javaee.jar

‎nucleus/featuresets/atomic/pom.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,16 @@
370370
</exclusion>
371371
</exclusions>
372372
</dependency>
373+
<dependency>
374+
<groupId>jakarta.el</groupId>
375+
<artifactId>jakarta.el-api</artifactId>
376+
<exclusions>
377+
<exclusion>
378+
<groupId>*</groupId>
379+
<artifactId>*</artifactId>
380+
</exclusion>
381+
</exclusions>
382+
</dependency>
373383
<dependency>
374384
<groupId>org.glassfish</groupId>
375385
<artifactId>jakarta.el</artifactId>

‎nucleus/parent/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@
8282
<!-- Jakarta API Versions -->
8383

8484
<!-- Jakarta EL -->
85-
<jakarta.el.version>4.0.0-RC1</jakarta.el.version>
86-
<jakarta.el-api.version>4.0.0-RC1</jakarta.el-api.version>
85+
<jakarta.el.version>4.0.0-RC2</jakarta.el.version>
86+
<jakarta.el-api.version>4.0.0-RC2</jakarta.el-api.version>
8787

8888
<!-- Jakarta Servlet -->
8989
<servlet-api.version>5.0.0-M1</servlet-api.version>
9090

9191
<!-- Jakarta Validation -->
9292
<jakarta.validation.version>3.0.0-M1</jakarta.validation.version>
93-
<hibernate-validator.version>7.0.0.Alpha3</hibernate-validator.version>
93+
<hibernate-validator.version>7.0.0.Alpha4</hibernate-validator.version>
9494

9595
<!-- Jakarta Web Services -->
9696
<webservices.version>3.0.0-M2</webservices.version>

0 commit comments

Comments
 (0)