date:20210625

[VOTE] Release Apache Tomcat 10.0.8

2021-06-25 Thread Mark Thomas


The proposed Apache Tomcat 10.0.8 release is now available for
voting.

Apache Tomcat 10.x implements Jakarta EE 9 and, as such, the primary
package for all the specification APIs has changed from javax.* to jakarta.*

Applications that run on Tomcat 9 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.0.7 are:

- Re-work the HTTP/2 overhead protection to reduce the likelihood of
  false positives. Note that the default overheadCountFactor has changed
  from 1 to 10 and that the useful range is now 0 to ~20.

- Update to Eclipse JDT compiler 4.20.

- Fix regressions in JSP compilation in the previous release.

Along with lots of other bug fixes and improvements.

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

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

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

The tag is:
https://github.com/apache/tomcat/tree/10.0.8
64520a63e23437b4e92db42bfc70a20d1f9e79c4

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

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

svn commit: r48506 - in /dev/tomcat/tomcat-10/v10.0.8: ./ bin/ bin/embed/ src/

2021-06-25 Thread markt

Author: markt
Date: Fri Jun 25 23:23:57 2021
New Revision: 48506

Log:
Upload 10.0.8 for voting

Added:
dev/tomcat/tomcat-10/v10.0.8/
dev/tomcat/tomcat-10/v10.0.8/KEYS
dev/tomcat/tomcat-10/v10.0.8/README.html
dev/tomcat/tomcat-10/v10.0.8/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.0.8/bin/
dev/tomcat/tomcat-10/v10.0.8/bin/README.html
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-deployer.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-deployer.zip   (with 
props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-deployer.zip.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-fulldocs.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-windows-x64.zip.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-windows-x86.zip.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.exe   (with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.exe.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.exe.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.tar.gz   (with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.tar.gz.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.tar.gz.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.zip   (with props)
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.zip.asc
dev/tomcat/tomcat-10/v10.0.8/bin/apache-tomcat-10.0.8.zip.sha512
dev/tomcat/tomcat-10/v10.0.8/bin/embed/
dev/tomcat/tomcat-10/v10.0.8/bin/embed/apache-tomcat-10.0.8-embed.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.0.8/bin/embed/apache-tomcat-10.0.8-embed.tar.gz.asc

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

Added: dev/tomcat/tomcat-10/v10.0.8/KEYS
==
--- dev/tomcat/tomcat-10/v10.0.8/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.0.8/KEYS Fri Jun 25 23:23:57 2021
@@ -0,0 +1,676 @@
+This file contains the PGP 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
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW5keSBBcm1z
+dHJvbmcgPGFuZHlAdGFnaXNoLmNvbT6JAFgEEBECABgFAjtAWuUICwMJCAcCAQoC
+GQEFGwMACgkQajrT9PIsT+1plgCfXAovWnVL3MjrTfcGlFSKw7GHCSYAoJkz

[tomcat] branch 10.0.x updated: Increment version number for next development cycle

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 16ea2b0  Increment version number for next development cycle
16ea2b0 is described below

commit 16ea2b0e9dbaff1412c45ab3f36a49209df60161
Author: Mark Thomas 
AuthorDate: Sat Jun 26 00:23:08 2021 +0100

Increment version number 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 67d6e10..ffa2538 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -25,7 +25,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=0
-version.build=8
+version.build=9
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 3497712..9c4aae3 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.0.8
+maven.asf.release.deploy.version=10.0.9
 
 #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 fdaabb9..dc71ace 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

[tomcat] 01/01: Tag 10.0.8

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 64520a63e23437b4e92db42bfc70a20d1f9e79c4
Author: Mark Thomas 
AuthorDate: Sat Jun 26 00:02:10 2021 +0100

Tag 10.0.8
---
 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 67d6e10..eec83ee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -27,7 +27,7 @@ version.major=10
 version.minor=0
 version.build=8
 version.patch=0
-version.suffix=-dev
+version.suffix=
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fdaabb9..79dae5f 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

[tomcat] tag 10.0.8 created (now 64520a6)

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


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

 new 64520a6  Tag 10.0.8

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] branch main updated: Increment version for next development cycle

2021-06-25 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 5964c20  Increment version for next development cycle
5964c20 is described below

commit 5964c20a1de8eb87494abce56f695a56e4ea9b6f
Author: Mark Thomas 
AuthorDate: Fri Jun 25 23:08:48 2021 +0100

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 378d08a..411300d 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=-M2-dev
+version.suffix=-M3-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 bdfe8ec..cb740a5 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-M2
+maven.asf.release.deploy.version=10.1.0-M3
 
 #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 6ebb0df..40d8869 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-M2

2021-06-25 Thread Mark Thomas


The proposed Apache Tomcat 10.1.0-M2 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-M1 are:

- Re-work the HTTP/2 overhead protection to reduce the likelihood of
  false positives. Note that the default overheadCountFactor has changed
  from 1 to 10 and that the useful range is now 0 to ~20.

- Update to Eclipse JDT compiler 4.20.

- Fix regressions in JSP compilation in the previous release.

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-M2/

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

The tag is:
https://github.com/apache/tomcat/tree/10.1.0-M2
0e59fedb28df646930c5aff945159b64d7a52260

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

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

svn commit: r48505 - in /dev/tomcat/tomcat-10/v10.1.0-M2: ./ bin/ bin/embed/ src/

2021-06-25 Thread markt

Author: markt
Date: Fri Jun 25 22:02:34 2021
New Revision: 48505

Log:
Upload 10.1.0-M2 for voting

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: dev/tomcat/tomcat-10/v10.1.0-M2/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.0-M2/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.0-M2/KEYS Fri Jun 25 22:02:34 2021
@@ -0,0 +1,676 @@
+This file contains the PGP 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

[tomcat] branch 10.0.x updated: Update reproducible timestamp

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new b4343cf  Update reproducible timestamp
b4343cf is described below

commit b4343cf9ece1739f45c7c31d42218e5a038628cf
Author: Mark Thomas 
AuthorDate: Fri Jun 25 22:35:02 2021 +0100

Update reproducible timestamp
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 70093cb..67d6e10 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+#2021-06-26T00:00:00Z
+#ant.tstamp.now=1624665600
 
 # - 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] 01/01: Tag 10.1.0-M2

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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

commit 0e59fedb28df646930c5aff945159b64d7a52260
Author: Mark Thomas 
AuthorDate: Fri Jun 25 22:37:57 2021 +0100

Tag 10.1.0-M2
---
 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 378d08a..97bf2b0 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=-M2-dev
+version.suffix=-M2
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6ebb0df..092045f 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

[tomcat] tag 10.1.0-M2 created (now 0e59fed)

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


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

 new 0e59fed  Tag 10.1.0-M2

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] branch main updated: Update reproducible timestamp

2021-06-25 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 5b545bb  Update reproducible timestamp
5b545bb is described below

commit 5b545bb31bc355898ef4a0b8addce2b09387cdaa
Author: Mark Thomas 
AuthorDate: Fri Jun 25 22:35:02 2021 +0100

Update reproducible timestamp
---
 build.properties.default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index ef843ee..378d08a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,8 +31,8 @@ version.suffix=-M2-dev
 
 # - Reproducible builds -
 # Uncomment and set to current time for reproducible builds
-#2021-06-08T12:00:00Z
-#ant.tstamp.now=1623153600
+#2021-06-26T00:00:00Z
+#ant.tstamp.now=1624665600
 
 # - 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] branch 8.5.x updated: More refactoring of the BZ 65397 fix.

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 540a627  More refactoring of the BZ 65397 fix.
540a627 is described below

commit 540a6270023d4317eb8af2d4152b726874a01ad9
Author: Mark Thomas 
AuthorDate: Fri Jun 25 21:38:56 2021 +0100

More refactoring of the BZ 65397 fix.

Revert some of the changes made for MacOs and implement a solution that
hopefully works on Windows, Linux and MacOS.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 ++
 java/org/apache/catalina/webresources/DirResourceSet.java  | 12 +++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 2635bbf..3930a90 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = removeAbsoluteBase(absPath);
-canPath = removeCanonicalBase(canPath);
+absPath = absPath.substring(absoluteBase.length());
+canPath = canPath.substring(canonicalBase.length());
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,16 +145,6 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
-protected String removeAbsoluteBase(String absolutePath) {
-return absolutePath.substring(absoluteBase.length());
-}
-
-
-protected String removeCanonicalBase(String canonicalPath) {
-return canonicalPath.substring(canonicalBase.length());
-}
-
-
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 4f44567..6bb0b25 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,11 +166,13 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-// Base location may be inside a symlink. Only
-// need to check here if the requested path 
uses
-// symlinks so remove the base paths.
-absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
-canPath = 
removeCanonicalBase(entry.getCanonicalPath());
+// We know that 'f' must be valid since it will
+// have been checked in the call to file()
+// above. Therefore strip off the path of the
+// path that was contributed by 'f' and check
+// that what is left does not contain a 
symlink.
+absPath = 
entry.getAbsolutePath().substring(f.getAbsolutePath().length());
+canPath = 
entry.getCanonicalPath().substring(f.getCanonicalPath().length());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

-
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: More refactoring of the BZ 65397 fix.

2021-06-25 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 843ef3b  More refactoring of the BZ 65397 fix.
843ef3b is described below

commit 843ef3b28a07d0b102af8aeb7772fb895a8d927c
Author: Mark Thomas 
AuthorDate: Fri Jun 25 21:38:56 2021 +0100

More refactoring of the BZ 65397 fix.

Revert some of the changes made for MacOs and implement a solution that
hopefully works on Windows, Linux and MacOS.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 ++
 java/org/apache/catalina/webresources/DirResourceSet.java  | 12 +++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 2635bbf..3930a90 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = removeAbsoluteBase(absPath);
-canPath = removeCanonicalBase(canPath);
+absPath = absPath.substring(absoluteBase.length());
+canPath = canPath.substring(canonicalBase.length());
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,16 +145,6 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
-protected String removeAbsoluteBase(String absolutePath) {
-return absolutePath.substring(absoluteBase.length());
-}
-
-
-protected String removeCanonicalBase(String canonicalPath) {
-return canonicalPath.substring(canonicalBase.length());
-}
-
-
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 4f44567..6bb0b25 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,11 +166,13 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-// Base location may be inside a symlink. Only
-// need to check here if the requested path 
uses
-// symlinks so remove the base paths.
-absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
-canPath = 
removeCanonicalBase(entry.getCanonicalPath());
+// We know that 'f' must be valid since it will
+// have been checked in the call to file()
+// above. Therefore strip off the path of the
+// path that was contributed by 'f' and check
+// that what is left does not contain a 
symlink.
+absPath = 
entry.getAbsolutePath().substring(f.getAbsolutePath().length());
+canPath = 
entry.getCanonicalPath().substring(f.getCanonicalPath().length());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

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

[tomcat] branch 10.0.x updated: More refactoring of the BZ 65397 fix.

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 1ee2862  More refactoring of the BZ 65397 fix.
1ee2862 is described below

commit 1ee2862642eb43c1120ca8bcc92c29ca59e16589
Author: Mark Thomas 
AuthorDate: Fri Jun 25 21:38:56 2021 +0100

More refactoring of the BZ 65397 fix.

Revert some of the changes made for MacOs and implement a solution that
hopefully works on Windows, Linux and MacOS.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 ++
 java/org/apache/catalina/webresources/DirResourceSet.java  | 12 +++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 2635bbf..3930a90 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = removeAbsoluteBase(absPath);
-canPath = removeCanonicalBase(canPath);
+absPath = absPath.substring(absoluteBase.length());
+canPath = canPath.substring(canonicalBase.length());
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,16 +145,6 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
-protected String removeAbsoluteBase(String absolutePath) {
-return absolutePath.substring(absoluteBase.length());
-}
-
-
-protected String removeCanonicalBase(String canonicalPath) {
-return canonicalPath.substring(canonicalBase.length());
-}
-
-
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 4f44567..6bb0b25 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,11 +166,13 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-// Base location may be inside a symlink. Only
-// need to check here if the requested path 
uses
-// symlinks so remove the base paths.
-absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
-canPath = 
removeCanonicalBase(entry.getCanonicalPath());
+// We know that 'f' must be valid since it will
+// have been checked in the call to file()
+// above. Therefore strip off the path of the
+// path that was contributed by 'f' and check
+// that what is left does not contain a 
symlink.
+absPath = 
entry.getAbsolutePath().substring(f.getAbsolutePath().length());
+canPath = 
entry.getCanonicalPath().substring(f.getCanonicalPath().length());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

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

Re: [tomcat] branch main updated: More refactoring of the BZ 65397 fix.

2021-06-25 Thread Mark Thomas


On 25/06/2021 21:39, ma...@apache.org wrote:

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 4df19b7  More refactoring of the BZ 65397 fix.
4df19b7 is described below

commit 4df19b792eae949e74ac18b170fdce718aab5953
Author: Mark Thomas 
AuthorDate: Fri Jun 25 21:38:56 2021 +0100

 More refactoring of the BZ 65397 fix.
 
 Revert some of the changes made for MacOs and implement a solution that

 hopefully works on Windows, Linux and MacOS.


Woot. Tests pass. Back-porting now. Tags to follow shortly.

Mark



---
  .../catalina/webresources/AbstractFileResourceSet.java | 14 ++
  java/org/apache/catalina/webresources/DirResourceSet.java  | 12 +++-
  2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 2635bbf..3930a90 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
  // Remove the fileBase location from the start of the paths since that
  // was not part of the requested path and the remaining check only
  // applies to the request path
-absPath = removeAbsoluteBase(absPath);
-canPath = removeCanonicalBase(canPath);
+absPath = absPath.substring(absoluteBase.length());
+canPath = canPath.substring(canonicalBase.length());
  
  // Case sensitivity check

  // The normalized requested path should be an exact match the 
equivalent
@@ -145,16 +145,6 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
  }
  
  
