Re: [VOTE] Release Apache Tomcat 11.0.0-M5
> On Apr 13, 2023, at 07:20, Mark Thomas wrote: > > The proposed Apache Tomcat 11.0.0-M5 release is now available for > voting. > > Apache Tomcat 11.0.0-M5 is a milestone release of the 11.0.x branch and has > been made to provide users with early access to the new features in Apache > Tomcat 11.0.x so that they may provide feedback. The notable changes compared > to the previous milestone include: > > - Reduce the default value of maxParameterCount from 10,000 to 1,000. > > - Correct a regression in the fix for bug 66442 that meant that streams > without a response body did not decrement the active stream count > when completing leading to ERR_HTTP2_SERVER_REFUSED_STREAM for some > connections. > > - Expand the validation of the value of the Sec-Websocket-Key header in > the HTTP upgrade request that initiates a WebSocket connection. The > value is not decoded but it is checked for the correct length and that > only valid characters from the base64 alphabet are used. > > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 > 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. Applications using deprecated APIs may require further changes. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M5/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1427 > > The tag is: > https://github.com/apache/tomcat/tree/11.0.0-M5 > 06977fbea3c82c3d29e544203983dd3b49a632f1 > > > The proposed 11.0.0-M5 release is: > [ ] Broken - do not release > [ X] Alpha - go ahead and release as 11.0.0-M5 Tests pass with tc-native2.0.2 and OpenSSL3.0.7 on macOS 12.3.1 Han > > - > 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
[VOTE] Release Apache Tomcat 11.0.0-M5
The proposed Apache Tomcat 11.0.0-M5 release is now available for voting. Apache Tomcat 11.0.0-M5 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Reduce the default value of maxParameterCount from 10,000 to 1,000. - Correct a regression in the fix for bug 66442 that meant that streams without a response body did not decrement the active stream count when completing leading to ERR_HTTP2_SERVER_REFUSED_STREAM for some connections. - Expand the validation of the value of the Sec-Websocket-Key header in the HTTP upgrade request that initiates a WebSocket connection. The value is not decoded but it is checked for the correct length and that only valid characters from the base64 alphabet are used. For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 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. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M5/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1427 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M5 06977fbea3c82c3d29e544203983dd3b49a632f1 The proposed 11.0.0-M5 release is: [ ] Broken - do not release [ ] Alpha - go ahead and release as 11.0.0-M5 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r61207 - in /dev/tomcat/tomcat-11/v11.0.0-M5: ./ bin/ bin/embed/ src/
Author: markt Date: Wed Apr 12 23:16:10 2023 New Revision: 61207 Log: Upload 11.0.0-M5 for voting Added: dev/tomcat/tomcat-11/v11.0.0-M5/ dev/tomcat/tomcat-11/v11.0.0-M5/KEYS dev/tomcat/tomcat-11/v11.0.0-M5/README.html dev/tomcat/tomcat-11/v11.0.0-M5/RELEASE-NOTES dev/tomcat/tomcat-11/v11.0.0-M5/bin/ dev/tomcat/tomcat-11/v11.0.0-M5/bin/README.html dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-deployer.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-deployer.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-deployer.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-deployer.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-deployer.zip.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-deployer.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-fulldocs.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-fulldocs.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-windows-x64.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-windows-x64.zip.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-windows-x64.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-windows-x86.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-windows-x86.zip.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5-windows-x86.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.exe (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.exe.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.exe.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.zip.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/apache-tomcat-11.0.0-M5.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/ dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/apache-tomcat-11.0.0-M5-embed.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/apache-tomcat-11.0.0-M5-embed.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/apache-tomcat-11.0.0-M5-embed.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/apache-tomcat-11.0.0-M5-embed.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/apache-tomcat-11.0.0-M5-embed.zip.asc dev/tomcat/tomcat-11/v11.0.0-M5/bin/embed/apache-tomcat-11.0.0-M5-embed.zip.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/src/ dev/tomcat/tomcat-11/v11.0.0-M5/src/apache-tomcat-11.0.0-M5-src.tar.gz (with props) dev/tomcat/tomcat-11/v11.0.0-M5/src/apache-tomcat-11.0.0-M5-src.tar.gz.asc dev/tomcat/tomcat-11/v11.0.0-M5/src/apache-tomcat-11.0.0-M5-src.tar.gz.sha512 dev/tomcat/tomcat-11/v11.0.0-M5/src/apache-tomcat-11.0.0-M5-src.zip (with props) dev/tomcat/tomcat-11/v11.0.0-M5/src/apache-tomcat-11.0.0-M5-src.zip.asc dev/tomcat/tomcat-11/v11.0.0-M5/src/apache-tomcat-11.0.0-M5-src.zip.sha512 Added: dev/tomcat/tomcat-11/v11.0.0-M5/KEYS == --- dev/tomcat/tomcat-11/v11.0.0-M5/KEYS (added) +++ dev/tomcat/tomcat-11/v11.0.0-M5/KEYS Wed Apr 12 23:16:10 2023 @@ -0,0 +1,453 @@ +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). + + +pub 4096R/2F6059E7 2009-09-18 + Key fingerprint = A9C5 DF4D 22E9 9998 D987 5A51 10C0 1C5A 2F60 59E7 +uid Mark E D Thomas +sub 4096R/5E763BEC 2009-09-18 + +-BEGIN PGP PUBLIC KEY BLOCK- +Comment: GPGTools - http://gpgtools.org + +mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX +pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t +6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K +GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz +4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M +UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
[tomcat] 01/01: Tag 11.0.0-M5
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to tag 11.0.0-M5 in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 06977fbea3c82c3d29e544203983dd3b49a632f1 Author: Mark Thomas AuthorDate: Wed Apr 12 23:54:47 2023 +0100 Tag 11.0.0-M5 --- build.properties.release | 52 +++ res/install-win/Uninstall.exe.sig| Bin 0 -> 10247 bytes res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10247 bytes res/maven/mvn.properties.release | 27 webapps/docs/changelog.xml | 2 +- 5 files changed, 80 insertions(+), 1 deletion(-) diff --git a/build.properties.release b/build.properties.release new file mode 100644 index 00..858950fffe --- /dev/null +++ b/build.properties.release @@ -0,0 +1,52 @@ +# - +# 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. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Any unwanted settings may be over-ridden in a build.properties file located +# in the same directory as this file. + +# Set the version-dev to "" (empty string) as this is not a development release. +version.dev= + +# Ensure consistent timestamps for reproducible builds. +ant.tstamp.now.iso=2023-04-12T22:42:09Z + +# Enable insertion of detached signatures into the Windows installer. +do.codesigning=true + +# Re-use the same GPG executable. +gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe + +# Reproducible builds require the use of the build tools defined below. The +# vendors (where appropriate) and versions must match exactly for a reproducible +# build since this data is embedded in various files, particularly JAR file +# manifests, as part of the build process. +# +# Apache Ant: Apache Ant(TM) version 1.10.12 compiled on October 13 2021 +# +# Java Name: OpenJDK 64-Bit Server VM +# Java Vendor: Eclipse Adoptium +# Java Version:17.0.6+10 + +# The following is provided for information only. Builds will be repeatable +# whether or not the build environment in consistent with this information. +# +# OS: amd64 Windows Server 2022 10.0 +# File encoding: Cp1252 +# +# Release Manager: markt diff --git a/res/install-win/Uninstall.exe.sig b/res/install-win/Uninstall.exe.sig new file mode 100644 index 00..c6cbe0bfe6 Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ diff --git a/res/install-win/tomcat-installer.exe.sig b/res/install-win/tomcat-installer.exe.sig new file mode 100644 index 00..fdfb476ba4 Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release new file mode 100644 index 00..6d8effa0f0 --- /dev/null +++ b/res/maven/mvn.properties.release @@ -0,0 +1,27 @@ +# - +# 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. +# - + +# This file was auto-generated by the pre-release Ant target. + +# Remove "-dev" from the version since this is not a development release. +maven.asf.release.deploy.version=11.0.0-M5 + +# Re-use the same GPG executable. +gpg.exec=C:/Program Files (x86)/GnuPG/bin/gpg.exe + +# Set
[tomcat] tag 11.0.0-M5 created (now 06977fbea3)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 11.0.0-M5 in repository https://gitbox.apache.org/repos/asf/tomcat.git at 06977fbea3 (commit) This tag includes the following new commits: new 06977fbea3 Tag 11.0.0-M5 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 8.5.x updated: tab -> spaces
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 1586c71cc5 tab -> spaces
1586c71cc5 is described below
commit 1586c71cc5a72646c3e299fce3ad5ed8f6228af3
Author: Mark Thomas
AuthorDate: Wed Apr 12 23:35:29 2023 +0100
tab -> spaces
---
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 70b9cedcf4..890f4f9d8a 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -546,7 +546,7 @@ public class WsSession implements Session {
public boolean isClosed() {
- return state == State.CLOSED;
+return state == State.CLOSED;
}
-
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: tab -> spaces
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 cae44f6fca tab -> spaces
cae44f6fca is described below
commit cae44f6fca462eba871687fb5acac6c1e1281b49
Author: Mark Thomas
AuthorDate: Wed Apr 12 23:35:12 2023 +0100
tab -> spaces
---
java/org/apache/tomcat/websocket/WsSession.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 70b9cedcf4..890f4f9d8a 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -546,7 +546,7 @@ public class WsSession implements Session {
public boolean isClosed() {
- return state == State.CLOSED;
+return state == State.CLOSED;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Update Jacoco to 0.8.9
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
commit c107d6585c61bb8157660b7e92adc97c85f7670f
Author: Mark Thomas
AuthorDate: Wed Apr 12 17:06:49 2023 +0100
Update Jacoco to 0.8.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9fc9f09185..3f3134c001 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -289,10 +289,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.8
+jacoco.version=0.8.9
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 52bcd49475..36bed45866 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -263,6 +263,9 @@
Update Checkstyle to 10.9.3. (markt)
+
+Update Jacoco to 0.8.9. (markt)
+
-
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 (3fd5f5a106 -> c107d6585c)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 3fd5f5a106 Further BZ 66508 fix new c0304e02ec Update UnboundID to 6.0.8 new e337225917 Update Checkstyle to 10.9.3 new c107d6585c Update Jacoco to 0.8.9 The 3 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. Summary of changes: build.properties.default | 12 ++-- webapps/docs/changelog.xml | 9 + 2 files changed, 15 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Update Checkstyle to 10.9.3
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
commit e337225917bf225d543abd132abebb557967cfaf
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:55:53 2023 +0100
Update Checkstyle to 10.9.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ef56657630..9fc9f09185 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.7.0
+checkstyle.version=10.9.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
+checkstyle.checksum.value=57443ea697a02630cea080e78296545586ce2fa40c72d4d5e3d24c511287fc5d460e274ef49a6c0fc386682df248c4306a232b5f13d844c2ef4d1613d5b37e92
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cd824544e0..52bcd49475 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -258,7 +258,10 @@
start-up scripts and the service install script. (markt)
-Update Unboundid to 6.0.8. (markt)
+Update UnboundID to 6.0.8. (markt)
+
+
+Update Checkstyle to 10.9.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Update UnboundID to 6.0.8
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
commit c0304e02ecf313565b3d430084c1039acc194715
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:47:23 2023 +0100
Update UnboundID to 6.0.8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index dc211031cf..ef56657630 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.7
+unboundid.version=6.0.8
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=c0adafab9e493150b9729f51fb0dee6a787821ab93a760794962fadcdbbbf9f868e5c159f3a344c43f0b7b037b9b01b35f86e4bc97e903a40e25c884cdedaf5b
+unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 29701dd3be..cd824544e0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -257,6 +257,9 @@
handling of JRE_HOME and JAVA_HOME for the
start-up scripts and the service install script. (markt)
+
+Update Unboundid to 6.0.8. (markt)
+
-
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 (efbddee98c -> d819cda0d2)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from efbddee98c Further BZ 66508 fix new 883cd7f106 Update UnboundID to 6.0.8 new 2c0e863e0a Update Checkstyle to 10.9.3 new d819cda0d2 Update Jacoco to 0.8.9 The 3 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. Summary of changes: build.properties.default | 12 ++-- webapps/docs/changelog.xml | 9 + 2 files changed, 15 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/03: Update Checkstyle to 10.9.3
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
commit 2c0e863e0ad6fb37999534a791ccdb03828f7646
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:55:53 2023 +0100
Update Checkstyle to 10.9.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 622d0730e8..c2a96ab0a2 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.7.0
+checkstyle.version=10.9.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
+checkstyle.checksum.value=57443ea697a02630cea080e78296545586ce2fa40c72d4d5e3d24c511287fc5d460e274ef49a6c0fc386682df248c4306a232b5f13d844c2ef4d1613d5b37e92
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d2fcb52aa2..7fa651b1a3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -273,7 +273,10 @@
start-up scripts and the service install script. (markt)
-Update Unboundid to 6.0.8. (markt)
+Update UnboundID to 6.0.8. (markt)
+
+
+Update Checkstyle to 10.9.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Update Jacoco to 0.8.9
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
commit d819cda0d2eb1dd90083dfae1852284e5f736eb0
Author: Mark Thomas
AuthorDate: Wed Apr 12 17:06:49 2023 +0100
Update Jacoco to 0.8.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c2a96ab0a2..56a54cc5be 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -285,10 +285,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.8
+jacoco.version=0.8.9
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7fa651b1a3..50dea491a6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -278,6 +278,9 @@
Update Checkstyle to 10.9.3. (markt)
+
+Update Jacoco to 0.8.9. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Update UnboundID to 6.0.8
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
commit 883cd7f106620849e192294e42666ce3bbee3abe
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:47:23 2023 +0100
Update UnboundID to 6.0.8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index e1b29469d3..622d0730e8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -267,10 +267,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.7
+unboundid.version=6.0.8
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=c0adafab9e493150b9729f51fb0dee6a787821ab93a760794962fadcdbbbf9f868e5c159f3a344c43f0b7b037b9b01b35f86e4bc97e903a40e25c884cdedaf5b
+unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6e6e1996c2..d2fcb52aa2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -272,6 +272,9 @@
handling of JRE_HOME and JAVA_HOME for the
start-up scripts and the service install script. (markt)
+
+Update Unboundid to 6.0.8. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/05: Update UnboundID to 6.0.8
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 83b19cc3f275bd16df2ba5d3e2c66a90f652692e
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:47:23 2023 +0100
Update UnboundID to 6.0.8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9330e57703..57fee5c9de 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -262,10 +262,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.7
+unboundid.version=6.0.8
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=c0adafab9e493150b9729f51fb0dee6a787821ab93a760794962fadcdbbbf9f868e5c159f3a344c43f0b7b037b9b01b35f86e4bc97e903a40e25c884cdedaf5b
+unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d68c3571ce..5f4ad21cca 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -290,6 +290,9 @@
Update to the Eclipse JDT compiler 4.27. (markt)
+
+Update Unboundid to 6.0.8. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 05/05: Update Jacoco to 0.8.9
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 74ab3f22dc6f57f6b3804552684badcd0e642c84
Author: Mark Thomas
AuthorDate: Wed Apr 12 17:06:49 2023 +0100
Update Jacoco to 0.8.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f96ac64b27..d2d8a45b67 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.8
+jacoco.version=0.8.9
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7859f608eb..7e1b56c5a4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -296,6 +296,9 @@
Update Checkstyle to 10.9.3. (markt)
+
+Update Jacoco to 0.8.9. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/05: Update Eclipse ECJ to 4.27 (3.33.0)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c9b38c688c0b191cf9a141ac1344125ad0b74ab8
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:41:59 2023 +0100
Update Eclipse ECJ to 4.27 (3.33.0)
---
build.properties.default | 12 ++--
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 99c87c9501..9330e57703 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -141,15 +141,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.26" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/checksum/eclipse-4.26-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.27" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/checksum/eclipse-4.27-SUMSSHA512
#
-jdt.version=4.26
-jdt.release=R-4.26-202211231800
+jdt.version=4.27
+jdt.release=R-4.27-202303020300
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=62b19c6701547cb30922fd336a0d40fb0610279a732a93673910954028b79d69e0e3175494d20d3dae9bf4b844677c6bc5d29f337f45b6988bcfaf93b3787602
+jdt.checksum.value=69b57e12aa7f1339fe86fdb82f8fe9a104ff4d5e887448a779059e4f0626c43af0f1539569d9669c3f3add54fce6447e0bdcec93ee52ad25bf9697f7ac59ca7f
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index c66cae5bc4..72a85db2a7 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
org.eclipse.jdt
ecj
- 3.32.0
+ 3.33.0
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 5212e72242..264cb80777 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.32.0
+ 3.33.0
org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2f51ecdf73..d68c3571ce 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -287,6 +287,9 @@
handling of JRE_HOME and JAVA_HOME for the
start-up scripts and the service install script. (markt)
+
+Update to the Eclipse JDT compiler 4.27. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated (a29573a2b4 -> 74ab3f22dc)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from a29573a2b4 Improve unreliable test (failures on Windows and Intel Mac) new 55a9821a5f tabs -> spaces new c9b38c688c Update Eclipse ECJ to 4.27 (3.33.0) new 83b19cc3f2 Update UnboundID to 6.0.8 new 3911080246 Update Checkstyle to 10.9.3 new 74ab3f22dc Update Jacoco to 0.8.9 The 5 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. Summary of changes: build.properties.default | 24 +++--- java/org/apache/tomcat/websocket/WsSession.java| 2 +- res/maven/tomcat-embed-jasper.pom | 2 +- res/maven/tomcat-jasper.pom| 2 +- .../tomcat/websocket/server/TestKeyHeader.java | 2 +- webapps/docs/changelog.xml | 12 +++ 6 files changed, 28 insertions(+), 16 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/05: Update Checkstyle to 10.9.3
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3911080246d03220fe86156c6ce8ecc69b884c21
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:55:53 2023 +0100
Update Checkstyle to 10.9.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 57fee5c9de..f96ac64b27 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.7.0
+checkstyle.version=10.9.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
+checkstyle.checksum.value=57443ea697a02630cea080e78296545586ce2fa40c72d4d5e3d24c511287fc5d460e274ef49a6c0fc386682df248c4306a232b5f13d844c2ef4d1613d5b37e92
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5f4ad21cca..7859f608eb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -291,7 +291,10 @@
Update to the Eclipse JDT compiler 4.27. (markt)
-Update Unboundid to 6.0.8. (markt)
+Update UnboundID to 6.0.8. (markt)
+
+
+Update Checkstyle to 10.9.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/05: tabs -> spaces
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 55a9821a5fb1681cc9dba5820d2ed2526e7ab77d
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:26:02 2023 +0100
tabs -> spaces
---
java/org/apache/tomcat/websocket/WsSession.java| 2 +-
test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 45703457f5..a3310eec0d 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -463,7 +463,7 @@ public class WsSession implements Session {
public boolean isClosed() {
- return state == State.CLOSED;
+return state == State.CLOSED;
}
diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 19f226351e..e731344e11 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -84,7 +84,7 @@ public class TestKeyHeader extends WebSocketBaseTest {
// Read (and ignore) the response
byte[] buf = new byte[256];
while (client.read(buf) > 0) {
- // Ignore
+// Ignore
}
}
client.closeSocket();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add support for the length attribute to ArrayELResolver
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 4e18c3ba15 Add support for the length attribute to ArrayELResolver
4e18c3ba15 is described below
commit 4e18c3ba15900ba1336185811b3159bf7760afef
Author: Mark Thomas
AuthorDate: Wed Apr 12 22:25:19 2023 +0100
Add support for the length attribute to ArrayELResolver
---
java/jakarta/el/ArrayELResolver.java| 5 +++
test/org/apache/el/TestValueExpressionImpl.java | 56 +
test/org/apache/el/TesterBeanA.java | 9
webapps/docs/changelog.xml | 5 +++
4 files changed, 75 insertions(+)
diff --git a/java/jakarta/el/ArrayELResolver.java
b/java/jakarta/el/ArrayELResolver.java
index f256a069a6..88176320ed 100644
--- a/java/jakarta/el/ArrayELResolver.java
+++ b/java/jakarta/el/ArrayELResolver.java
@@ -24,6 +24,8 @@ import java.util.Objects;
*/
public class ArrayELResolver extends ELResolver {
+private static final String LENGTH_PROPERTY_NAME = "length";
+
private final boolean readOnly;
/**
@@ -73,6 +75,9 @@ public class ArrayELResolver extends ELResolver {
if (base != null && base.getClass().isArray()) {
context.setPropertyResolved(base, property);
+if (LENGTH_PROPERTY_NAME.equals(property)) {
+return Integer.valueOf(Array.getLength(base));
+}
int idx = coerce(property);
if (idx < 0 || idx >= Array.getLength(base)) {
return null;
diff --git a/test/org/apache/el/TestValueExpressionImpl.java
b/test/org/apache/el/TestValueExpressionImpl.java
index 4577bf2b5b..de56634df4 100644
--- a/test/org/apache/el/TestValueExpressionImpl.java
+++ b/test/org/apache/el/TestValueExpressionImpl.java
@@ -328,4 +328,60 @@ public class TestValueExpressionImpl extends ELBaseTest {
Assert.assertNotNull(result);
Assert.assertTrue(result.isEmpty());
}
+
+
+@Test
+public void testArrayLength01() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+TesterBeanA beanA = new TesterBeanA();
+beanA.setValArray(new String[3]);
+
+ValueExpression var = factory.createValueExpression(beanA,
TesterBeanA.class);
+context.getVariableMapper().setVariable("beanA", var);
+
+ValueExpression ve = factory.createValueExpression(context,
"${beanA.valArray.length}", Integer.class);
+
+// Check the result
+Integer result = (Integer) ve.getValue(context);
+Assert.assertEquals(Integer.valueOf(3), result);
+}
+
+
+@Test
+public void testArrayLength02() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+TesterBeanA beanA = new TesterBeanA();
+beanA.setValArray(new String[0]);
+
+ValueExpression var = factory.createValueExpression(beanA,
TesterBeanA.class);
+context.getVariableMapper().setVariable("beanA", var);
+
+ValueExpression ve = factory.createValueExpression(context,
"${beanA.valArray.length}", Integer.class);
+
+// Check the result
+Integer result = (Integer) ve.getValue(context);
+Assert.assertEquals(Integer.valueOf(0), result);
+}
+
+
+@Test
+public void testArrayLength03() {
+ExpressionFactory factory = ExpressionFactory.newInstance();
+ELContext context = new ELContextImpl();
+
+TesterBeanA beanA = new TesterBeanA();
+
+ValueExpression var = factory.createValueExpression(beanA,
TesterBeanA.class);
+context.getVariableMapper().setVariable("beanA", var);
+
+ValueExpression ve = factory.createValueExpression(context,
"${beanA.valArray.length}", Integer.class);
+
+// Check the result
+Integer result = (Integer) ve.getValue(context);
+Assert.assertNull(result);
+}
}
diff --git a/test/org/apache/el/TesterBeanA.java
b/test/org/apache/el/TesterBeanA.java
index 6e87d8887f..5557ae0ece 100644
--- a/test/org/apache/el/TesterBeanA.java
+++ b/test/org/apache/el/TesterBeanA.java
@@ -23,6 +23,7 @@ public class TesterBeanA {
private String name;
private long valLong;
private List valList;
+private Object[] valArray;
public TesterBeanB getBean() {
return bean;
@@ -56,6 +57,14 @@ public class TesterBeanA {
this.valList = valList;
}
+public Object[] getValArray() {
+return valArray;
+}
+
+public void setValArray(Object[] valArray) {
+this.valArray = valArray;
+}
+
public CharSequence echo1(CharSequence cs) {
return "A1" + cs;
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5c1bb952a3..6ebafe24c6
[tomcat] 05/06: Update Checkstyle to 10.9.3
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
commit a50054c5a59b8e007e76e21afef0c335c89a619e
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:55:53 2023 +0100
Update Checkstyle to 10.9.3
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8e808ec18e..c702c6d6ff 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.7.0
+checkstyle.version=10.9.3
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=5527f5fca9870d02f691b4d34459386d203558414bdbfb2a117af698101487b4ab6387174e600745a7d1acf0a0358d78bb219d0fba47e4b7ef9365395b0b41b6
+checkstyle.checksum.value=57443ea697a02630cea080e78296545586ce2fa40c72d4d5e3d24c511287fc5d460e274ef49a6c0fc386682df248c4306a232b5f13d844c2ef4d1613d5b37e92
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 97c17f3188..c54e72ff84 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -309,7 +309,10 @@
Update to the Eclipse JDT compiler 4.27. (markt)
-Update Unboundid to 6.0.8. (markt)
+Update UnboundID to 6.0.8. (markt)
+
+
+Update Checkstyle to 10.9.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 06/06: Update Jacoco to 0.8.9
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
commit 02fa8f5983da10a37f8f5446a814a5002bac6376
Author: Mark Thomas
AuthorDate: Wed Apr 12 17:06:49 2023 +0100
Update Jacoco to 0.8.9
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c702c6d6ff..a2c4bd84d1 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -262,10 +262,10 @@
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
# - JaCoCo code coverage tool -
-jacoco.version=0.8.8
+jacoco.version=0.8.9
jacoco.checksum.enabled=true
jacoco.checksum.algorithm=MD5|SHA-1
-jacoco.checksum.value=10a812712aa9d4bf02ad975e3e1364e4|1be58e3d5cd4f09d6b79cf9f43fc481e481e8f52
+jacoco.checksum.value=a158dfd8d88760ee615854fb27ad3a88|2f29cf6431a011f538c768e56a0b358a9f00f52d
jacoco.home=${base.path}/jacoco-${jacoco.version}
jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c54e72ff84..5c1bb952a3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -314,6 +314,9 @@
Update Checkstyle to 10.9.3. (markt)
+
+Update Jacoco to 0.8.9. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (44e7282b54 -> 02fa8f5983)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 44e7282b54 Improve unreliable test (failures on Windows and Intel Mac) new 7492d5fc14 tabs -> spaces new 7efd8484eb Update current error counts new 2d4eccdd6c Update Eclipse ECJ to 4.27 (3.33.0) new b855a4ae32 Update UnboundID to 6.0.8 new a50054c5a5 Update Checkstyle to 10.9.3 new 02fa8f5983 Update Jacoco to 0.8.9 The 6 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. Summary of changes: build.properties.default | 24 +++--- java/org/apache/tomcat/websocket/WsSession.java| 2 +- res/checkstyle/checkstyle.xml | 8 res/maven/tomcat-embed-jasper.pom | 2 +- res/maven/tomcat-jasper.pom| 2 +- .../tomcat/websocket/server/TestKeyHeader.java | 2 +- webapps/docs/changelog.xml | 12 +++ 7 files changed, 32 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/06: Update current error counts
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 commit 7efd8484eb5daf8ad0688e9bc4ef764594d0880d Author: Mark Thomas AuthorDate: Wed Apr 12 16:29:50 2023 +0100 Update current error counts --- res/checkstyle/checkstyle.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml index c8def1716a..4e8b76c358 100644 --- a/res/checkstyle/checkstyle.xml +++ b/res/checkstyle/checkstyle.xml @@ -97,17 +97,17 @@ - - -
[tomcat] 03/06: Update Eclipse ECJ to 4.27 (3.33.0)
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
commit 2d4eccdd6c628eb20958ba022048653d624804c9
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:41:59 2023 +0100
Update Eclipse ECJ to 4.27 (3.33.0)
---
build.properties.default | 12 ++--
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml| 3 +++
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 049a434f89..d2fd3d1764 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -123,15 +123,15 @@ base-maven.loc=https://repo.maven.apache.org/maven2
# - Eclipse JDT, version 4.7 or later -#
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
-# Checksum is from "SHA512 Checksums for 4.26" link at
-# https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/
-#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/checksum/eclipse-4.26-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.27" link at
+# https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/
+#
https://download.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/checksum/eclipse-4.27-SUMSSHA512
#
-jdt.version=4.26
-jdt.release=R-4.26-202211231800
+jdt.version=4.27
+jdt.release=R-4.27-202303020300
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=62b19c6701547cb30922fd336a0d40fb0610279a732a93673910954028b79d69e0e3175494d20d3dae9bf4b844677c6bc5d29f337f45b6988bcfaf93b3787602
+jdt.checksum.value=69b57e12aa7f1339fe86fdb82f8fe9a104ff4d5e887448a779059e4f0626c43af0f1539569d9669c3f3add54fce6447e0bdcec93ee52ad25bf9697f7ac59ca7f
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-embed-jasper.pom
b/res/maven/tomcat-embed-jasper.pom
index c66cae5bc4..72a85db2a7 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
org.eclipse.jdt
ecj
- 3.32.0
+ 3.33.0
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 5212e72242..264cb80777 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.32.0
+ 3.33.0
org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index be30c78a54..acab4ca19a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -305,6 +305,9 @@
handling of JRE_HOME and JAVA_HOME for the
start-up scripts and the service install script. (markt)
+
+Update to the Eclipse JDT compiler 4.27. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/06: Update UnboundID to 6.0.8
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
commit b855a4ae329387198f5fc32ebad493bde4cbdc8e
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:47:23 2023 +0100
Update UnboundID to 6.0.8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index d2fd3d1764..8e808ec18e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -244,10 +244,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.7
+unboundid.version=6.0.8
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=c0adafab9e493150b9729f51fb0dee6a787821ab93a760794962fadcdbbbf9f868e5c159f3a344c43f0b7b037b9b01b35f86e4bc97e903a40e25c884cdedaf5b
+unboundid.checksum.value=815a51737cc2508641fb5e13ceeba31ce95d5cc6d0faaeec026c7b6a20f5da7379ecae251637bdff8b0994e489919d2784601ac73abc46c6424ffb5b8364690b
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index acab4ca19a..97c17f3188 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -308,6 +308,9 @@
Update to the Eclipse JDT compiler 4.27. (markt)
+
+Update Unboundid to 6.0.8. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/06: tabs -> spaces
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
commit 7492d5fc1431ecdd6dfc8f9d797283ec7ad7b2f9
Author: Mark Thomas
AuthorDate: Wed Apr 12 16:26:02 2023 +0100
tabs -> spaces
---
java/org/apache/tomcat/websocket/WsSession.java| 2 +-
test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 45703457f5..a3310eec0d 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -463,7 +463,7 @@ public class WsSession implements Session {
public boolean isClosed() {
- return state == State.CLOSED;
+return state == State.CLOSED;
}
diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 19f226351e..e731344e11 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -84,7 +84,7 @@ public class TestKeyHeader extends WebSocketBaseTest {
// Read (and ignore) the response
byte[] buf = new byte[256];
while (client.read(buf) > 0) {
- // Ignore
+// Ignore
}
}
client.closeSocket();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Improve unreliable test (failures on Windows and Intel Mac)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a29573a2b4 Improve unreliable test (failures on Windows and Intel Mac)
a29573a2b4 is described below
commit a29573a2b4614e373623b5d85cc56f29b04e3a50
Author: Mark Thomas
AuthorDate: Wed Apr 12 14:26:16 2023 +0100
Improve unreliable test (failures on Windows and Intel Mac)
---
test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 5 +
test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4
2 files changed, 9 insertions(+)
diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 8db0bd2cc8..19f226351e 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -81,6 +81,11 @@ public class TestKeyHeader extends WebSocketBaseTest {
if (expectedStatusCode == HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
client.sendCloseFrame(CloseCodes.NORMAL_CLOSURE);
+// Read (and ignore) the response
+byte[] buf = new byte[256];
+while (client.read(buf) > 0) {
+ // Ignore
+}
}
client.closeSocket();
}
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 097a62c0bd..1fc6a6ff73 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -99,6 +99,10 @@ public class TesterWsClient {
socket.close();
}
+public int read(byte[] bytes) throws IOException {
+return socket.getInputStream().read(bytes);
+}
+
public void write(byte[] bytes) throws IOException {
socket.getOutputStream().write(bytes);
socket.getOutputStream().flush();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Improve unreliable test (failures on Windows and Intel Mac)
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 44e7282b54 Improve unreliable test (failures on Windows and Intel Mac)
44e7282b54 is described below
commit 44e7282b541f7a96c817688eabc4838975d3a8ca
Author: Mark Thomas
AuthorDate: Wed Apr 12 14:26:16 2023 +0100
Improve unreliable test (failures on Windows and Intel Mac)
---
test/org/apache/tomcat/websocket/server/TestKeyHeader.java | 5 +
test/org/apache/tomcat/websocket/server/TesterWsClient.java | 4
2 files changed, 9 insertions(+)
diff --git a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
index 8db0bd2cc8..19f226351e 100644
--- a/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
+++ b/test/org/apache/tomcat/websocket/server/TestKeyHeader.java
@@ -81,6 +81,11 @@ public class TestKeyHeader extends WebSocketBaseTest {
if (expectedStatusCode == HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
client.sendCloseFrame(CloseCodes.NORMAL_CLOSURE);
+// Read (and ignore) the response
+byte[] buf = new byte[256];
+while (client.read(buf) > 0) {
+ // Ignore
+}
}
client.closeSocket();
}
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 097a62c0bd..1fc6a6ff73 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -99,6 +99,10 @@ public class TesterWsClient {
socket.close();
}
+public int read(byte[] bytes) throws IOException {
+return socket.getInputStream().read(bytes);
+}
+
public void write(byte[] bytes) throws IOException {
socket.getOutputStream().write(bytes);
socket.getOutputStream().flush();
-
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 BZ 66508 fix
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 3fd5f5a106 Further BZ 66508 fix
3fd5f5a106 is described below
commit 3fd5f5a106d0a4f690c5e2ee66dc148a29a75ae3
Author: Mark Thomas
AuthorDate: Wed Apr 12 13:25:00 2023 +0100
Further BZ 66508 fix
Don't close connection before close message has been sent to client.
---
java/org/apache/tomcat/websocket/WsSession.java | 5 +
.../apache/tomcat/websocket/server/WsHttpUpgradeHandler.java | 11 ---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 845330a4e5..70b9cedcf4 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -545,6 +545,11 @@ public class WsSession implements Session {
}
+public boolean isClosed() {
+ return state == State.CLOSED;
+}
+
+
@Override
public long getMaxIdleTimeout() {
checkState();
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index 29bccf163a..9aeee27c30 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -186,10 +186,15 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
return SocketState.CLOSED;
}
-if (wsFrame.isOpen()) {
-return SocketState.UPGRADED;
-} else {
+
+/*
+ * If a CLOSE frame has been received then wsFrame will be closed but
need to keep the connection open until the
+ * CLOSE frame has been sent. Hence use the wsSession.isClosed()
rather than wsFrame.isOpen() here.
+ */
+if (wsSession.isClosed()) {
return SocketState.CLOSED;
+} else {
+return SocketState.UPGRADED;
}
}
-
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 BZ 66508 fix
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 efbddee98c Further BZ 66508 fix
efbddee98c is described below
commit efbddee98cc8128d5dcf108edfb57013a931d87d
Author: Mark Thomas
AuthorDate: Wed Apr 12 13:25:00 2023 +0100
Further BZ 66508 fix
Don't close connection before close message has been sent to client.
---
java/org/apache/tomcat/websocket/WsSession.java | 5 +
.../apache/tomcat/websocket/server/WsHttpUpgradeHandler.java | 11 ---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 845330a4e5..70b9cedcf4 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -545,6 +545,11 @@ public class WsSession implements Session {
}
+public boolean isClosed() {
+ return state == State.CLOSED;
+}
+
+
@Override
public long getMaxIdleTimeout() {
checkState();
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index 29bccf163a..9aeee27c30 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -186,10 +186,15 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
return SocketState.CLOSED;
}
-if (wsFrame.isOpen()) {
-return SocketState.UPGRADED;
-} else {
+
+/*
+ * If a CLOSE frame has been received then wsFrame will be closed but
need to keep the connection open until the
+ * CLOSE frame has been sent. Hence use the wsSession.isClosed()
rather than wsFrame.isOpen() here.
+ */
+if (wsSession.isClosed()) {
return SocketState.CLOSED;
+} else {
+return SocketState.UPGRADED;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Further BZ 66508 fix
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new d1641c9c85 Further BZ 66508 fix
d1641c9c85 is described below
commit d1641c9c852adcf2d731adb041d7aa0a74f7bea7
Author: Mark Thomas
AuthorDate: Wed Apr 12 13:25:00 2023 +0100
Further BZ 66508 fix
Don't close connection before close message has been sent to client.
---
java/org/apache/tomcat/websocket/WsSession.java | 5 +
.../apache/tomcat/websocket/server/WsHttpUpgradeHandler.java | 11 ---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 5f947afde7..45703457f5 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -462,6 +462,11 @@ public class WsSession implements Session {
}
+public boolean isClosed() {
+ return state == State.CLOSED;
+}
+
+
@Override
public long getMaxIdleTimeout() {
checkState();
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index 7f37101e71..93a717f988 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -186,10 +186,15 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
return SocketState.CLOSED;
}
-if (wsFrame.isOpen()) {
-return SocketState.UPGRADED;
-} else {
+
+/*
+ * If a CLOSE frame has been received then wsFrame will be closed but
need to keep the connection open until the
+ * CLOSE frame has been sent. Hence use the wsSession.isClosed()
rather than wsFrame.isOpen() here.
+ */
+if (wsSession.isClosed()) {
return SocketState.CLOSED;
+} else {
+return SocketState.UPGRADED;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Further BZ 66508 fix
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 9f53a40a30 Further BZ 66508 fix
9f53a40a30 is described below
commit 9f53a40a308fb8c07cb875a605ab92ab5701a4a2
Author: Mark Thomas
AuthorDate: Wed Apr 12 13:25:00 2023 +0100
Further BZ 66508 fix
Don't close connection before close message has been sent to client.
---
java/org/apache/tomcat/websocket/WsSession.java | 5 +
.../apache/tomcat/websocket/server/WsHttpUpgradeHandler.java | 11 ---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/WsSession.java
b/java/org/apache/tomcat/websocket/WsSession.java
index 5f947afde7..45703457f5 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -462,6 +462,11 @@ public class WsSession implements Session {
}
+public boolean isClosed() {
+ return state == State.CLOSED;
+}
+
+
@Override
public long getMaxIdleTimeout() {
checkState();
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index 7f37101e71..93a717f988 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -186,10 +186,15 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
return SocketState.CLOSED;
}
-if (wsFrame.isOpen()) {
-return SocketState.UPGRADED;
-} else {
+
+/*
+ * If a CLOSE frame has been received then wsFrame will be closed but
need to keep the connection open until the
+ * CLOSE frame has been sent. Hence use the wsSession.isClosed()
rather than wsFrame.isOpen() here.
+ */
+if (wsSession.isClosed()) {
return SocketState.CLOSED;
+} else {
+return SocketState.UPGRADED;
}
}
-
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 #609: Unify Windows/Linux package filesets
markt-asf commented on PR #609: URL: https://github.com/apache/tomcat/pull/609#issuecomment-1505077215 tomcat10.exe is a renamed Commons Daemon ProcRun executable. It is not a wrapper around the JAR (at least there is no Java code embedded in that exe). service.bat is useless without tomcat10.exe and tomcat10w.exe. It would make more sense to deploy the Windows specific binaries to Maven. The conf/** files are included before the main set of files for the .tar.gz distro. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] VirtualTim commented on pull request #609: Unify Windows/Linux package filesets
VirtualTim commented on PR #609: URL: https://github.com/apache/tomcat/pull/609#issuecomment-1505066640 >The core .zip and .tar.gz distros are not intended to be Windows/Linux distros Ah, I guess I misunderstood things. You're right, some comments would be helpful. >Historically, service.bat wasn't included in the Windows installer (built via a separate script) but it is now included. There isn't much point including service.bat if the associated binaries are not present. As far as I know, the only binary required is the tomcat10.exe, which is just an exe wrapper around the jar (if my memory is right). So are you saying you don't want to include service.bat in this zip? It's just a bit annoying for me to update tomcat from maven (https://mvnrepository.com/artifact/org.apache.tomcat/tomcat), then have to update the service.bat separately. > The conf/** files are not excluded from the tar.gz distribution, they are added separately using a different permission set. I didn't see that. I see `bin/*.sh` getting added just below, but don't see conf/**. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66005] Apache crashes, if there is a tomcat server, which can not be resolved
https://bz.apache.org/bugzilla/show_bug.cgi?id=66005 Josef Čejka changed: What|Removed |Added CC||jce...@suse.cz --- Comment #21 from Josef Čejka --- Created attachment 38538 --> https://bz.apache.org/bugzilla/attachment.cgi?id=38538=edit Limit mod_jk.so exported symbols to "jk_module" only. I found the real culprit. Please ignore my previous patch. ATM mod_jk.so library exports all internal symbols so any other library loaded after it can bind it's unresolved symbols on mod_jk.so. Glibc is checking dependencies and dlclose() does not unload library on which depends other library. This breaks Apache module reloading mechanism because following dlopen() will return already existing handler to mod_jk.so without re-initialization of global static variables so they contain still already invalid memory pointers instead of NULL values. In my case symbol "context_free@@LIBSELINUX_1.0" required by libkrb5support.so was bound to context_free from mod_jk.so instead of function with the same name provided by libselinux.so.1 because mod_jk.so was loaded first. It occurred only if nscd daemon was disabled and nsswitch had to load krb5 libraries. I can easily reproduce the issue on SLES15-SP4 by disabling nscd service. IMO this can also explain why Lothar reported that his issue disappeared after modifying nsswitch.conf. -- 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
[GitHub] [tomcat] markt-asf commented on pull request #609: Unify Windows/Linux package filesets
markt-asf commented on PR #609: URL: https://github.com/apache/tomcat/pull/609#issuecomment-1504905883 The build script would benefit from some comments here. The core .zip and .tar.gz distros are not intended to be Windows/Linux distros. They should both be platform neutral (i.e. work on both). The only difference should be the line endings. Both should have .bat and .sh files. The Windows service files (service.bat,.exe and .dll files) are only meant to be in the Windows specific distributions. Historically, service.bat wasn't included in the Windows installer (built via a separate script) but it is now included. There isn't much point including service.bat if the associated binaries are not present. The conf/** files are not excluded from the tar.gz distribution, they are added separately using a different permission set. There are essentially three sets of files being added: - the standard directories (bin, conf, lib etc) - the top-level files (LICENSE, README, etc) - and the Windows binaries I think it may be clearer if, rather than sorting all these files as one group, they are kept as three groups (perhaps another opportunity for some brief comments) but sorted within the groups. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #600: echo the value of %JAVA_HOME% when it is invalid.
markt-asf commented on PR #600: URL: https://github.com/apache/tomcat/pull/600#issuecomment-1504867534 np - thanks for the prompt to improve things. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
