[tomcat] branch main updated: WebSocket 2.1 has been released. Update version info.

[ma...@apache.org]

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


The following commit(s) were added to refs/heads/main by this push:
     new 6dfd443229 WebSocket 2.1 has been released. Update version info.
6dfd443229 is described below

commit 6dfd443229ea6f727149784be5f4f72eea08cf35
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 4 19:11:55 2022 +0100

    WebSocket 2.1 has been released. Update version info.
    
    Reviewed manifests and clarified spec version (2.1) vs implementation
    version (Tomcat version)
---
 build.xml                                      | 2 +-
 res/META-INF/websocket-api.jar.manifest        | 4 ++--
 res/META-INF/websocket-client-api.jar.manifest | 4 ++--
 res/bnd/websocket-api.jar.tmp.bnd              | 4 ++--
 res/bnd/websocket-client-api.jar.tmp.bnd       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 580b16aca1..8d3eaf7877 100644
--- a/build.xml
+++ b/build.xml
@@ -62,7 +62,7 @@
   <property name="el.spec.version"         value="5.0" />
   <property name="el.revision"             value="-SNAPSHOT" />
   <property name="websocket.spec.version"  value="2.1" />
-  <property name="websocket.revision"      value="-SNAPSHOT" />
+  <property name="websocket.revision"      value="" />
   <property name="jaspic.spec.version"     value="3.0" />
   <property name="jaspic.revision"         value="-SNAPSHOT" />
   <property name="annotation.spec.version" value="2.1" />
diff --git a/res/META-INF/websocket-api.jar.manifest b/res/META-INF/websocket-api.jar.manifest
index 882a7dde4c..08b95b26be 100644
--- a/res/META-INF/websocket-api.jar.manifest
+++ b/res/META-INF/websocket-api.jar.manifest
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/websocket/
 Specification-Title: Jakarta WebSocket
-Specification-Version: @websocket.spec.version@
+Specification-Version: @websocket.spec.version@@websocket.revision@
 Specification-Vendor: Eclipse Foundation
 Implementation-Title: jakarta.websocket
-Implementation-Version: @websocket.spec.version@.@websocket.revision@
+Implementation-Version: @version@
 Implementation-Vendor: Apache Software Foundation
diff --git a/res/META-INF/websocket-client-api.jar.manifest b/res/META-INF/websocket-client-api.jar.manifest
index 9f8715c918..233756ed47 100644
--- a/res/META-INF/websocket-client-api.jar.manifest
+++ b/res/META-INF/websocket-client-api.jar.manifest
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
 
 Name: jakarta/websocket/client
 Specification-Title: Jakarta WebSocket Client
-Specification-Version: @websocket.spec.version@
+Specification-Version: @websocket.spec.version@@websocket.revision@
 Specification-Vendor: Eclipse Foundation
 Implementation-Title: jakarta.websocket.client
-Implementation-Version: @websocket.spec.version@.@websocket.revision@
+Implementation-Version: @version@
 Implementation-Vendor: Apache Software Foundation
diff --git a/res/bnd/websocket-api.jar.tmp.bnd b/res/bnd/websocket-api.jar.tmp.bnd
index c449f3cf33..2e7747f701 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -37,10 +37,10 @@ Require-Capability: \
 
 -namesection: jakarta/websocket*/;\
     Specification-Title=Jakarta WebSocket;\
-    Specification-Version=${websocket.spec.version};\
+    Specification-Version=${websocket.spec.version}${websocket.revision};\
     Specification-Vendor=Eclipse Foundation;\
     Implementation-Title=jakarta.websocket.server;\
-    Implementation-Version=${websocket.spec.version}.${websocket.revision};\
+    Implementation-Version=${version};\
     Implementation-Vendor=Apache Software Foundation
 
 -jpms-module-info: \
diff --git a/res/bnd/websocket-client-api.jar.tmp.bnd b/res/bnd/websocket-client-api.jar.tmp.bnd
index e58fdccd68..500d14be57 100644
--- a/res/bnd/websocket-client-api.jar.tmp.bnd
+++ b/res/bnd/websocket-client-api.jar.tmp.bnd
@@ -31,10 +31,10 @@ Require-Capability: \
 
 -namesection: jakarta/websocket/client*/;\
     Specification-Title=Jakarta WebSocket Client;\
-    Specification-Version=${websocket.spec.version};\
+    Specification-Version=${websocket.spec.version}${websocket.revision};\
     Specification-Vendor=Eclipse Foundation;\
     Implementation-Title=jakarta.websocket;\
-    Implementation-Version=${websocket.spec.version}.${websocket.revision};\
+    Implementation-Version=${version};\
     Implementation-Vendor=Apache Software Foundation
 
 -jpms-module-info: \


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org