-protected String removeAbsoluteBase(String absolutePath) {

-return absolutePath.substring(absoluteBase.length());
-}
-
-
-protected String removeCanonicalBase(String canonicalPath) {
-return canonicalPath.substring(canonicalBase.length());
-}
-
-
  protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
  String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
  contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 4f44567..6bb0b25 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,11 +166,13 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
  String absPath = null;
  String canPath = null;
  try {
-// Base location may be inside a symlink. Only
-// need to check here if the requested path 
uses
-// symlinks so remove the base paths.
-absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
-canPath = 
removeCanonicalBase(entry.getCanonicalPath());
+// We know that 'f' must be valid since it will
+// have been checked in the call to file()
+// above. Therefore strip off the path of the
+// path that was contributed by 'f' and check
+// that what is left does not contain a 
symlink.
+absPath = 
entry.getAbsolutePath().substring(f.getAbsolutePath().length());
+canPath = 
entry.getCanonicalPath().substring(f.getCanonicalPath().length());
  if (absPath.equals(canPath)) {
  symlink = false;
  }

-
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

[tomcat] branch main updated: More refactoring of the BZ 65397 fix.

2021-06-25 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 4df19b7  More refactoring of the BZ 65397 fix.
4df19b7 is described below

commit 4df19b792eae949e74ac18b170fdce718aab5953
Author: Mark Thomas 
AuthorDate: Fri Jun 25 21:38:56 2021 +0100

More refactoring of the BZ 65397 fix.

Revert some of the changes made for MacOs and implement a solution that
hopefully works on Windows, Linux and MacOS.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 ++
 java/org/apache/catalina/webresources/DirResourceSet.java  | 12 +++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 2635bbf..3930a90 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = removeAbsoluteBase(absPath);
-canPath = removeCanonicalBase(canPath);
+absPath = absPath.substring(absoluteBase.length());
+canPath = canPath.substring(canonicalBase.length());
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,16 +145,6 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
-protected String removeAbsoluteBase(String absolutePath) {
-return absolutePath.substring(absoluteBase.length());
-}
-
-
-protected String removeCanonicalBase(String canonicalPath) {
-return canonicalPath.substring(canonicalBase.length());
-}
-
-
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 4f44567..6bb0b25 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,11 +166,13 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-// Base location may be inside a symlink. Only
-// need to check here if the requested path 
uses
-// symlinks so remove the base paths.
-absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
-canPath = 
removeCanonicalBase(entry.getCanonicalPath());
+// We know that 'f' must be valid since it will
+// have been checked in the call to file()
+// above. Therefore strip off the path of the
+// path that was contributed by 'f' and check
+// that what is left does not contain a 
symlink.
+absPath = 
entry.getAbsolutePath().substring(f.getAbsolutePath().length());
+canPath = 
entry.getCanonicalPath().substring(f.getCanonicalPath().length());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

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

Re: Tagging 10.1.0-M2 & 10.0.8

2021-06-25 Thread Christopher Schultz


Mark, Rémy,

On 6/25/21 06:09, Rémy Maucherat wrote:

On Thu, Jun 24, 2021 at 6:34 PM Mark Thomas  wrote:


Hi all,

My current plan is:

- fix bz 65377
- check the tests pass locally
- tag

Hopefully, this will mean tagging some time tomorrow which means a
release around 30 June / 1 July.

Of course, the mere act of sending this email means a new bug report is
going to arrive that is going to take days to debug :)


