This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new d283a04 AprLifecycleListener does not show dev version suffix for
libtcnative and libapr
d283a04 is described below
commit d283a04f7e63035012183e76ebfa9e7a31eab040
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 acf4301..4cc0955 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -220,8 +220,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));
@@ -237,17 +237,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 1994d8c..bbfc78a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,6 +125,10 @@
<bug>63508</bug>: NPE in JNDIRealm when no
<code>userRoleAttribute</code>
is given. (fschumacher)
</fix>
+ <fix>
+ AprLifecycleListener does not show dev version suffix for libtcnative
+ and libapr. (michaelo)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
