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

2022-05-04 Thread markt 
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 
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 @@
   
   
   
-  
+  
   
   
   
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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat Native 1.2.33

2022-05-04 Thread Christopher Schultz 

Mark,

Thanks for RM'ing

On 5/3/22 16:45, Mark Thomas wrote:

Version 1.2.33 includes the following changes compared to 1.2.32

- Updated recommended minimum OpenSSL to 1.1.1o and build windows
   binaries using that version

- Fix BZ 66035, a crash when attempting to read the TSL session ID after
   a failed handshake

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.33 release is
  [X] Stable, go ahead and release
  [ ] Broken because of ...


Builds cleanly on MacOS and Debian Linux.

Some notes:

The binary built on MacOS ends up with file names libtcnative-1.0.dylib 
(and friends) instead of libtcnative-1.2.dylib or -1.2.33.dylib, etc. Is 
that expected? On Linux the binaries are called libtcnative-1.so.0.2.33 
(and friends).


When adding CFLAGS=-Wall -pedantic -ansi I get some errors from both gcc 
and clang. We should probably spend some time cleaning that stuff up. 
Lots of this is due to use of "long long" which is of course required, 
so I'll try to tighten things up a bit myself.


-chris

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

Re: [VOTE] Release Apache Tomcat Native 1.2.33

2022-05-04 Thread Mark Thomas 

On 03/05/2022 21:45, Mark Thomas wrote:

Version 1.2.33 includes the following changes compared to 1.2.32

- Updated recommended minimum OpenSSL to 1.1.1o and build windows
   binaries using that version

- Fix BZ 66035, a crash when attempting to read the TSL session ID after
   a failed handshake

The proposed release artefacts can be found at [1],
and the build was done using tag [2].

The Apache Tomcat Native 1.2.33 release is
  [X] Stable, go ahead and release
  [ ] Broken because of ...


Tested with 10.1.x on Linux (built with OpenSSL 1.1.1 HEAD) and Windows 
(tested with convenience binary) and all tests pass.


Mark

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

[tomcat] branch 9.0.x updated: Fix IDE warnings

2022-05-04 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a81bd7ec05 Fix IDE warnings
a81bd7ec05 is described below

commit a81bd7ec05a21bbefab4b2a23b41a5f3f4392246
Author: Mark Thomas 
AuthorDate: Tue May 3 21:59:45 2022 +0100

Fix IDE warnings
---
 java/org/apache/jasper/compiler/Generator.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/org/apache/jasper/compiler/Generator.java 
b/java/org/apache/jasper/compiler/Generator.java
index d12bef8941..a853cf8f4e 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1545,6 +1545,7 @@ class Generator {
 return " " + attr + "=\"" + value + '\"';
 }
 
+@SuppressWarnings("deprecation")
 @Override
 public void visit(Node.PlugIn n) throws JasperException {
 


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

[GitHub] [tomcat] p-m-q opened a new pull request, #507: 9.0.x

2022-05-04 Thread GitBox 


p-m-q opened a new pull request, #507:
URL: https://github.com/apache/tomcat/pull/507

   pull 9.0.x


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


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