Looks ok for now. If you tag, I will then tag a new 9.0.


Same here for 8.5.x.

-chris

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

Re: [tomcat] branch main updated: Further fix for BZ 65397. Account for symlink above CATALINA_BASE

2021-06-25 Thread Mark Thomas


On 25/06/2021 16:10, ma...@apache.org wrote:

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 8f3cba9  Further fix for BZ 65397. Account for symlink above 
CATALINA_BASE
8f3cba9 is described below

commit 8f3cba9bb189ada767537126efb3ebd181f3aae6
Author: Mark Thomas 
AuthorDate: Fri Jun 25 16:10:11 2021 +0100

 Further fix for BZ 65397. Account for symlink above CATALINA_BASE
 
 Detected on MacOS where the default tmp location for unit tests is

 located under a symlink.


And now this breaks on Windows...

Working on a fix...

Mark



---
  .../catalina/webresources/AbstractFileResourceSet.java | 14 --
  java/org/apache/catalina/webresources/DirResourceSet.java  |  7 +--
  2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 3930a90..2635bbf 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
  // Remove the fileBase location from the start of the paths since that
  // was not part of the requested path and the remaining check only
  // applies to the request path
-absPath = absPath.substring(absoluteBase.length());
-canPath = canPath.substring(canonicalBase.length());
+absPath = removeAbsoluteBase(absPath);
+canPath = removeCanonicalBase(canPath);
  
  // Case sensitivity check

  // The normalized requested path should be an exact match the 
equivalent
@@ -145,6 +145,16 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
  }
  
  
