This is an automated email from the ASF dual-hosted git repository.
michaelo 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 7929f10 AprLifecycleListener does not show dev version suffix for
libtcnative and libapr
7929f10 is described below
commit 7929f10f12e7d9e958f16086e28928e9adc9af62
Author: Michael Osipov <[email protected]>
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 6b6a8e7..ca6e4cd 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 7f8b6ad..6e20426 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,10 @@
<code>setAttribute()</code>, <code>getAttribute()</code> and
<code>getAttributes()</code> introduced in Servlet 5.1. (markt)
</add>
+ <fix>
+ AprLifecycleListener does not show dev version suffix for libtcnative
+ and libapr. (michaelo)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
