You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/07/13 10:12:36 UTC
[tomcat] branch main updated (ec4002ea51 -> f15f8ad870)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from ec4002ea51 Update Tomcat migration tool for Jakarta EE to 1.0.1
new cb1b9683eb Update the Tomcat Native Library to 2.0.1
new f15f8ad870 Fix recommended version in log message
The 2 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.
Summary of changes:
build.properties.default | 10 +++++-----
java/org/apache/catalina/core/AprLifecycleListener.java | 8 ++++----
webapps/docs/changelog.xml | 12 ++++++++----
3 files changed, 17 insertions(+), 13 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Update the Tomcat Native Library to 2.0.1
Posted by ma...@apache.org.
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.git
commit cb1b9683eb073ec99c11bc69e0c8dd12f5d155ee
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 13 11:07:30 2022 +0100
Update the Tomcat Native Library to 2.0.1
---
build.properties.default | 10 +++++-----
java/org/apache/catalina/core/AprLifecycleListener.java | 6 +++---
webapps/docs/changelog.xml | 12 ++++++++----
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 97ecc7fd59..acdfb5dc02 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -152,19 +152,19 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.2.34
+tomcat-native.version=2.0.1
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+tomcat-native.src.checksum.value=c56e4e739e74fbf627e6f503a0cb40a7b502663e2bed19468fac8d11bab3ce36a117eae41b3f0a19ebeef537123b7eb7d3346fc182f2e142f8c829df884c6f08
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ea0489c33f2741f2b7cbc26bfd7fc500583bf62bf7564c4798205c7395bc1d2c000914b30cb492a33614ae45b030ba5952e70956a79ee16ac4019b80c5627282
+tomcat-native.win.checksum.value=9e727bd66db299058de647ab33c0612e184f6c05976e5b6cc330172588aab537f6e19f01129429039cb2516398850a5ceec0739993c226ab20f99b9677acf948
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1o-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-3.0.5-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-3.0.5-win32-bin.zip
# ----- NSIS, version 3.0 or later -----
nsis.version=3.08
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 60e6d1036b..f596795806 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -69,9 +69,9 @@ public class AprLifecycleListener implements LifecycleListener {
protected static final int TCN_REQUIRED_MAJOR = 1;
protected static final int TCN_REQUIRED_MINOR = 2;
protected static final int TCN_REQUIRED_PATCH = 34;
- protected static final int TCN_RECOMMENDED_MAJOR = 1;
- protected static final int TCN_RECOMMENDED_MINOR = 2;
- protected static final int TCN_RECOMMENDED_PV = 34;
+ protected static final int TCN_RECOMMENDED_MAJOR = 2;
+ protected static final int TCN_RECOMMENDED_MINOR = 0;
+ protected static final int TCN_RECOMMENDED_PV = 1;
// ---------------------------------------------- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f31debc1f6..658ca78de1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,10 @@
API updates and fixes. Improves memory session usage and avoids some
allocations. Review from Maurizio Cimadamore. (remm)
</update>
+ <update>
+ Update the minimum recommended version of the Tomcat Native Library to
+ 2.0.1. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -213,10 +217,6 @@
information is embedded in a number of build outputs such as JAR file
manifests. (markt)
</add>
- <update>
- Update the packaged version of the Tomcat Native Library to 1.2.34 to
- improve the support for building with OpenSSL 3.0.x.(markt)
- </update>
<update>
Update the minimum supported version of Tomcat Native to 1.2.34 to allow
the removal of the deprecated Java API associated with features that
@@ -245,6 +245,10 @@
Update the Apache Tomcat migration tool for Jakarta EE library to 1.0.1.
(markt)
</update>
+ <update>
+ Update the packaged version of the Tomcat Native Library to 2.0.1 to
+ pick up the Windows binaries built with with OpenSSL 3.0.5. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix recommended version in log message
Posted by ma...@apache.org.
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.git
commit f15f8ad870cb63e9573f65ff3da4de97eba2a928
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 13 11:12:25 2022 +0100
Fix recommended version in log message
---
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index f596795806..ca31e01a38 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -249,7 +249,7 @@ public class AprLifecycleListener implements LifecycleListener {
if (tcnVersion < rcver) {
initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
Library.versionString(),
- TCN_REQUIRED_MAJOR + "." +
+ TCN_RECOMMENDED_MAJOR + "." +
TCN_RECOMMENDED_MINOR + "." +
TCN_RECOMMENDED_PV));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org