+protected String removeAbsoluteBase(String absolutePath) {

+return absolutePath.substring(absoluteBase.length());
+}
+
+
+protected String removeCanonicalBase(String canonicalPath) {
+return canonicalPath.substring(canonicalBase.length());
+}
+
+
  protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
  String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
  contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 354ca90..4f44567 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,8 +166,11 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
  String absPath = null;
  String canPath = null;
  try {
-absPath = entry.getAbsolutePath();
-canPath = entry.getCanonicalPath();
+// Base location may be inside a symlink. Only
+// need to check here if the requested path 
uses
+// symlinks so remove the base paths.
+absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
+canPath = 
removeCanonicalBase(entry.getCanonicalPath());
  if (absPath.equals(canPath)) {
  symlink = false;
  }

-
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

[tomcat] branch 8.5.x updated: Further fix for BZ 65397. Account for symlink above CATALINA_BASE

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new f7d6f3b  Further fix for BZ 65397. Account for symlink above 
CATALINA_BASE
f7d6f3b is described below

commit f7d6f3b30cfa301a8daed5139c86e3d08ff12c52
Author: Mark Thomas 
AuthorDate: Fri Jun 25 16:10:11 2021 +0100

Further fix for BZ 65397. Account for symlink above CATALINA_BASE

Detected on MacOS where the default tmp location for unit tests is
located under a symlink.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 --
 java/org/apache/catalina/webresources/DirResourceSet.java  |  7 +--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 3930a90..2635bbf 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = absPath.substring(absoluteBase.length());
-canPath = canPath.substring(canonicalBase.length());
+absPath = removeAbsoluteBase(absPath);
+canPath = removeCanonicalBase(canPath);
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,6 +145,16 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
+protected String removeAbsoluteBase(String absolutePath) {
+return absolutePath.substring(absoluteBase.length());
+}
+
+
+protected String removeCanonicalBase(String canonicalPath) {
+return canonicalPath.substring(canonicalBase.length());
+}
+
+
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 354ca90..4f44567 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,8 +166,11 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-absPath = entry.getAbsolutePath();
-canPath = entry.getCanonicalPath();
+// Base location may be inside a symlink. Only
+// need to check here if the requested path 
uses
+// symlinks so remove the base paths.
+absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
+canPath = 
removeCanonicalBase(entry.getCanonicalPath());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

-
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: Further fix for BZ 65397. Account for symlink above CATALINA_BASE

2021-06-25 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 40dfb29  Further fix for BZ 65397. Account for symlink above 
CATALINA_BASE
40dfb29 is described below

commit 40dfb2980a54c06b4d1374ed84ea3ab5531818a0
Author: Mark Thomas 
AuthorDate: Fri Jun 25 16:10:11 2021 +0100

Further fix for BZ 65397. Account for symlink above CATALINA_BASE

Detected on MacOS where the default tmp location for unit tests is
located under a symlink.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 --
 java/org/apache/catalina/webresources/DirResourceSet.java  |  7 +--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 3930a90..2635bbf 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = absPath.substring(absoluteBase.length());
-canPath = canPath.substring(canonicalBase.length());
+absPath = removeAbsoluteBase(absPath);
+canPath = removeCanonicalBase(canPath);
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,6 +145,16 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
+protected String removeAbsoluteBase(String absolutePath) {
+return absolutePath.substring(absoluteBase.length());
+}
+
+
+protected String removeCanonicalBase(String canonicalPath) {
+return canonicalPath.substring(canonicalBase.length());
+}
+
+
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 354ca90..4f44567 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,8 +166,11 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-absPath = entry.getAbsolutePath();
-canPath = entry.getCanonicalPath();
+// Base location may be inside a symlink. Only
+// need to check here if the requested path 
uses
+// symlinks so remove the base paths.
+absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
+canPath = 
removeCanonicalBase(entry.getCanonicalPath());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

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

[tomcat] branch 10.0.x updated: Further fix for BZ 65397. Account for symlink above CATALINA_BASE

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 197edd2  Further fix for BZ 65397. Account for symlink above 
CATALINA_BASE
197edd2 is described below

commit 197edd2f4bb50bb46ce4c35e6d49765916662ccc
Author: Mark Thomas 
AuthorDate: Fri Jun 25 16:10:11 2021 +0100

Further fix for BZ 65397. Account for symlink above CATALINA_BASE

Detected on MacOS where the default tmp location for unit tests is
located under a symlink.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 --
 java/org/apache/catalina/webresources/DirResourceSet.java  |  7 +--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 3930a90..2635bbf 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = absPath.substring(absoluteBase.length());
-canPath = canPath.substring(canonicalBase.length());
+absPath = removeAbsoluteBase(absPath);
+canPath = removeCanonicalBase(canPath);
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,6 +145,16 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
+protected String removeAbsoluteBase(String absolutePath) {
+return absolutePath.substring(absoluteBase.length());
+}
+
+
+protected String removeCanonicalBase(String canonicalPath) {
+return canonicalPath.substring(canonicalBase.length());
+}
+
+
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 354ca90..4f44567 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,8 +166,11 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-absPath = entry.getAbsolutePath();
-canPath = entry.getCanonicalPath();
+// Base location may be inside a symlink. Only
+// need to check here if the requested path 
uses
+// symlinks so remove the base paths.
+absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
+canPath = 
removeCanonicalBase(entry.getCanonicalPath());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

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

[tomcat] branch main updated: Further fix for BZ 65397. Account for symlink above CATALINA_BASE

2021-06-25 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 8f3cba9  Further fix for BZ 65397. Account for symlink above 
CATALINA_BASE
8f3cba9 is described below

commit 8f3cba9bb189ada767537126efb3ebd181f3aae6
Author: Mark Thomas 
AuthorDate: Fri Jun 25 16:10:11 2021 +0100

Further fix for BZ 65397. Account for symlink above CATALINA_BASE

Detected on MacOS where the default tmp location for unit tests is
located under a symlink.
---
 .../catalina/webresources/AbstractFileResourceSet.java | 14 --
 java/org/apache/catalina/webresources/DirResourceSet.java  |  7 +--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java 
b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
index 3930a90..2635bbf 100644
--- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
@@ -114,8 +114,8 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 // Remove the fileBase location from the start of the paths since that
 // was not part of the requested path and the remaining check only
 // applies to the request path
-absPath = absPath.substring(absoluteBase.length());
-canPath = canPath.substring(canonicalBase.length());
+absPath = removeAbsoluteBase(absPath);
+canPath = removeCanonicalBase(canPath);
 
 // Case sensitivity check
 // The normalized requested path should be an exact match the 
equivalent
@@ -145,6 +145,16 @@ public abstract class AbstractFileResourceSet extends 
AbstractResourceSet {
 }
 
 
+protected String removeAbsoluteBase(String absolutePath) {
+return absolutePath.substring(absoluteBase.length());
+}
+
+
+protected String removeCanonicalBase(String canonicalPath) {
+return canonicalPath.substring(canonicalBase.length());
+}
+
+
 protected void logIgnoredSymlink(String contextPath, String absPath, 
String canPath) {
 String msg = 
sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
 contextPath, absPath, canPath);
diff --git a/java/org/apache/catalina/webresources/DirResourceSet.java 
b/java/org/apache/catalina/webresources/DirResourceSet.java
index 354ca90..4f44567 100644
--- a/java/org/apache/catalina/webresources/DirResourceSet.java
+++ b/java/org/apache/catalina/webresources/DirResourceSet.java
@@ -166,8 +166,11 @@ public class DirResourceSet extends 
AbstractFileResourceSet {
 String absPath = null;
 String canPath = null;
 try {
-absPath = entry.getAbsolutePath();
-canPath = entry.getCanonicalPath();
+// Base location may be inside a symlink. Only
+// need to check here if the requested path 
uses
+// symlinks so remove the base paths.
+absPath = 
removeAbsoluteBase(entry.getAbsolutePath());
+canPath = 
removeCanonicalBase(entry.getCanonicalPath());
 if (absPath.equals(canPath)) {
 symlink = false;
 }

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

buildbot failure in on tomcat-8.5.x

2021-06-25 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-8.5.x while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-8.5.x/builds/53

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8.5-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] e1db5ba656e0dfec1e9ecc858b6e76499a134c9e
Blamelist: Mark Thomas ,liym@home 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot failure in on tomcat-9.0.x

2021-06-25 Thread buildbot

The Buildbot has detected a new failure on builder tomcat-9.0.x while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9.0.x/builds/54

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 0d3ce5efcea0f666968961bd2a2621be0394e38d
Blamelist: Mark Thomas ,liym@home 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

[tomcat] branch 8.5.x updated: Add a space

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new e1db5ba  Add a space
e1db5ba is described below

commit e1db5ba656e0dfec1e9ecc858b6e76499a134c9e
Author: liym@home 
AuthorDate: Thu Jun 17 21:27:01 2021 +0800

Add a space
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index 91bd415..5915407 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -24,7 +24,7 @@
   
-  
+  
   
   
   

-
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: Add a space

2021-06-25 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 0d3ce5e  Add a space
0d3ce5e is described below

commit 0d3ce5efcea0f666968961bd2a2621be0394e38d
Author: liym@home 
AuthorDate: Thu Jun 17 21:27:01 2021 +0800

Add a space
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index 91bd415..5915407 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -24,7 +24,7 @@
   
-  
+  
   
   
   

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

[tomcat] branch 10.0.x updated: Add a space

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 24d9393  Add a space
24d9393 is described below

commit 24d93931137c67f761b146c006f3aaab5e0ad827
Author: liym@home 
AuthorDate: Thu Jun 17 21:27:01 2021 +0800

Add a space
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index 478ce6e..5bd92eb 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -24,7 +24,7 @@
   
-  
+  
   
   
   

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

[tomcat] branch main updated: Add a space

2021-06-25 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 0c19bb1  Add a space
0c19bb1 is described below

commit 0c19bb12a26e9123ab662a9c6c2ad729a80bd894
Author: liym@home 
AuthorDate: Thu Jun 17 21:27:01 2021 +0800

Add a space
---
 conf/server.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/server.xml b/conf/server.xml
index 478ce6e..5bd92eb 100644
--- a/conf/server.xml
+++ b/conf/server.xml
@@ -24,7 +24,7 @@
   
-  
+  
   
   
   

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

[GitHub] [tomcat] markt-asf merged pull request #427: Add a space

2021-06-25 Thread GitBox



markt-asf merged pull request #427:
URL: https://github.com/apache/tomcat/pull/427


   


-- 
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.

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

[GitHub] [tomcat] markt-asf closed pull request #426: Add a space

2021-06-25 Thread GitBox



markt-asf closed pull request #426:
URL: https://github.com/apache/tomcat/pull/426


   


-- 
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.

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

[GitHub] [tomcat] markt-asf commented on pull request #426: Add a space

2021-06-25 Thread GitBox



markt-asf commented on pull request #426:
URL: https://github.com/apache/tomcat/pull/426#issuecomment-868460038


   Duplicates #427


-- 
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.

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

[GitHub] [tomcat] markt-asf commented on pull request #424: Add a space

2021-06-25 Thread GitBox



markt-asf commented on pull request #424:
URL: https://github.com/apache/tomcat/pull/424#issuecomment-868459926


   Duplicates #427


-- 
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.

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

[GitHub] [tomcat] markt-asf closed pull request #424: Add a space

2021-06-25 Thread GitBox



markt-asf closed pull request #424:
URL: https://github.com/apache/tomcat/pull/424


   


-- 
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.

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

[GitHub] [tomcat] markt-asf closed pull request #423: Add a space

2021-06-25 Thread GitBox



markt-asf closed pull request #423:
URL: https://github.com/apache/tomcat/pull/423


   


-- 
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.

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

[GitHub] [tomcat] markt-asf commented on pull request #423: Add a space

2021-06-25 Thread GitBox



markt-asf commented on pull request #423:
URL: https://github.com/apache/tomcat/pull/423#issuecomment-868459817


   Duplicates #427


-- 
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.

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

[GitHub] [tomcat] markt-asf commented on pull request #425: Add a space

2021-06-25 Thread GitBox



markt-asf commented on pull request #425:
URL: https://github.com/apache/tomcat/pull/425#issuecomment-868459570


   7.0.x is no longer supported.


-- 
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.

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

[GitHub] [tomcat] markt-asf closed pull request #425: Add a space

2021-06-25 Thread GitBox



markt-asf closed pull request #425:
URL: https://github.com/apache/tomcat/pull/425


   


-- 
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.

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

[Bug 65377] Migrate Jasper's use of deprecated boxed primitive constructors

2021-06-25 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=65377

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 OS||All
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Thanks for reporting this.

Fixed in:
- 10.1.x for 10.1.0-M2 onwards
- 10.0.x for 10.0.8 onwards
- 9.0.x for 9.0.49 onwards
- 8.5.x for 8.5.69 onwards

-- 
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 8.5.x updated: BZ 54377 - Update code generation to use valueOf for boxed primitives

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 7f74e96  BZ 54377 - Update code generation to use valueOf for boxed 
primitives
7f74e96 is described below

commit 7f74e963532192967aa516a088932c91869969d7
Author: Mark Thomas 
AuthorDate: Fri Jun 25 13:14:26 2021 +0100

BZ 54377 - Update code generation to use valueOf for boxed primitives

Constructors are deprecated as of Java 9 and marked for removal as of
Java 16.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 java/org/apache/jasper/compiler/JspUtil.java | 32 ++--
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JspUtil.java 
b/java/org/apache/jasper/compiler/JspUtil.java
index 1b45ae4..55ceca6 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -456,10 +456,10 @@ public class JspUtil {
 + s + ", java.lang.Boolean.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Boolean(false)";
+return "java.lang.Boolean.FALSE";
 } else {
 // Detect format error at translation time
-return "new java.lang.Boolean(" + 
Boolean.valueOf(s).toString() + ")";
+return "java.lang.Boolean.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -484,10 +484,10 @@ public class JspUtil {
 + s + ", java.lang.Byte.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Byte((byte) 0)";
+return "java.lang.Byte.valueOf((byte) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Byte((byte)" + 
Byte.valueOf(s).toString() + ")";
+return "java.lang.Byte.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -513,11 +513,11 @@ public class JspUtil {
 + s + ", java.lang.Character.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Character((char) 0)";
+return "java.lang.Character.valueOf((char) 0)";
 } else {
 char ch = s.charAt(0);
 // this trick avoids escaping issues
-return "new java.lang.Character((char) " + (int) ch + ")";
+return "java.lang.Character.valueOf((char) " + (int) ch + ")";
 }
 }
 }
