[Bug 65211] Posix incompatible changes in shell scripts / Potential license violation

2021-08-03 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=65211

--- Comment #5 from Mark Thomas  ---
The internal discussion took a while.

The Apache Tomcat PMC contacted Micro Focus in late July and Micro Focus very
promptly addressed the issues raised. The PMC would like to thank Micro Focus
for their speedy and professional response.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Fix regression that broke websocket.

2021-08-03 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 0f8a19d  Fix regression that broke websocket.
0f8a19d is described below

commit 0f8a19d16d7bb327b54195df6511291b294579fd
Author: Mark Thomas 
AuthorDate: Tue Aug 3 11:18:23 2021 +0200

Fix regression that broke websocket.

Missing "!" in commit 46cb8c3b
---
 java/org/apache/tomcat/websocket/server/WsSci.java | 2 +-
 webapps/docs/changelog.xml | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsSci.java 
b/java/org/apache/tomcat/websocket/server/WsSci.java
index 9e7e063..b278086 100644
--- a/java/org/apache/tomcat/websocket/server/WsSci.java
+++ b/java/org/apache/tomcat/websocket/server/WsSci.java
@@ -64,7 +64,7 @@ public class WsSci implements ServletContainerInitializer {
 if (!Modifier.isPublic(modifiers) ||
 Modifier.isAbstract(modifiers) ||
 Modifier.isInterface(modifiers) ||
-isExported(clazz)) {
+!isExported(clazz)) {
 // Non-public, abstract, interface or not in an exported
 // package - skip it.
 continue;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d435739..d462487 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Correct a regression in the Java 8 to Java 11 changes made in 10.1.0-M3
+that caused all WebSocket end points to fail to register. (markt)
+  
+
+  
 
 
   

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



[VOTE][CANCELLED] Release Apache Tomcat 10.1.0-M3

2021-08-03 Thread Mark Thomas
I'm cancelling the vote due to a regression. The Java 8 -> Java 11 
changes broke WebSocket due to a missing "!".


I'll tag M4 shortly.

Mark


On 29/07/2021 16:37, Mark Thomas wrote:

The proposed Apache Tomcat 10.1.0-M3 release is now available for
voting.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


The notable changes compared to 10.1.0-M2 are:

- The minimum Java version has been increased to Java 11 to align with
   the plans for the Jakarta EE 10 platform

- Correct a regression in the previous release in the HTTP/2 flow
   control window management

- Enable EL lambda expressions to be coerced to functional interfaces.
   This is an implementation of a proposed extension to the Jakarta
   Expression Language specification.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M3/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1323

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M3
8778a44d6323c1066237043a89ab2f36696916b1

The proposed 10.1.0-M3 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 10.1.0-M3 (alpha)

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



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



Re: [VOTE] Release Apache Tomcat 10.0.10

2021-08-03 Thread Mark Thomas

On 30/07/2021 12:18, Mark Thomas wrote:


The proposed 10.0.10 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 10.0.10 (stable)


Tests pass for NIO, NIO2 and APR/Native with Tomcat Native 1.2.30 on 
Windows, MacOS and Linux.


Mark

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



[tomcat] branch main updated: 10.1.0-M3 release was cancelled

2021-08-03 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 956f226  10.1.0-M3 release was cancelled
956f226 is described below

commit 956f2263b68017f0abe6e11458f5ece5dd75
Author: Mark Thomas 
AuthorDate: Tue Aug 3 12:26:43 2021 +0200

10.1.0-M3 release was cancelled
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d462487..ad5f59d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -114,7 +114,7 @@
 
   
 
-
+
   
 
   

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



[tomcat] branch main updated: Update timestamp ready for tag

2021-08-03 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 0082431  Update timestamp ready for tag
0082431 is described below

commit 00824315e5add00118f8d625aafccdfb38aa416d
Author: Mark Thomas 
AuthorDate: Tue Aug 3 20:36:37 2021 +0200

Update timestamp ready for tag

Not currently used. Just getting into the habit of updating it when I
tag a release.
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 14c75d6..76e89d8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-M4-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-07-29T12:00:00Z
-#ant.tstamp.now=162756
+#2021-08-03T18:00:00Z
+#ant.tstamp.now=1628013600
 
 # - Source control flags -
 git.branch=main

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



[tomcat] tag 10.1.0-M4 created (now e706972)

2021-08-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to tag 10.1.0-M4
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at e706972  (commit)
This tag includes the following new commits:

 new e706972  Tag 10.1.0-M4

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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



[tomcat] 01/01: Tag 10.1.0-M4

2021-08-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to tag 10.1.0-M4
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e706972942e2c342e4a37baf5e2596f11e8a0e94
Author: Mark Thomas 
AuthorDate: Tue Aug 3 19:38:40 2021 +0100

Tag 10.1.0-M4
---
 build.properties.default   | 2 +-
 webapps/docs/changelog.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 76e89d8..60350c9 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M4-dev
+version.suffix=-M4
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ad5f59d..3d92c56 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,7 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
   
 
   

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



svn commit: r49177 - /dev/tomcat/tomcat-10/v10.1.0-M3/

2021-08-03 Thread markt
Author: markt
Date: Tue Aug  3 19:10:31 2021
New Revision: 49177

Log:
Drop unreleased 10.1.0-M3

Removed:
dev/tomcat/tomcat-10/v10.1.0-M3/


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



svn commit: r49178 - in /dev/tomcat/tomcat-10/v10.1.0-M4: ./ bin/ bin/embed/ src/

2021-08-03 Thread markt
Author: markt
Date: Tue Aug  3 19:17:13 2021
New Revision: 49178

Log:
Upload 10.1.0-M4 for voting

Added:
dev/tomcat/tomcat-10/v10.1.0-M4/
dev/tomcat/tomcat-10/v10.1.0-M4/KEYS
dev/tomcat/tomcat-10/v10.1.0-M4/README.html
dev/tomcat/tomcat-10/v10.1.0-M4/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.0-M4/bin/
dev/tomcat/tomcat-10/v10.1.0-M4/bin/README.html
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-deployer.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-deployer.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-deployer.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-deployer.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-fulldocs.tar.gz 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-fulldocs.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-windows-x64.zip 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-windows-x64.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-windows-x86.zip 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-windows-x86.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.exe   (with 
props)
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.exe.asc
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.exe.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.zip   (with 
props)
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.zip.asc
dev/tomcat/tomcat-10/v10.1.0-M4/bin/apache-tomcat-10.1.0-M4.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/

dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/apache-tomcat-10.1.0-M4-embed.tar.gz  
 (with props)

dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/apache-tomcat-10.1.0-M4-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/apache-tomcat-10.1.0-M4-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/apache-tomcat-10.1.0-M4-embed.zip 
  (with props)

dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/apache-tomcat-10.1.0-M4-embed.zip.asc

dev/tomcat/tomcat-10/v10.1.0-M4/bin/embed/apache-tomcat-10.1.0-M4-embed.zip.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/src/
dev/tomcat/tomcat-10/v10.1.0-M4/src/apache-tomcat-10.1.0-M4-src.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.0-M4/src/apache-tomcat-10.1.0-M4-src.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.0-M4/src/apache-tomcat-10.1.0-M4-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.0-M4/src/apache-tomcat-10.1.0-M4-src.zip   (with 
props)
dev/tomcat/tomcat-10/v10.1.0-M4/src/apache-tomcat-10.1.0-M4-src.zip.asc
dev/tomcat/tomcat-10/v10.1.0-M4/src/apache-tomcat-10.1.0-M4-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.1.0-M4/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.0-M4/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.0-M4/KEYS Tue Aug  3 19:17:13 2021
@@ -0,0 +1,676 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ

[tomcat] branch main updated: Increment version for next development cycle

2021-08-03 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 e0f5aed  Increment version for next development cycle
e0f5aed is described below

commit e0f5aed9075b01392012b8f8e5b0f78bad06513e
Author: Mark Thomas 
AuthorDate: Tue Aug 3 21:18:29 2021 +0200

Increment version for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 76e89d8..77fc389 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=1
 version.build=0
 version.patch=0
-version.suffix=-M4-dev
+version.suffix=-M5-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 340b1b7..a0b6f99 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.1.0-M4
+maven.asf.release.deploy.version=10.1.0-M5
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ad5f59d..991b883 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   

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



[VOTE] Release Apache Tomcat 10.1.0-M4

2021-08-03 Thread Mark Thomas

The proposed Apache Tomcat 10.1.0-M4 release is now available for
voting.

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


The notable changes compared to 10.1.0-M2 are:

- The minimum Java version has been increased to Java 11 to align with
  the plans for the Jakarta EE 10 platform

- Correct a regression in the previous release in the HTTP/2 flow
  control window management

- Enable EL lambda expressions to be coerced to functional interfaces.
  This is an implementation of a proposed extension to the Jakarta
  Expression Language specification.

For full details, see the changelog:
https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M4/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1328

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M4
e706972942e2c342e4a37baf5e2596f11e8a0e94

The proposed 10.1.0-M4 release is:
[ ] Broken - do not release
[ ] Alpha - go ahead and release as 10.1.0-M4 (alpha)

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



Re: [VOTE] Release Apache Tomcat 10.1.0-M4

2021-08-03 Thread Rémy Maucherat
On Tue, Aug 3, 2021 at 9:21 PM Mark Thomas  wrote:
>
> The proposed Apache Tomcat 10.1.0-M4 release is now available for
> voting.
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory.
>
> The notable changes compared to 10.1.0-M2 are:
>
> - The minimum Java version has been increased to Java 11 to align with
>the plans for the Jakarta EE 10 platform
>
> - Correct a regression in the previous release in the HTTP/2 flow
>control window management
>
> - Enable EL lambda expressions to be coerced to functional interfaces.
>This is an implementation of a proposed extension to the Jakarta
>Expression Language specification.
>
> For full details, see the changelog:
> https://ci.apache.org/projects/tomcat/tomcat-10.1.x/docs/changelog.html
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.0-M4/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1328
>
> The tag is:
> https://github.com/apache/tomcat/tree/10.1.0-M4
> e706972942e2c342e4a37baf5e2596f11e8a0e94
>
> The proposed 10.1.0-M4 release is:
> [ ] Broken - do not release
> [X] Alpha - go ahead and release as 10.1.0-M4 (alpha)

Rémy

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