This is an automated email from the ASF dual-hosted git repository. michaelo 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 9745d4b AprLifecycleListener does not show dev version suffix for libtcnative and libapr 9745d4b is described below commit 9745d4b5eda124a3fc7f843a8d7d99bb164b36ca Author: Michael Osipov <micha...@apache.org> AuthorDate: Tue May 25 20:14:19 2021 +0200 AprLifecycleListener does not show dev version suffix for libtcnative and libapr --- java/org/apache/catalina/core/AprLifecycleListener.java | 12 +++++------- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index 51c8308..b8ddb71 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -213,8 +213,8 @@ public class AprLifecycleListener return; } if (apver < rqver) { - log.error(sm.getString("aprListener.tcnInvalid", major + "." - + minor + "." + patch, + log.error(sm.getString("aprListener.tcnInvalid", + Library.versionString(), TCN_REQUIRED_MAJOR + "." + TCN_REQUIRED_MINOR + "." + TCN_REQUIRED_PATCH)); @@ -230,17 +230,15 @@ public class AprLifecycleListener } if (apver < rcver) { initInfoLogMessages.add(sm.getString("aprListener.tcnVersion", - major + "." + minor + "." + patch, + Library.versionString(), TCN_REQUIRED_MAJOR + "." + TCN_RECOMMENDED_MINOR + "." + TCN_RECOMMENDED_PV)); } initInfoLogMessages.add(sm.getString("aprListener.tcnValid", - major + "." + minor + "." + patch, - Library.APR_MAJOR_VERSION + "." + - Library.APR_MINOR_VERSION + "." + - Library.APR_PATCH_VERSION)); + Library.versionString(), + Library.aprVersionString())); // Log APR flags initInfoLogMessages.add(sm.getString("aprListener.flags", diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 043903f..bfa9611 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -144,6 +144,10 @@ it does not contain a charset. Also remove the outdated workaround for the buggy Adobe Reader 9 plug-in for IE. (markt) </fix> + <fix> + AprLifecycleListener does not show dev version suffix for libtcnative + and libapr. (michaelo) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org