@@ -542,10 +542,10 @@ public class JspUtil {
 + s + ", Double.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Double(0)";
+return "java.lang.Double.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Double(" + Double.valueOf(s).toString() 
+ ")";
+return "java.lang.Double.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -570,10 +570,10 @@ public class JspUtil {
 + s + ", java.lang.Float.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Float(0)";
+return "java.lang.Float.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Float(" + Float.valueOf(s).toString() + 
"f)";
+return "java.lang.Float.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -597,10 +597,10 @@ public class JspUtil {
 + s + ", java.lang.Integer.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Integer(0)";
+return "java.lang.Integer.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Integer(" + 
Integer.valueOf(s).toString() + ")";
+return "java.lang.Integer.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -625,10 +625,10 @@ public class JspUtil {
 + s + ", java.lang.Short.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Short((short) 0)";
+return "java.lang.Short.valueOf((short) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Short(\"" + Short.valueOf(s).toString() 
+ "\")";
+return

[tomcat] branch 9.0.x updated: BZ 54377 - Update code generation to use valueOf for boxed primitives

2021-06-25 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 bd32600  BZ 54377 - Update code generation to use valueOf for boxed 
primitives
bd32600 is described below

commit bd3260055ae89e9014e61f255c906e929f1af81b
Author: Mark Thomas 
AuthorDate: Fri Jun 25 13:14:26 2021 +0100

BZ 54377 - Update code generation to use valueOf for boxed primitives

Constructors are deprecated as of Java 9 and marked for removal as of
Java 16.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 java/org/apache/jasper/compiler/JspUtil.java | 32 ++--
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JspUtil.java 
b/java/org/apache/jasper/compiler/JspUtil.java
index 6cfb761..3a827e7 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -428,10 +428,10 @@ public class JspUtil {
 + s + ", java.lang.Boolean.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Boolean(false)";
+return "java.lang.Boolean.FALSE";
 } else {
 // Detect format error at translation time
-return "new java.lang.Boolean(" + 
Boolean.valueOf(s).toString() + ")";
+return "java.lang.Boolean.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -456,10 +456,10 @@ public class JspUtil {
 + s + ", java.lang.Byte.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Byte((byte) 0)";
+return "java.lang.Byte.valueOf((byte) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Byte((byte)" + 
Byte.valueOf(s).toString() + ")";
+return "java.lang.Byte.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -485,11 +485,11 @@ public class JspUtil {
 + s + ", java.lang.Character.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Character((char) 0)";
+return "java.lang.Character.valueOf((char) 0)";
 } else {
 char ch = s.charAt(0);
 // this trick avoids escaping issues
-return "new java.lang.Character((char) " + (int) ch + ")";
+return "java.lang.Character.valueOf((char) " + (int) ch + ")";
 }
 }
 }
@@ -514,10 +514,10 @@ public class JspUtil {
 + s + ", Double.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Double(0)";
+return "java.lang.Double.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Double(" + Double.valueOf(s).toString() 
+ ")";
+return "java.lang.Double.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -542,10 +542,10 @@ public class JspUtil {
 + s + ", java.lang.Float.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Float(0)";
+return "java.lang.Float.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Float(" + Float.valueOf(s).toString() + 
"f)";
+return "java.lang.Float.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -569,10 +569,10 @@ public class JspUtil {
 + s + ", java.lang.Integer.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Integer(0)";
+return "java.lang.Integer.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Integer(" + 
Integer.valueOf(s).toString() + ")";
+return "java.lang.Integer.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -597,10 +597,10 @@ public class JspUtil {
 + s + ", java.lang.Short.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Short((short) 0)";
+return "java.lang.Short.valueOf((short) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Short(\"" + Short.valueOf(s).toString() 
+ "\")";
+return

[tomcat] branch 10.0.x updated: BZ 54377 - Update code generation to use valueOf for boxed primitives

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 39ef35f  BZ 54377 - Update code generation to use valueOf for boxed 
primitives
39ef35f is described below

commit 39ef35fcde0f1d3e9f7607c295a403647a9a773d
Author: Mark Thomas 
AuthorDate: Fri Jun 25 13:14:26 2021 +0100

BZ 54377 - Update code generation to use valueOf for boxed primitives

Constructors are deprecated as of Java 9 and marked for removal as of
Java 16.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 java/org/apache/jasper/compiler/JspUtil.java | 32 ++--
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JspUtil.java 
b/java/org/apache/jasper/compiler/JspUtil.java
index 447dc84..211ffe4 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -427,10 +427,10 @@ public class JspUtil {
 + s + ", java.lang.Boolean.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Boolean(false)";
+return "java.lang.Boolean.FALSE";
 } else {
 // Detect format error at translation time
-return "new java.lang.Boolean(" + 
Boolean.valueOf(s).toString() + ")";
+return "java.lang.Boolean.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -455,10 +455,10 @@ public class JspUtil {
 + s + ", java.lang.Byte.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Byte((byte) 0)";
+return "java.lang.Byte.valueOf((byte) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Byte((byte)" + 
Byte.valueOf(s).toString() + ")";
+return "java.lang.Byte.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -484,11 +484,11 @@ public class JspUtil {
 + s + ", java.lang.Character.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Character((char) 0)";
+return "java.lang.Character.valueOf((char) 0)";
 } else {
 char ch = s.charAt(0);
 // this trick avoids escaping issues
-return "new java.lang.Character((char) " + (int) ch + ")";
+return "java.lang.Character.valueOf((char) " + (int) ch + ")";
 }
 }
 }
@@ -513,10 +513,10 @@ public class JspUtil {
 + s + ", Double.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Double(0)";
+return "java.lang.Double.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Double(" + Double.valueOf(s).toString() 
+ ")";
+return "java.lang.Double.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -541,10 +541,10 @@ public class JspUtil {
 + s + ", java.lang.Float.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Float(0)";
+return "java.lang.Float.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Float(" + Float.valueOf(s).toString() + 
"f)";
+return "java.lang.Float.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -568,10 +568,10 @@ public class JspUtil {
 + s + ", java.lang.Integer.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Integer(0)";
+return "java.lang.Integer.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Integer(" + 
Integer.valueOf(s).toString() + ")";
+return "java.lang.Integer.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -596,10 +596,10 @@ public class JspUtil {
 + s + ", java.lang.Short.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Short((short) 0)";
+return "java.lang.Short.valueOf((short) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Short(\"" + Short.valueOf(s).toString() 
+ "\")";
+return

[tomcat] branch main updated: BZ 54377 - Update code generation to use valueOf for boxed primitives

2021-06-25 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 6c1c699  BZ 54377 - Update code generation to use valueOf for boxed 
primitives
6c1c699 is described below

commit 6c1c6994415e008a5cf57d331ce618c24095389d
Author: Mark Thomas 
AuthorDate: Fri Jun 25 13:14:26 2021 +0100

BZ 54377 - Update code generation to use valueOf for boxed primitives

Constructors are deprecated as of Java 9 and marked for removal as of
Java 16.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 java/org/apache/jasper/compiler/JspUtil.java | 32 ++--
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JspUtil.java 
b/java/org/apache/jasper/compiler/JspUtil.java
index 447dc84..211ffe4 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -427,10 +427,10 @@ public class JspUtil {
 + s + ", java.lang.Boolean.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Boolean(false)";
+return "java.lang.Boolean.FALSE";
 } else {
 // Detect format error at translation time
-return "new java.lang.Boolean(" + 
Boolean.valueOf(s).toString() + ")";
+return "java.lang.Boolean.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -455,10 +455,10 @@ public class JspUtil {
 + s + ", java.lang.Byte.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Byte((byte) 0)";
+return "java.lang.Byte.valueOf((byte) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Byte((byte)" + 
Byte.valueOf(s).toString() + ")";
+return "java.lang.Byte.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -484,11 +484,11 @@ public class JspUtil {
 + s + ", java.lang.Character.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Character((char) 0)";
+return "java.lang.Character.valueOf((char) 0)";
 } else {
 char ch = s.charAt(0);
 // this trick avoids escaping issues
-return "new java.lang.Character((char) " + (int) ch + ")";
+return "java.lang.Character.valueOf((char) " + (int) ch + ")";
 }
 }
 }
@@ -513,10 +513,10 @@ public class JspUtil {
 + s + ", Double.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Double(0)";
+return "java.lang.Double.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Double(" + Double.valueOf(s).toString() 
+ ")";
+return "java.lang.Double.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -541,10 +541,10 @@ public class JspUtil {
 + s + ", java.lang.Float.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Float(0)";
+return "java.lang.Float.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Float(" + Float.valueOf(s).toString() + 
"f)";
+return "java.lang.Float.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -568,10 +568,10 @@ public class JspUtil {
 + s + ", java.lang.Integer.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Integer(0)";
+return "java.lang.Integer.valueOf(0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Integer(" + 
Integer.valueOf(s).toString() + ")";
+return "java.lang.Integer.valueOf(" + Generator.quote(s) + ")";
 }
 }
 }
