This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit f2a7699d37db56bfbcb5f3c3215854598953141e Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Feb 5 08:58:41 2024 +0000 Second pass at version update --- HOWTO-RELEASE.txt | 2 +- build.properties.default | 4 ++-- native/include/tcn_version.h | 4 ++-- native/os/win32/libtcnative.rc | 4 ++-- native/srclib/VERSIONS | 11 +++-------- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt index 4dc2d8c79..3542ee962 100644 --- a/HOWTO-RELEASE.txt +++ b/HOWTO-RELEASE.txt @@ -23,7 +23,7 @@ Requirements Java 8 Apache Ant 1.9 or later -Apache APR 1.4.3 or later source (1.7.4 or later recommended) +Apache APR 1.6.3 or later source (1.7.4 or later recommended) Preparation diff --git a/build.properties.default b/build.properties.default index 37e678139..d4c677184 100644 --- a/build.properties.default +++ b/build.properties.default @@ -17,8 +17,8 @@ # ----- Version Control Flags ----- version.major=1 -version.minor=2 -version.build=40 +version.minor=3 +version.build=0 version.patch=0 version.suffix=-dev diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h index d88bb4236..9454fb579 100644 --- a/native/include/tcn_version.h +++ b/native/include/tcn_version.h @@ -60,10 +60,10 @@ extern "C" { * Minor API changes that do not cause binary compatibility problems. * Should be reset to 0 when upgrading TCN_MAJOR_VERSION */ -#define TCN_MINOR_VERSION 2 +#define TCN_MINOR_VERSION 3 /** patch level */ -#define TCN_PATCH_VERSION 40 +#define TCN_PATCH_VERSION 0 /** * 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 55b45baa8..e4d443823 100644 --- a/native/os/win32/libtcnative.rc +++ b/native/os/win32/libtcnative.rc @@ -36,8 +36,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,2,40,0 - PRODUCTVERSION 1,2,40,0 + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index cef16403f..7eb22da70 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -1,21 +1,16 @@ The current minimum versions are: -- OpenSSL 1.0.2 -- APR 1.4.3 +- OpenSSL 1.1.1 +- APR 1.6.3 The following version of the libraries are recommended: - APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 3.0.11 or later, http://www.openssl.org +- OpenSSL 3.0.13 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team -It is current anticipated that Tomcat Native releases will transition to 1.3.x -at some point in the future when the minimum version will become OpenSSL 1.1.1 and -APR 1.6.3. - - The minimum version of OpenSSL is driven by the version of OpenSSL used by downstream distributions. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org