This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0480c2b59357e1a030b5b155f0de33bd9fcdd1cf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 16 12:19:02 2022 +0100
EL 3.0 specification is now final and has been released
---
build.xml | 2 +-
res/META-INF/el-api.jar.manifest | 2 +-
res/bnd/el-api.jar.tmp.bnd | 2 +-
res/bnd/tomcat-embed-el.jar.tmp.bnd | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.xml b/build.xml
index 9ee5e0dd9a..68150b4041 100644
--- a/build.xml
+++ b/build.xml
@@ -60,7 +60,7 @@
<property name="jsp.spec.version" value="3.1" />
<property name="jsp.revision" value="-SNAPSHOT" />
<property name="el.spec.version" value="5.0" />
- <property name="el.revision" value="-SNAPSHOT" />
+ <property name="el.revision" value="" />
<property name="websocket.spec.version" value="2.1" />
<property name="websocket.revision" value="" />
<property name="jaspic.spec.version" value="3.0" />
diff --git a/res/META-INF/el-api.jar.manifest b/res/META-INF/el-api.jar.manifest
index d253f13ed0..0383e37fba 100644
--- a/res/META-INF/el-api.jar.manifest
+++ b/res/META-INF/el-api.jar.manifest
@@ -7,5 +7,5 @@ Specification-Title: Jakarta Expression Language
Specification-Version: @el.spec.version@
Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.annotation
-Implementation-Version: @el.spec.version@.@el.revision@
+Implementation-Version: @el.spec.version@@el.revision@
Implementation-Vendor: Apache Software Foundation
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index ad09124ba4..ca57dbacbf 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -39,7 +39,7 @@ Require-Capability: \
Specification-Version=${el.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.el;\
- Implementation-Version=${el.spec.version}.${el.revision};\
+ Implementation-Version=${el.spec.version}${el.revision};\
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index ff3d113313..27320082e0 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -49,7 +49,7 @@ Require-Capability: \
Specification-Version=${el.spec.version};\
Specification-Vendor=Eclipse Foundation;\
Implementation-Title=jakarta.annotation;\
- Implementation-Version=${el.spec.version}.${el.revision};\
+ Implementation-Version=${el.spec.version}${el.revision};\
Implementation-Vendor=Apache Software Foundation
-jpms-module-info: \
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