@@ -596,10 +596,10 @@ public class JspUtil {
 + s + ", java.lang.Short.class)";
 } else {
 if (s == null || s.length() == 0) {
-return "new java.lang.Short((short) 0)";
+return "java.lang.Short.valueOf((short) 0)";
 } else {
 // Detect format error at translation time
-return "new java.lang.Short(\"" + Short.valueOf(s).toString() 
+ "\")";
+return

Re: [External] : Re: JDK 17 Early Access build 28 & JDK 18 build 3 are available

2021-06-25 Thread Rory O'Donnell


Many thanks Martin!

On 25/06/2021 12:31, Martin Grigorov wrote:

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 17-ea+28-2534
and 18-ea+3-63 on Linux x86_64 and aarch64!

Regards,
Martin

On Fri, Jun 25, 2021 at 11:24 AM Rory O'Donnell 
wrote:


Hi Mark, **

*
*

*Per the JDK 17 schedule , we are in Rampdown Phase One.*


*Please advise if you find any issues while testing the latest Early
Access builds.*


The overall feature set is frozen. No further JEPs will be targeted to
this release.

   * Features integrated in JDK 17:

   o JEP 306: Restore Always-Strict Floating-Point Semantics
 
   o JEP 356: Enhanced Pseudo-Random Number Generators
 
   o JEP 382: New macOS Rendering Pipeline
 
   o JEP 391: macOS/AArch64 Port 
   o JEP 398: Deprecate the Applet API for Removal
 
   o JEP 403: Strongly Encapsulate JDK Internals
 
   o JEP 406: Pattern Matching for switch (Preview)
 
   o JEP 407: Remove RMI Activation 
   o JEP 409: Sealed Classes 
   o JEP 410: Remove the Experimental AOT and JIT Compiler
 
   o JEP 411: Deprecate the Security Manager for Removal
 
   o JEP 412: Foreign Function & Memory API (Incubator)
 
   o JEP 414: Vector API (Second Incubator)
 
   o JEP 415: Context-Specific Deserialization Filters
 


*OpenJDK 17 Early Access build 28 is available at
**https://urldefense.com/v3/__https://jdk.java.net/17*__;Kg!!ACWV5N9M2RV99hQ!duRO1L_GoDYeelmYrSt27hnIPFrNq7-dcUpqW79z5kMsWVjtiRvFdAx6fcMC2awMsO8$
  


   * These early-access , open-source builds are provided under the
   o GNU General Public License, version 2, with the Classpath
 Exception 
   * Release Notes are available at 
https://urldefense.com/v3/__https://jdk.java.net/17/release-notes__;!!ACWV5N9M2RV99hQ!duRO1L_GoDYeelmYrSt27hnIPFrNq7-dcUpqW79z5kMsWVjtiRvFdAx6fcMCGVDuhvc$
 

   * Changes in build 28 that maybe of interest:
   o *JDK-8269028: [BACKOUT] JDK-8196415 Disable SHA-1 Signed JARs *
   o JDK-8268774: Residual logging output written to STDOUT, not
 STDERR [*Reported by Apache Ant*]
   o JDK-8264843: Javac crashes with NullPointerException when
 finding unencoded XML in  tag [*Reported by Apache Lucene*]


*OpenJDK 18 Early Access build 3 is now available at
**https://urldefense.com/v3/__https://jdk.java.net/18*__;Kg!!ACWV5N9M2RV99hQ!duRO1L_GoDYeelmYrSt27hnIPFrNq7-dcUpqW79z5kMsWVjtiRvFdAx6fcMCCcyt9F0$
  


   * These early-access , open-source builds are provided under the
   o GNU General Public License, version 2, with the Classpath
 Exception 
   * Changes in recent builds that maybe of interest:
   o JDK-8266791: Annotation property which is compiled as an array
 property but changed to a single element throws NPE [*Reported
 by Byte Buddy*]
   * Coming in a future JDK 18 build
   o Removal of Biased Locking in JDK 18  - Details
 


*Other Topics of Interest: *

   * State of Loom: 
https://urldefense.com/v3/__https://www.youtube.com/watch?v=KG24inClY2M__;!!ACWV5N9M2RV99hQ!duRO1L_GoDYeelmYrSt27hnIPFrNq7-dcUpqW79z5kMsWVjtiRvFdAx6fcMCQNiAHvk$
 

   * State of Panama: 
https://urldefense.com/v3/__https://www.youtube.com/watch?v=B8k9QGvPxC0__;!!ACWV5N9M2RV99hQ!duRO1L_GoDYeelmYrSt27hnIPFrNq7-dcUpqW79z5kMsWVjtiRvFdAx6fcMCTjm0wLk$
 

   * What's a JEP:

[tomcat] branch 8.5.x updated: Add test case for BZ 65377

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new dae82de  Add test case for BZ 65377
dae82de is described below

commit dae82de4a3b4ebab99db82fbc7191b7a9e7365de
Author: Mark Thomas 
AuthorDate: Fri Jun 25 12:45:39 2021 +0100

Add test case for BZ 65377

This test case confirms the current behaviour is the same for primitive
and their object equivalents. It will also confirm that this is
unchanged after the object equivalents are re-written not to use the
deprecated constructors.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 test/org/apache/jasper/compiler/TestJspUtil.java | 49 
 test/webapp/bug6/bug65377.jsp| 39 +++
 2 files changed, 88 insertions(+)

diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java 
b/test/org/apache/jasper/compiler/TestJspUtil.java
new file mode 100644
index 000..f7755d0
--- /dev/null
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.compiler;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspUtil extends TomcatBaseTest {
+
+@Test
+public void testBoxedPrimitiveConstructors() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:; + getPort() + 
"/test/bug6/bug65377.jsp", bc, null);
+
+String body = bc.toString();
+String[] lines = body.split("\n");
+
+for (String line : lines) {
+line = line.trim();
+if (line.startsWith("")) {
+line = line.substring(3, line.length() - 4);
+String[] parts = line.split(":");
+Assert.assertEquals(parts[0],  parts[1], parts[2]);
+}
+}
+Assert.assertEquals(bc.toString(), HttpServletResponse.SC_OK, rc);
+}
+}
diff --git a/test/webapp/bug6/bug65377.jsp 
b/test/webapp/bug6/bug65377.jsp
new file mode 100644
index 000..9cb8b73
--- /dev/null
+++ b/test/webapp/bug6/bug65377.jsp
@@ -0,0 +1,39 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 65377 test case
+  
+  boolean01::
+  boolean02::
+  boolean03::
+  byte01::
+  byte02::
+  short01::
+  short02::
+  character01::
+  character02::
+  integer01::
+  integer02::
+  long01::
+  long02::
+  float01::
+  float02::
+  double01::
+  double02::
+  
+
\ No newline at end of file

-
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: Add test case for BZ 65377

2021-06-25 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 17c7d5f  Add test case for BZ 65377
17c7d5f is described below

commit 17c7d5f3c5a186bdc2a75f4f35aca7ad95d85ea9
Author: Mark Thomas 
AuthorDate: Fri Jun 25 12:45:39 2021 +0100

Add test case for BZ 65377

This test case confirms the current behaviour is the same for primitive
and their object equivalents. It will also confirm that this is
unchanged after the object equivalents are re-written not to use the
deprecated constructors.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 test/org/apache/jasper/compiler/TestJspUtil.java | 49 
 test/webapp/bug6/bug65377.jsp| 39 +++
 2 files changed, 88 insertions(+)

diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java 
b/test/org/apache/jasper/compiler/TestJspUtil.java
new file mode 100644
index 000..f7755d0
--- /dev/null
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.compiler;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspUtil extends TomcatBaseTest {
+
+@Test
+public void testBoxedPrimitiveConstructors() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:; + getPort() + 
"/test/bug6/bug65377.jsp", bc, null);
+
+String body = bc.toString();
+String[] lines = body.split("\n");
+
+for (String line : lines) {
+line = line.trim();
+if (line.startsWith("")) {
+line = line.substring(3, line.length() - 4);
+String[] parts = line.split(":");
+Assert.assertEquals(parts[0],  parts[1], parts[2]);
+}
+}
+Assert.assertEquals(bc.toString(), HttpServletResponse.SC_OK, rc);
+}
+}
diff --git a/test/webapp/bug6/bug65377.jsp 
b/test/webapp/bug6/bug65377.jsp
new file mode 100644
index 000..9cb8b73
--- /dev/null
+++ b/test/webapp/bug6/bug65377.jsp
@@ -0,0 +1,39 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 65377 test case
+  
+  boolean01::
+  boolean02::
+  boolean03::
+  byte01::
+  byte02::
+  short01::
+  short02::
+  character01::
+  character02::
+  integer01::
+  integer02::
+  long01::
+  long02::
+  float01::
+  float02::
+  double01::
+  double02::
+  
+
\ No newline at end of file

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

