Re: [VOTE] Release Apache Tomcat Native 2.0.5
On 01/08/2023 19:24, Mark Thomas wrote: The Apache Tomcat Native 2.0.5 release is [X] Stable, go ahead and release [ ] Broken because of ... Built and passed unit tests for 11.0.x on Linux, Windows, macOS M1 and macOS Intel. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Increment version for next development cycle
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-native.git
The following commit(s) were added to refs/heads/main by this push:
new 062b795e3 Increment version for next development cycle
062b795e3 is described below
commit 062b795e3e3441fec541b86e49432c5227aef8c7
Author: Mark Thomas
AuthorDate: Tue Aug 1 20:16:57 2023 +0100
Increment version for next development cycle
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
native/os/win32/libtcnative.rc| 6 +++---
xdocs/miscellaneous/changelog.xml | 4
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c0d6e58c3..c1bdc73c0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=2
version.minor=0
-version.build=5
+version.build=6
version.patch=0
version.suffix=-dev
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 27a821162..bbea5e7c3 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 0
/** patch level */
-#define TCN_PATCH_VERSION 5
+#define TCN_PATCH_VERSION 6
/**
* This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 8ffbf7f17..9ebf9abd7 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -19,7 +19,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "2.0.5"
+#define TCN_VERSION "2.0.6"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -35,8 +35,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 2,0,5,0
- PRODUCTVERSION 2,0,5,0
+ FILEVERSION 2,0,6,0
+ PRODUCTVERSION 2,0,6,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 712e3687e..5bb4b7e51 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -31,6 +31,10 @@
branch started from the 1.2.33 tag.
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat Native 2.0.5
The key differences of version 2.0.5 compared to 2.0.4 are: - Align default pass phrase prompt with HTTPd - Update autotools and associated fixes - Fix memory leak in SNI processing - The windows binaries in this release have been built with OpenSSL 3.0.10 and APR 1.7.4 The 2.0.x branch is primarily intended for use with Tomcat 10.1.x onwards but can be used with earlier versions as long as the APR/native connector is not used. The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 2.0.5 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.5 [2] https://github.com/apache/tomcat-native/commit/7b3d702481bc9198e958b88a1f6028b9be5de4ff - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r63300 - in /dev/tomcat/tomcat-connectors/native/2.0.5: ./ binaries/ source/
Author: markt Date: Tue Aug 1 18:15:29 2023 New Revision: 63300 Log: Upload Tomcat Native 2.0.5 for voting Added: dev/tomcat/tomcat-connectors/native/2.0.5/ dev/tomcat/tomcat-connectors/native/2.0.5/binaries/ dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-win32-bin.zip (with props) dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-win32-bin.zip.sha512 dev/tomcat/tomcat-connectors/native/2.0.5/source/ dev/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz (with props) dev/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz.asc dev/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-src.tar.gz.sha512 dev/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-win32-src.zip (with props) dev/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-win32-src.zip.asc dev/tomcat/tomcat-connectors/native/2.0.5/source/tomcat-native-2.0.5-win32-src.zip.sha512 Added: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.asc (added) +++ dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.asc Tue Aug 1 18:15:29 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmTJSjIACgkQEMAcWi9g +Wee0WRAAnLdByb4XizN5Hhgkck1Dp72w1+NbBGtMWGwik9OhODy5mqMrD/FCHVRU +8SPT0SsbsWSQkMAESc1HMJ/rOWjoqmpj0yILAEPVoxc+/4t6HQKrhknCQZ7/i/Nd +9NkyASoz9HJ7nPZCkgyD4W+O5QuorTOTNxH2T6PSapnzxcaQe5iIE5ab+FpgdhhY +4tjegGb6wP87s+PHFKS3y7tThjeWyAUr1oJZvRFKeiZTseM8c6No7XBsKsC4nWJP +2tp25oknWdkYfsGe3E9rQfuwKoGDlCH3vKYl0e2UtVLy7H2Pu63TG7uIP5AN6Ssi +rFr03fUSdtoQ+WUjdPveHpMMOYyZa6kpBM8bLw32beKR9lpQ34xxJETlwrJTtPHO +WFaAgJjanYli51BVdg8qpfp0OWFPdSNvdluc5dSLOY+o058lBApxITwBvHxk8okR +wZ+SjyIwPruIWcLT4kY68DV3jhTpeV+FITSnakHPBg3mrHdcEwA3Nj1QOS6P3HQ1 +yVcSDVQLyXdszfqmyzDECGx/d/IIkW51ff2obEf8XrIQLi5zjvrtHcnfenIl42UQ +lYlL+1GY9m3JSQ6pmxmroClVv710dsoWBfrE+1VUjQcDY569qeeJ4gASb1uFnSY+ +oT1xVErx30DuVqNJUW+gsyWykNXKgO17U80OitKYySJKLv5ORYs= +=qOYD +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.sha512 == --- dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.sha512 (added) +++ dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip.sha512 Tue Aug 1 18:15:29 2023 @@ -0,0 +1 @@ +8b82033602be8f47905804349093045b99ba9cc3f2dbf95d52be2a430bae84bbefd0b938f6b0fa9d5c54af20fcb4a00b4dd2325d7482d3cf59a2463c0935d86f *tomcat-native-2.0.5-openssl-3.0.10-ocsp-win32-bin.zip \ No newline at end of file Added: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-win32-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-win32-bin.zip -- svn:executable = * Propchange: dev/tomcat/tomcat-connectors/native/2.0.5/binaries/tomcat-native-2.0.5-openssl-3.0.10-win32-bin.zip -- svn:mime-type = application/octet-stream Added:
svn commit: r63299 - in /release/tomcat: jakartaee-migration/v1.0.6/ tomcat-10/v10.1.10/ tomcat-10/v10.1.8/ tomcat-10/v10.1.9/ tomcat-11/v11.0.0-M7/ tomcat-8/v8.5.90/ tomcat-9/v9.0.76/
Author: markt Date: Tue Aug 1 18:14:33 2023 New Revision: 63299 Log: Drop older releases from CDN Removed: release/tomcat/jakartaee-migration/v1.0.6/ release/tomcat/tomcat-10/v10.1.10/ release/tomcat/tomcat-10/v10.1.8/ release/tomcat/tomcat-10/v10.1.9/ release/tomcat/tomcat-11/v11.0.0-M7/ release/tomcat/tomcat-8/v8.5.90/ release/tomcat/tomcat-9/v9.0.76/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/01: Tag 2.0.5
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to tag 2.0.5
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 7b3d702481bc9198e958b88a1f6028b9be5de4ff
Author: Mark Thomas
AuthorDate: Tue Aug 1 17:22:37 2023 +0100
Tag 2.0.5
---
build.properties.default | 2 +-
native/include/tcn_version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c0d6e58c3..ce5597776 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -20,7 +20,7 @@ version.major=2
version.minor=0
version.build=5
version.patch=0
-version.suffix=-dev
+version.suffix=
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index 27a821162..f229e8035 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -69,7 +69,7 @@ extern "C" {
* This symbol is defined for internal, "development" copies of TCN. This
* symbol will be #undef'd for releases.
*/
-#define TCN_IS_DEV_VERSION 1
+#define TCN_IS_DEV_VERSION 0
/** The formatted string of APU's version */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] tag 2.0.5 created (now 7b3d70248)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to tag 2.0.5 in repository https://gitbox.apache.org/repos/asf/tomcat-native.git at 7b3d70248 (commit) This tag includes the following new commits: new 7b3d70248 Tag 2.0.5 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-native] branch main updated: Correct reference Tomcat version for JNI source
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-native.git The following commit(s) were added to refs/heads/main by this push: new db26cdda7 Correct reference Tomcat version for JNI source db26cdda7 is described below commit db26cdda7f294459b4993f3d7d12b2035a1aff92 Author: Mark Thomas AuthorDate: Tue Aug 1 17:05:36 2023 +0100 Correct reference Tomcat version for JNI source --- HOWTO-RELEASE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt index 0c3e7c15a..86f08f485 100644 --- a/HOWTO-RELEASE.txt +++ b/HOWTO-RELEASE.txt @@ -41,7 +41,7 @@ Ensure dates and/or version numbers are up to date: - native/os/win32/libtcnative.rc x3 - xdocs/miscellaneous/changelog.xml -Run the release script to check the Java code is aligned with the current 10.1.x +Run the release script to check the Java code is aligned with the current 11.0.x source. ./jnirelease.sh --ver=main --with-apr=/path/to/apr/source - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Update the minimum recommended OpenSSL version to 3.0.10
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-native.git The following commit(s) were added to refs/heads/main by this push: new d861dbdc9 Update the minimum recommended OpenSSL version to 3.0.10 d861dbdc9 is described below commit d861dbdc9ca5bb141c1776ae48071d889fb2434a Author: Mark Thomas AuthorDate: Tue Aug 1 16:52:45 2023 +0100 Update the minimum recommended OpenSSL version to 3.0.10 --- native/download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native/download_deps.sh b/native/download_deps.sh index de0d1fad4..fee1db225 100755 --- a/native/download_deps.sh +++ b/native/download_deps.sh @@ -5,7 +5,7 @@ cd $(dirname $0) -SSL=openssl-3.0.9.tar.gz +SSL=openssl-3.0.10.tar.gz APR=apr-1.7.4.tar.gz mkdir -p deps diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index b5c4cd7c9..de98aabe4 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 3.0.9 or later, http://www.openssl.org +- OpenSSL 3.0.10 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 8bffe0d5d..712e3687e 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -54,6 +54,9 @@ 9: Fix memory leak in SNI processing. (markt) + + Update the recommended minimum version of OpenSSL to 3.0.10. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66829] New: setclasspath.bat: troubles when _RUNJAVA contains spaces
https://bz.apache.org/bugzilla/show_bug.cgi?id=66829 Bug ID: 66829 Summary: setclasspath.bat: troubles when _RUNJAVA contains spaces Product: Tomcat 11 Version: unspecified Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: dpa-apache_...@bapha.be Target Milestone: --- Catalina.bat permits me to set the environment variable _RUNJAVA before calling «catalina.bat start». If the variable value contains space, e.g. is from WSL export _RUNJAVA=\"C:\\Program\ Files\ \(x86\)\\Java\\jdk1.8.0_361\\bin\\java.exe\"; export WSL=_RUNJAVA ; cmd.exe /c 'catalina.bat start' then the output it Files was unexpected at this time. “Files“ is from “Program Files”. In I replace in setclasspath.bat > if not "%_RUNJAVA%" == "" goto gotRunJava with > if not defined %_RUNJAVA% goto gotRunJava then the problem disappears. Yes, Java 8 does not run with Tomcat 11. But this problem actually appears with Tomcat 9 and setclasspath.bat has not changed between Tomcat 9 and Tomcat 10.1. • In bin/setclasspath.bat replace «if not "%_RUNJAVA%" == "" goto gotRunJava» with «if not defined %_RUNJAVA% goto gotRunJava». -- 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] wenjunxiao opened a new pull request, #643: Fix ConnectionState when exception
wenjunxiao opened a new pull request, #643: URL: https://github.com/apache/tomcat/pull/643 When an exception occurs while writing, the ConnectionState state will be inconsistent with the actual state on the connection, therefore, the state needs to be cleaned up on exception. Example code https://github.com/wenjunxiao/lab-tomcat-jdbc-autocommit -- 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
svn commit: r1911390 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: markt Date: Tue Aug 1 09:39:55 2023 New Revision: 1911390 URL: http://svn.apache.org/viewvc?rev=1911390=rev Log: Add Tomcat 11 section Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1911390=1911389=1911390=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Tue Aug 1 09:39:55 2023 @@ -208,13 +208,21 @@ a number of relatively minor bugs. Beta minor bugs. Stable releases are intended for production use and are expected to run stably for extended periods of time. +Apache Tomcat 11.0.x + +Apache Tomcat 11.0.x is the current focus of development. It +builds on Tomcat 10.1.x and implements the Servlet 6.1, +JSP 4.0, EL 6.0, WebSocket +2.2 and Authentication 3.1 specifications (the +versions required by Jakarta EE 11 platform). + + Apache Tomcat 10.1.x -Apache Tomcat 10.1.x is the current focus of development. It -builds on Tomcat 10.0.x and implements the Servlet -6.0, JSP 3.1, EL 5.0, WebSocket 2.1 - and Authentication 3.0 specifications (the versions required by -Jakarta EE 10 platform). +Apache Tomcat 10.1.x builds on Tomcat 10.0.x and implements +the Servlet 6.0, JSP 3.1, EL +5.0, WebSocket 2.1 and Authentication +3.0 specifications (the versions required by Jakarta EE 10 platform). Apache Tomcat 10.0.x Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1911390=1911389=1911390=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Tue Aug 1 09:39:55 2023 @@ -224,13 +224,24 @@ run stably for extended periods of time. + + +Apache Tomcat 11.0.x is the current focus of development. It +builds on Tomcat 10.1.x and implements the Servlet 6.1, +JSP 4.0, EL 6.0, WebSocket +2.2 and Authentication 3.1 specifications (the +versions required by Jakarta EE 11 platform). + + + + + -Apache Tomcat 10.1.x is the current focus of development. It -builds on Tomcat 10.0.x and implements the Servlet -6.0, JSP 3.1, EL 5.0, WebSocket 2.1 - and Authentication 3.0 specifications (the versions required by -Jakarta EE 10 platform). +Apache Tomcat 10.1.x builds on Tomcat 10.0.x and implements +the Servlet 6.0, JSP 3.1, EL +5.0, WebSocket 2.1 and Authentication +3.0 specifications (the versions required by Jakarta EE 10 platform). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (5cd6da7dca -> 6e3aa49334)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 5cd6da7dca Additional debug logging after CI test failure add 6e3aa49334 Remove preview flag No new revisions were added by this update. Summary of changes: modules/openssl-foreign/pom.xml | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
