This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit aade5ed3fcf16e7dd630a1ba725d089c7fceb747
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 11:26:11 2020 +0000
Update spec versions in MANIFESTs and parameterise from build script
---
build.xml | 18 ++++++++++++------
res/META-INF/annotations-api.jar.manifest | 8 ++++----
res/META-INF/el-api.jar.manifest | 10 +++++-----
res/META-INF/jaspic-api.jar.manifest | 8 ++++----
res/META-INF/jsp-api.jar.manifest | 8 ++++----
res/META-INF/servlet-api.jar.manifest | 8 ++++----
res/META-INF/websocket-api.jar.manifest | 8 ++++----
7 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/build.xml b/build.xml
index 1e12c7c..969698e 100644
--- a/build.xml
+++ b/build.xml
@@ -53,17 +53,17 @@
<!-- Exact spec versions (for the manifests etc.) -->
<property name="servlet.spec.version" value="5.0" />
- <property name="servlet.revision" value="M1" />
+ <property name="servlet.revision" value="0-M1" />
<property name="jsp.spec.version" value="3.0" />
- <property name="jsp.revision" value="M1" />
+ <property name="jsp.revision" value="0-M1" />
<property name="el.spec.version" value="4.0" />
- <property name="el.revision" value="M1" />
+ <property name="el.revision" value="0-M1" />
<property name="websocket.spec.version" value="2.0" />
- <property name="websocket.revision" value="M1" />
+ <property name="websocket.revision" value="0-M1" />
<property name="jaspic.spec.version" value="2.0" />
- <property name="jaspic.revision" value="M1" />
+ <property name="jaspic.revision" value="0-M1" />
<property name="annotation.spec.version" value="2.0" />
- <property name="annotation.revision" value="M1" />
+ <property name="annotation.revision" value="0-M1" />
<!-- Release artifact base names -->
<property name="final.name" value="${project}-${version}" />
@@ -747,11 +747,17 @@
<!-- Filtering tokens for JAR manifests-->
<filter token="source.jdk" value="${compile.source}"/>
<filter token="target.jdk" value="${compile.target}"/>
+ <filter token="servlet.spec.version" value="${servlet.spec.version}"/>
<filter token="servlet.revision" value="${servlet.revision}"/>
+ <filter token="jsp.spec.version" value="${jsp.spec.version}"/>
<filter token="jsp.revision" value="${jsp.revision}"/>
+ <filter token="el.spec.version" value="${el.spec.version}"/>
<filter token="el.revision" value="${el.revision}"/>
+ <filter token="websocket.spec.version" value="${websocket.spec.version}"/>
<filter token="websocket.revision" value="${websocket.revision}"/>
+ <filter token="jaspic.spec.version" value="${jaspic.spec.version}"/>
<filter token="jaspic.revision" value="${jaspic.revision}"/>
+ <filter token="annotation.spec.version"
value="${annotation.spec.version}"/>
<filter token="annotation.revision" value="${annotation.revision}"/>
<mkdir dir="${tomcat.manifests}" />
diff --git a/res/META-INF/annotations-api.jar.manifest
b/res/META-INF/annotations-api.jar.manifest
index 4b43993..dbb3410 100644
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Name: jakarta/annotation/
+Specification-Title: Jakarta Annotations
+Specification-Version: @annotation.spec.version@
+Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.annotation
+Implementation-Version: @annotation.spec.version@.@annotation.revision@
Implementation-Vendor: Apache Software Foundation
-Implementation-Version: 1.3.@annotation.revision@
-Specification-Title: Common Annotations
-Specification-Vendor: Oracle Corporation
-Specification-Version: 1.3
diff --git a/res/META-INF/el-api.jar.manifest b/res/META-INF/el-api.jar.manifest
index 63a6728..d253f13 100644
--- a/res/META-INF/el-api.jar.manifest
+++ b/res/META-INF/el-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Name: jakarta/el/
-Specification-Title: Expression Language
-Specification-Version: 3.0
-Specification-Vendor: Sun Microsystems, Inc.
-Implementation-Title: jakarta.el
-Implementation-Version: 3.0.@el.revision@
+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-Vendor: Apache Software Foundation
diff --git a/res/META-INF/jaspic-api.jar.manifest
b/res/META-INF/jaspic-api.jar.manifest
index a453d16..d315b99 100644
--- a/res/META-INF/jaspic-api.jar.manifest
+++ b/res/META-INF/jaspic-api.jar.manifest
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
Name: jakarta/security/auth/message
Specification-Title: Jakarta Authentication SPI for Containers
-Specification-Version: 1.1
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Version: @jaspic.spec.version@
+Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.security.auth.message
-Implementation-Version: 1.1.@jaspic.revision@
-Implementation-Vendor: Apache Software Foundation
\ No newline at end of file
+Implementation-Version: @jaspic.spec.version@.@jaspic.revision@
+Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/jsp-api.jar.manifest
b/res/META-INF/jsp-api.jar.manifest
index b21c7f1..8156ef2 100644
--- a/res/META-INF/jsp-api.jar.manifest
+++ b/res/META-INF/jsp-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Name: jakarta/servlet/jsp/
-Specification-Title: Java API for JavaServer Pages
-Specification-Version: 2.3
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Title: Jakarta Server Pages
+Specification-Version: @jsp.spec.version@
+Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.servlet.jsp
-Implementation-Version: 2.3.@jsp.revision@
+Implementation-Version: @jsp.spec.version@.@jsp.revision@
Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/servlet-api.jar.manifest
b/res/META-INF/servlet-api.jar.manifest
index 0e2b172..3e7733e 100644
--- a/res/META-INF/servlet-api.jar.manifest
+++ b/res/META-INF/servlet-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Name: jakarta/servlet/
-Specification-Title: Java API for Servlets
-Specification-Version: 4.0
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Title: Jakarta Servlet
+Specification-Version: @servlet.spec.version@
+Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.servlet
-Implementation-Version: 4.0.@servlet.revision@
+Implementation-Version: @servlet.spec.version@.@servlet.revision@
Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/websocket-api.jar.manifest
b/res/META-INF/websocket-api.jar.manifest
index f0daa6b..882a7dd 100644
--- a/res/META-INF/websocket-api.jar.manifest
+++ b/res/META-INF/websocket-api.jar.manifest
@@ -3,9 +3,9 @@ X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
Name: jakarta/websocket/
-Specification-Title: WebSocket
-Specification-Version: 1.1
-Specification-Vendor: Oracle, Inc.
+Specification-Title: Jakarta WebSocket
+Specification-Version: @websocket.spec.version@
+Specification-Vendor: Eclipse Foundation
Implementation-Title: jakarta.websocket
-Implementation-Version: 1.1.@websocket.revision@
+Implementation-Version: @websocket.spec.version@.@websocket.revision@
Implementation-Vendor: Apache Software Foundation
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