[tomcat] branch 10.0.x updated: Add test case for BZ 65377

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new a7e8155  Add test case for BZ 65377
a7e8155 is described below

commit a7e8155c7113eae42b1cfd8fb8df4e05c8f33522
Author: Mark Thomas 
AuthorDate: Fri Jun 25 12:45:39 2021 +0100

Add test case for BZ 65377

This test case confirms the current behaviour is the same for primitive
and their object equivalents. It will also confirm that this is
unchanged after the object equivalents are re-written not to use the
deprecated constructors.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 test/org/apache/jasper/compiler/TestJspUtil.java | 49 
 test/webapp/bug6/bug65377.jsp| 39 +++
 2 files changed, 88 insertions(+)

diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java 
b/test/org/apache/jasper/compiler/TestJspUtil.java
new file mode 100644
index 000..f7755d0
--- /dev/null
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.compiler;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspUtil extends TomcatBaseTest {
+
+@Test
+public void testBoxedPrimitiveConstructors() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:; + getPort() + 
"/test/bug6/bug65377.jsp", bc, null);
+
+String body = bc.toString();
+String[] lines = body.split("\n");
+
+for (String line : lines) {
+line = line.trim();
+if (line.startsWith("")) {
+line = line.substring(3, line.length() - 4);
+String[] parts = line.split(":");
+Assert.assertEquals(parts[0],  parts[1], parts[2]);
+}
+}
+Assert.assertEquals(bc.toString(), HttpServletResponse.SC_OK, rc);
+}
+}
diff --git a/test/webapp/bug6/bug65377.jsp 
b/test/webapp/bug6/bug65377.jsp
new file mode 100644
index 000..9cb8b73
--- /dev/null
+++ b/test/webapp/bug6/bug65377.jsp
@@ -0,0 +1,39 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 65377 test case
+  
+  boolean01::
+  boolean02::
+  boolean03::
+  byte01::
+  byte02::
+  short01::
+  short02::
+  character01::
+  character02::
+  integer01::
+  integer02::
+  long01::
+  long02::
+  float01::
+  float02::
+  double01::
+  double02::
+  
+
\ No newline at end of file

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

[tomcat] branch main updated: Add test case for BZ 65377

2021-06-25 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 097c4d7  Add test case for BZ 65377
097c4d7 is described below

commit 097c4d7c3e1196161d3cf9f1eaf046fb5bc2e871
Author: Mark Thomas 
AuthorDate: Fri Jun 25 12:45:39 2021 +0100

Add test case for BZ 65377

This test case confirms the current behaviour is the same for primitive
and their object equivalents. It will also confirm that this is
unchanged after the object equivalents are re-written not to use the
deprecated constructors.
https://bz.apache.org/bugzilla/show_bug.cgi?id=65377
---
 test/org/apache/jasper/compiler/TestJspUtil.java | 49 
 test/webapp/bug6/bug65377.jsp| 39 +++
 2 files changed, 88 insertions(+)

diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java 
b/test/org/apache/jasper/compiler/TestJspUtil.java
new file mode 100644
index 000..f7755d0
--- /dev/null
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.compiler;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+public class TestJspUtil extends TomcatBaseTest {
+
+@Test
+public void testBoxedPrimitiveConstructors() throws Exception {
+getTomcatInstanceTestWebapp(false, true);
+
+ByteChunk bc = new ByteChunk();
+int rc = getUrl("http://localhost:; + getPort() + 
"/test/bug6/bug65377.jsp", bc, null);
+
+String body = bc.toString();
+String[] lines = body.split("\n");
+
+for (String line : lines) {
+line = line.trim();
+if (line.startsWith("")) {
+line = line.substring(3, line.length() - 4);
+String[] parts = line.split(":");
+Assert.assertEquals(parts[0],  parts[1], parts[2]);
+}
+}
+Assert.assertEquals(bc.toString(), HttpServletResponse.SC_OK, rc);
+}
+}
diff --git a/test/webapp/bug6/bug65377.jsp 
b/test/webapp/bug6/bug65377.jsp
new file mode 100644
index 000..9cb8b73
--- /dev/null
+++ b/test/webapp/bug6/bug65377.jsp
@@ -0,0 +1,39 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 65377 test case
+  
+  boolean01::
+  boolean02::
+  boolean03::
+  byte01::
+  byte02::
+  short01::
+  short02::
+  character01::
+  character02::
+  integer01::
+  integer02::
+  long01::
+  long02::
+  float01::
+  float02::
+  double01::
+  double02::
+  
+
\ No newline at end of file

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

Re: JDK 17 Early Access build 28 & JDK 18 build 3 are available

2021-06-25 Thread Martin Grigorov

Hi Rory,

Apache Tomcat's build and tests pass successfully with JDK 17-ea+28-2534
and 18-ea+3-63 on Linux x86_64 and aarch64!

Regards,
Martin

On Fri, Jun 25, 2021 at 11:24 AM Rory O'Donnell 
wrote:

>
> Hi Mark, **
>
> *
> *
>
> *Per the JDK 17 schedule , we are in Rampdown Phase One.*
>
>
> *Please advise if you find any issues while testing the latest Early
> Access builds.*
>
>
> The overall feature set is frozen. No further JEPs will be targeted to
> this release.
>
>   * Features integrated in JDK 17:
>
>   o JEP 306: Restore Always-Strict Floating-Point Semantics
> 
>   o JEP 356: Enhanced Pseudo-Random Number Generators
> 
>   o JEP 382: New macOS Rendering Pipeline
> 
>   o JEP 391: macOS/AArch64 Port 
>   o JEP 398: Deprecate the Applet API for Removal
> 
>   o JEP 403: Strongly Encapsulate JDK Internals
> 
>   o JEP 406: Pattern Matching for switch (Preview)
> 
>   o JEP 407: Remove RMI Activation 
>   o JEP 409: Sealed Classes 
>   o JEP 410: Remove the Experimental AOT and JIT Compiler
> 
>   o JEP 411: Deprecate the Security Manager for Removal
> 
>   o JEP 412: Foreign Function & Memory API (Incubator)
> 
>   o JEP 414: Vector API (Second Incubator)
> 
>   o JEP 415: Context-Specific Deserialization Filters
> 
>
>
> *OpenJDK 17 Early Access build 28 is available at
> **https://jdk.java.net/17* 
>
>   * These early-access , open-source builds are provided under the
>   o GNU General Public License, version 2, with the Classpath
> Exception 
>   * Release Notes are available at https://jdk.java.net/17/release-notes
> 
>   * Changes in build 28 that maybe of interest:
>   o *JDK-8269028: [BACKOUT] JDK-8196415 Disable SHA-1 Signed JARs *
>   o JDK-8268774: Residual logging output written to STDOUT, not
> STDERR [*Reported by Apache Ant*]
>   o JDK-8264843: Javac crashes with NullPointerException when
> finding unencoded XML in  tag [*Reported by Apache Lucene*]
>
>
> *OpenJDK 18 Early Access build 3 is now available at
> **https://jdk.java.net/18* 
>
>   * These early-access , open-source builds are provided under the
>   o GNU General Public License, version 2, with the Classpath
> Exception 
>   * Changes in recent builds that maybe of interest:
>   o JDK-8266791: Annotation property which is compiled as an array
> property but changed to a single element throws NPE [*Reported
> by Byte Buddy*]
>   * Coming in a future JDK 18 build
>   o Removal of Biased Locking in JDK 18  - Details
> 
>
> *Other Topics of Interest: *
>
>   * State of Loom: https://www.youtube.com/watch?v=KG24inClY2M
> 
>   * State of Panama: https://www.youtube.com/watch?v=B8k9QGvPxC0
> 
>   * What's a JEP: https://www.youtube.com/watch?v=l1VrmvyIEpM
> 
>
>
> *Quality Report for June 2021 was published here [1]. ***
>
>   * Thanks to everyone who contributed by creating features or
> enhancements, logging bugs, or downloading and testing the
> early-access builds.
>
> Rgds,Rory
>
> [1]
>
> https://wiki.openjdk.java.net/display/quality/Quality+Outreach+Report+June+2021*
> *
>
> --
> Rgds, Rory O'Donnell
> Quality Engineering Manager
> Oracle EMEA, Dublin, Ireland
>
>

buildbot success in on tomcat-8.5.x

2021-06-25 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-8.5.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-8.5.x/builds/52

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8.5-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] ff1369b653f222a1a0a21c549581dfb437538ec5
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

Re: Tagging 10.1.0-M2 & 10.0.8

2021-06-25 Thread Rémy Maucherat

On Thu, Jun 24, 2021 at 6:34 PM Mark Thomas  wrote:
>
> Hi all,
>
> My current plan is:
>
> - fix bz 65377
> - check the tests pass locally
> - tag
>
> Hopefully, this will mean tagging some time tomorrow which means a
> release around 30 June / 1 July.
>
> Of course, the mere act of sending this email means a new bug report is
> going to arrive that is going to take days to debug :)

Looks ok for now. If you tag, I will then tag a new 9.0.

Rémy

>
> Mark
>
> -
> 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

buildbot success in on tomcat-9.0.x

2021-06-25 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-9.0.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9.0.x/builds/53

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9.0-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] d3d3365a43b92d751e0efc0014b6ea0401548e08
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

buildbot success in on tomcat-10.0.x

2021-06-25 Thread buildbot

The Buildbot has detected a restored build on builder tomcat-10.0.x while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-10.0.x/builds/72

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-10.0-commit' 
triggered this build
Build Source Stamp: [branch 10.0.x] 5376a707a8d37993addaef6ceffe2a31d9edc32b
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

JDK 17 Early Access build 28 & JDK 18 build 3 are available

2021-06-25 Thread Rory O'Donnell



Hi Mark, **

*
*

*Per the JDK 17 schedule , we are in Rampdown Phase One.*


*Please advise if you find any issues while testing the latest Early 
Access builds.*



The overall feature set is frozen. No further JEPs will be targeted to 
this release.


 * Features integrated in JDK 17:

 o JEP 306: Restore Always-Strict Floating-Point Semantics
   
 o JEP 356: Enhanced Pseudo-Random Number Generators
   
 o JEP 382: New macOS Rendering Pipeline
   
 o JEP 391: macOS/AArch64 Port 
 o JEP 398: Deprecate the Applet API for Removal
   
 o JEP 403: Strongly Encapsulate JDK Internals
   
 o JEP 406: Pattern Matching for switch (Preview)
   
 o JEP 407: Remove RMI Activation 
 o JEP 409: Sealed Classes 
 o JEP 410: Remove the Experimental AOT and JIT Compiler
   
 o JEP 411: Deprecate the Security Manager for Removal
   
 o JEP 412: Foreign Function & Memory API (Incubator)
   
 o JEP 414: Vector API (Second Incubator)
   
 o JEP 415: Context-Specific Deserialization Filters
   


*OpenJDK 17 Early Access build 28 is available at 
**https://jdk.java.net/17* 


 * These early-access , open-source builds are provided under the
 o GNU General Public License, version 2, with the Classpath
   Exception 
 * Release Notes are available at https://jdk.java.net/17/release-notes
   
 * Changes in build 28 that maybe of interest:
 o *JDK-8269028: [BACKOUT] JDK-8196415 Disable SHA-1 Signed JARs *
 o JDK-8268774: Residual logging output written to STDOUT, not
   STDERR [*Reported by Apache Ant*]
 o JDK-8264843: Javac crashes with NullPointerException when
   finding unencoded XML in  tag [*Reported by Apache Lucene*]


*OpenJDK 18 Early Access build 3 is now available at 
**https://jdk.java.net/18* 


 * These early-access , open-source builds are provided under the
 o GNU General Public License, version 2, with the Classpath
   Exception 
 * Changes in recent builds that maybe of interest:
 o JDK-8266791: Annotation property which is compiled as an array
   property but changed to a single element throws NPE [*Reported
   by Byte Buddy*]
 * Coming in a future JDK 18 build
 o Removal of Biased Locking in JDK 18  - Details
   

*Other Topics of Interest: *

 * State of Loom: https://www.youtube.com/watch?v=KG24inClY2M
   
 * State of Panama: https://www.youtube.com/watch?v=B8k9QGvPxC0
   
 * What's a JEP: https://www.youtube.com/watch?v=l1VrmvyIEpM
   


*Quality Report for June 2021 was published here [1]. ***

 * Thanks to everyone who contributed by creating features or
   enhancements, logging bugs, or downloading and testing the
   early-access builds.

Rgds,Rory

[1] 
https://wiki.openjdk.java.net/display/quality/Quality+Outreach+Report+June+2021*

*

--
Rgds, Rory O'Donnell
Quality Engineering Manager
Oracle EMEA, Dublin, Ireland

[tomcat] branch 8.5.x updated: Revert "Remove unused file"

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new ff1369b  Revert "Remove unused file"
ff1369b is described below

commit ff1369b653f222a1a0a21c549581dfb437538ec5
Author: Mark Thomas 
AuthorDate: Fri Jun 25 08:10:13 2021 +0100

Revert "Remove unused file"

This reverts commit 0dee371b82bf2ed18a7316430db8c25bdb3644e3.
---
 test/webapp/bug6/bug64872b-timeunit.jsp | 29 +
 1 file changed, 29 insertions(+)

diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp 
b/test/webapp/bug6/bug64872b-timeunit.jsp
new file mode 100644
index 000..679925f
--- /dev/null
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -0,0 +1,29 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 64872b TimeUnit test case
+  
+  <%
+  for (int i=0; i < 10; i++) {
+  %>
+01 The value of foo is []
+  <%
+  }
+  %>
+  
+
\ No newline at end of file

-
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: Revert "Remove unused file"

2021-06-25 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 d3d3365  Revert "Remove unused file"
d3d3365 is described below

commit d3d3365a43b92d751e0efc0014b6ea0401548e08
Author: Mark Thomas 
AuthorDate: Fri Jun 25 08:10:13 2021 +0100

Revert "Remove unused file"

This reverts commit 0dee371b82bf2ed18a7316430db8c25bdb3644e3.
---
 test/webapp/bug6/bug64872b-timeunit.jsp | 29 +
 1 file changed, 29 insertions(+)

diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp 
b/test/webapp/bug6/bug64872b-timeunit.jsp
new file mode 100644
index 000..679925f
--- /dev/null
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -0,0 +1,29 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 64872b TimeUnit test case
+  
+  <%
+  for (int i=0; i < 10; i++) {
+  %>
+01 The value of foo is []
+  <%
+  }
+  %>
+  
+
\ No newline at end of file

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

[tomcat] branch 10.0.x updated: Revert "Remove unused file"

2021-06-25 Thread markt

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 5376a70  Revert "Remove unused file"
5376a70 is described below

commit 5376a707a8d37993addaef6ceffe2a31d9edc32b
Author: Mark Thomas 
AuthorDate: Fri Jun 25 08:10:13 2021 +0100

Revert "Remove unused file"

This reverts commit 0dee371b82bf2ed18a7316430db8c25bdb3644e3.
---
 test/webapp/bug6/bug64872b-timeunit.jsp | 29 +
 1 file changed, 29 insertions(+)

diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp 
b/test/webapp/bug6/bug64872b-timeunit.jsp
new file mode 100644
index 000..679925f
--- /dev/null
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -0,0 +1,29 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 64872b TimeUnit test case
+  
+  <%
+  for (int i=0; i < 10; i++) {
+  %>
+01 The value of foo is []
+  <%
+  }
+  %>
+  
+
\ No newline at end of file

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

[tomcat] branch main updated: Revert "Remove unused file"

2021-06-25 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 03e237b  Revert "Remove unused file"
03e237b is described below

commit 03e237b1a7ce58d547b36a0f09b61a826d46c9c8
Author: Mark Thomas 
AuthorDate: Fri Jun 25 08:10:13 2021 +0100

Revert "Remove unused file"

This reverts commit 0dee371b82bf2ed18a7316430db8c25bdb3644e3.
---
 test/webapp/bug6/bug64872b-timeunit.jsp | 29 +
 1 file changed, 29 insertions(+)

diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp 
b/test/webapp/bug6/bug64872b-timeunit.jsp
new file mode 100644
index 000..679925f
--- /dev/null
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -0,0 +1,29 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/tag-setters; prefix="ts" %>
+
+  Bug 64872b TimeUnit test case
+  
+  <%
+  for (int i=0; i < 10; i++) {
+  %>
+01 The value of foo is []
+  <%
+  }
+  %>
+  
+
\ No newline at end of file

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

58 matches

Mail list logo