svn commit: r64510 - /dev/tomcat/tomcat-9/v9.0.82/ /release/tomcat/tomcat-9/v9.0.82/
Author: remm Date: Fri Oct 13 06:48:15 2023 New Revision: 64510 Log: Release Apache Tomcat 9.0.82 Added: release/tomcat/tomcat-9/v9.0.82/ - copied from r64509, dev/tomcat/tomcat-9/v9.0.82/ Removed: dev/tomcat/tomcat-9/v9.0.82/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 9.0.82
The following votes were cast: Binding: +1: isapir, fschumacher, remm, csutherl, markt, lihan, schultz Non-binding: +1: Cesar Hernandez No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67722] Tomcat 10 Http11AprProtocol Protocol handler instantiation failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=67722 Remy Maucherat changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Remy Maucherat --- In the logs, the first error is: 12-Oct-2023 14:42:21.043 SEVERE [main] org.apache.catalina.connector.Connector. Protocol handler instantiation failed java.lang.ClassNotFoundException: org.apache.coyote.http11.Http11AprProtocol Indeed, the APR connector has been removed. You have to use another one, either NIO or NIO2. OpenSSL can be used with them, which would replicate all the functionality from the APR connector in the TLS area. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67722] Tomcat 10 Http11AprProtocol Protocol handler instantiation failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=67722 Ruediger Pluem changed: What|Removed |Added Version|10.0.0 |10.1.14 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67722] Tomcat 10 Http11AprProtocol Protocol handler instantiation failed
https://bz.apache.org/bugzilla/show_bug.cgi?id=67722 Ruediger Pluem changed: What|Removed |Added Target Milestone|--- |-- OS||All Product|APR |Tomcat 10 Assignee|b...@apr.apache.org |dev@tomcat.apache.org Component|APR |Connectors Version|HEAD|10.0.0 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Which release artifact should we expect to be reproducible?
Le 12/10/2023 à 23:27, Christopher Schultz a écrit : I installed the ZIP version of Temurin Java 21 to match your release toolchain and I get every file being different. But the versions are not exactly the same, so that may be the reason: Release Java: 21+25-2513 Local Java: 21+35-LTS I'm also using Cp1252 instead of UTF-8 (ew). I'll try to change that and see if it changes anything. Did you try comparing the files with diffoscope [1]? That would allow you to quickly see what varies and prevents the build from being reproducible. Emmanuel Bourg [1] https://diffoscope.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Which release artifact should we expect to be reproducible?
Mark, On 10/12/23 15:50, Christopher Schultz wrote: Mark, On 10/12/23 13:15, Mark Thomas wrote: 12 Oct 2023 10:29:02 Christopher Schultz : All, I've been working on an "ant verify-release" target and I'm finding that in the 9.0 release -- the one I'm using as a guinea pig -- the SHA-512 hashes do not match for these artifacts: apache-tomcat-9.0.82-fulldocs.tar.gz apache-tomcat-9.0.82-src.tar.gz apache-tomcat-9.0.82-src.zip They have different file sizes. The *-src artifacts seem to be off only by a few bytes (of file size, I haven't compared the contents yet) but the fulldocs are quite different. I'm thinking that maybe these artifacts aren't expected to match 100% but I'm not entirely sure. If it's possible to get these to be reproducible, I think it would be good. I did notice that the build contains in many places and in some places we are converting to CRLF and LF in others. Sometimes we are using UTF-8 and ISO-8859-1 in others. These are always specified, so I wouldn't expect there to be a problem in these areas with reproducibility (because they are consistently inconsistent). Building the fulldocs tar looks like we do not perform a fixcrlf on all files that will go into the archive, so if Rémy built on Linux (he did) and I verified on Windows (I did) I think maybe the line-endings are the problem. Do we want these artifacts to be 100% reproducible? If so, we have a little bit of work to do. With the exact same version of Ant and the exact same JVM version and vendor the builds should be repeatable. I'm using the exact same versions of the JDK and ant as Rémy, though it is on a different platform. Should be expect cross-platform repeatability? I should hope so. The other release artifacts I didn't mention are all identical (e.g. binary tarballs, .zips, and .exes). I have checked repeatability across Linux / Windows for some versions and it was OK. Might need to diff the build.xml files to see if they have diverged. I have committed my verify-release ant target to main. Please have a look and see if you spot any errors in the implementation. I definitely got different sha512 sums for the above 3 files when I performed the build locally. NOTE: The verify-release target currently *ignores* the checks the the above files on the off-chance it was intentional. But the build will perform the checks and issue a notification... before telling you that the build was perfect when it wasn't. Since the tarball and .exes were identical, I reported the build as "repeatable" for the vote. I'm not yet able to test for repeatability for 11.0.x because I haven't yet installed Java 21 on my Windows VM. Chocolatey doesn't yet have that package and I'd prefer to use that to the standard packages from Eclipse/Temurin/Adoptium/whatever because they are far easier to update. I installed the ZIP version of Temurin Java 21 to match your release toolchain and I get every file being different. But the versions are not exactly the same, so that may be the reason: Release Java: 21+25-2513 Local Java: 21+35-LTS I'm also using Cp1252 instead of UTF-8 (ew). I'll try to change that and see if it changes anything. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (2b4031bb76 -> 309996da73)
This is an automated email from the ASF dual-hosted git repository. schultz pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 2b4031bb76 Record toolchain version numbers when performing a release. Verify toolchain version numbers when verifying a release. new 51d525ee59 Use pre-computed version name. Slight hack to ignore x86 binaries for Tomcat 11. new 309996da73 Ignore x86 binary for Tomcat 11.0.x 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.xml | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Ignore x86 binary for Tomcat 11.0.x
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 309996da731705505bc185e5394b83663e3aa148
Author: schultz
AuthorDate: Thu Oct 12 14:17:33 2023 -0700
Ignore x86 binary for Tomcat 11.0.x
---
build.xml | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 14c5744ef2..6a16b1a38c 100644
--- a/build.xml
+++ b/build.xml
@@ -4135,7 +4135,10 @@ reproducible-10=${reproducible-10}
-->
-
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Use pre-computed version name. Slight hack to ignore x86 binaries for Tomcat 11.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 51d525ee59d9497489e2fa46e1a5287f4ec9c47c
Author: schultz
AuthorDate: Thu Oct 12 14:14:41 2023 -0700
Use pre-computed version name.
Slight hack to ignore x86 binaries for Tomcat 11.
---
build.xml | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index f6cf11b037..14c5744ef2 100644
--- a/build.xml
+++ b/build.xml
@@ -4030,16 +4030,24 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
-https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version.major}.${version.minor}.${version.build}/@{src-or-bin}/@{basefile}.sha512";
/>
+https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version}/@{src-or-bin}/@{basefile}.sha512";
/>
-https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version.major}.${version.minor}.${version.build}/@{src-or-bin}/@{basefile}.sha512";
/>
+https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version}/@{src-or-bin}/@{basefile}.sha512";
/>
-
+
+
+
+
+
+
+
+
+
Unable to locate release hash for @{basefile}
@@ -4063,7 +4071,7 @@ Unable to locate release hash for @{basefile}
Signature mismatch for @{basefile}:
-
+
@@ -4075,7 +4083,7 @@ Signature mismatch for @{basefile}:
This does not appear to be a copy of a released tag; no
build.properties.release file exists.
-
+
It appears there are no build artifacts to verify. Please run 'ant release'
first.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Record toolchain version numbers when performing a release. Verify toolchain version numbers when verifying a release.
This is an automated email from the ASF dual-hosted git repository.
schultz 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 2b4031bb76 Record toolchain version numbers when performing a release.
Verify toolchain version numbers when verifying a release.
2b4031bb76 is described below
commit 2b4031bb769985008ff81a3916491a48cb8dbdee
Author: schultz
AuthorDate: Thu Oct 12 13:13:23 2023 -0700
Record toolchain version numbers when performing a release.
Verify toolchain version numbers when verifying a release.
---
build.xml | 41 -
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 10ada18129..f6cf11b037 100644
--- a/build.xml
+++ b/build.xml
@@ -2653,6 +2653,7 @@ skip.installer property in build.properties" />
+
#
-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -2705,6 +2706,8 @@ gpg.exec=${gpg.exec}
# File encoding: ${file.encoding}
#
# Release Manager: ${release.asfusername}
+release-java-version=${java.vm.version}
+release-ant-version=${antversion}
#
-
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -4065,7 +4068,8 @@ Signature mismatch for @{basefile}:
-
+
+
@@ -4166,6 +4170,41 @@ One or more signatures failed.
All (important) signatures are verified; the build appears to be reproducible.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Release toolchain versions do not match local toolchain:
+
+Release Java: ${release-java-version}
+Local Java: ${java.vm.version}
+Release Ant: ${release-ant-version}
+Local Ant:${antversion}
+
+You may not be able to verify that this build is reproducible.
+
+Re-run with -Dcheck-release-toolchain=false to disable this check.
+
+Local toolchain versions match release toolchain (Java
${release-java-version}, Ant ${release-ant-version}).
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Which release artifact should we expect to be reproducible?
Mark, On 10/12/23 13:15, Mark Thomas wrote: 12 Oct 2023 10:29:02 Christopher Schultz : All, I've been working on an "ant verify-release" target and I'm finding that in the 9.0 release -- the one I'm using as a guinea pig -- the SHA-512 hashes do not match for these artifacts: apache-tomcat-9.0.82-fulldocs.tar.gz apache-tomcat-9.0.82-src.tar.gz apache-tomcat-9.0.82-src.zip They have different file sizes. The *-src artifacts seem to be off only by a few bytes (of file size, I haven't compared the contents yet) but the fulldocs are quite different. I'm thinking that maybe these artifacts aren't expected to match 100% but I'm not entirely sure. If it's possible to get these to be reproducible, I think it would be good. I did notice that the build contains in many places and in some places we are converting to CRLF and LF in others. Sometimes we are using UTF-8 and ISO-8859-1 in others. These are always specified, so I wouldn't expect there to be a problem in these areas with reproducibility (because they are consistently inconsistent). Building the fulldocs tar looks like we do not perform a fixcrlf on all files that will go into the archive, so if Rémy built on Linux (he did) and I verified on Windows (I did) I think maybe the line-endings are the problem. Do we want these artifacts to be 100% reproducible? If so, we have a little bit of work to do. With the exact same version of Ant and the exact same JVM version and vendor the builds should be repeatable. I'm using the exact same versions of the JDK and ant as Rémy, though it is on a different platform. Should be expect cross-platform repeatability? I should hope so. The other release artifacts I didn't mention are all identical (e.g. binary tarballs, .zips, and .exes). I have checked repeatability across Linux / Windows for some versions and it was OK. Might need to diff the build.xml files to see if they have diverged. I have committed my verify-release ant target to main. Please have a look and see if you spot any errors in the implementation. I definitely got different sha512 sums for the above 3 files when I performed the build locally. NOTE: The verify-release target currently *ignores* the checks the the above files on the off-chance it was intentional. But the build will perform the checks and issue a notification... before telling you that the build was perfect when it wasn't. Since the tarball and .exes were identical, I reported the build as "repeatable" for the vote. I'm not yet able to test for repeatability for 11.0.x because I haven't yet installed Java 21 on my Windows VM. Chocolatey doesn't yet have that package and I'd prefer to use that to the standard packages from Eclipse/Temurin/Adoptium/whatever because they are far easier to update. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Which release artifact should we expect to be reproducible?
12 Oct 2023 10:29:02 Christopher Schultz : All, I've been working on an "ant verify-release" target and I'm finding that in the 9.0 release -- the one I'm using as a guinea pig -- the SHA-512 hashes do not match for these artifacts: apache-tomcat-9.0.82-fulldocs.tar.gz apache-tomcat-9.0.82-src.tar.gz apache-tomcat-9.0.82-src.zip They have different file sizes. The *-src artifacts seem to be off only by a few bytes (of file size, I haven't compared the contents yet) but the fulldocs are quite different. I'm thinking that maybe these artifacts aren't expected to match 100% but I'm not entirely sure. If it's possible to get these to be reproducible, I think it would be good. I did notice that the build contains in many places and in some places we are converting to CRLF and LF in others. Sometimes we are using UTF-8 and ISO-8859-1 in others. These are always specified, so I wouldn't expect there to be a problem in these areas with reproducibility (because they are consistently inconsistent). Building the fulldocs tar looks like we do not perform a fixcrlf on all files that will go into the archive, so if Rémy built on Linux (he did) and I verified on Windows (I did) I think maybe the line-endings are the problem. Do we want these artifacts to be 100% reproducible? If so, we have a little bit of work to do. With the exact same version of Ant and the exact same JVM version and vendor the builds should be repeatable. I have checked repeatability across Linux / Windows for some versions and it was OK. Might need to diff the build.xml files to see if they have diverged. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.95 [CORRECTED]
All, On 10/11/23 21:32, Christopher Schultz wrote: The proposed Apache Tomcat 8.5.95 release is now available for voting. The notable changes compared to 8.5.94 are: - Correct a regression in 8.5.94 that broke the Tomcat JBDC connection pool - Correct a regression in 8.5.94 that broke HTTP compression Along with lots of other bug fixes and improvements. For full details, see the changelog: https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.95/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1463 The tag is: https://github.com/apache/tomcat/tree/8.5.95/ The proposed 8.5.95 release is: [ ] Broken - do not release [X] Stable - go ahead and release as 8.5.95 (stable) +1 for stable release Works on a vanilla servlet-based application using both HTTP-NIO and AJP-NIO connectors. Unit tests pass on Linux x86-64. Details: * Environment * Java (build): openjdk version "1.8.0_372" OpenJDK Runtime Environment (Temurin)(build 1.8.0_372-b07) OpenJDK 64-Bit Server VM (Temurin)(build 25.372-b07, mixed mode) * Java (test): openjdk version "1.8.0_372" OpenJDK Runtime Environment (Temurin)(build 1.8.0_372-b07) OpenJDK 64-Bit Server VM (Temurin)(build 25.372-b07, mixed mode) * OS: Linux 6.1.0-12-amd64 x86_64 * cc: cc (Debian 12.2.0-14) 12.2.0 * make: GNU Make 4.3 * OpenSSL: OpenSSL 1.1.1 11 Sep 2018 * APR: 1.7.2 * * Valid SHA-512 signature for apache-tomcat-8.5.95.zip * Valid GPG signature for apache-tomcat-8.5.95.zip * Valid SHA-512 signature for apache-tomcat-8.5.95.tar.gz * Valid GPG signature for apache-tomcat-8.5.95.tar.gz * Valid SHA-512 signature for apache-tomcat-8.5.95.exe * Valid GPG signature for apache-tomcat-8.5.95.exe * Valid Windows Digital Signature for apache-tomcat-8.5.95.exe * Valid SHA512 signature for apache-tomcat-8.5.95-src.zip * Valid GPG signature for apache-tomcat-8.5.95-src.zip * Valid SHA512 signature for apache-tomcat-8.5.95-src.tar.gz * Valid GPG signature for apache-tomcat-8.5.95-src.tar.gz * * Binary Zip and tarball: Same * Source Zip and tarball: Same * * Building dependencies returned: 0 * tcnative builds cleanly * Tomcat builds cleanly * Junit Tests: PASSED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 11.0.0-M13
Mark, On 10/11/23 09:24, Mark Thomas wrote: The proposed Apache Tomcat 11.0.0-M13 release is now available for voting. Apache Tomcat 11.0.0-M13 is a milestone release of the 11.0.x branch and has been made to provide users with early access to the new features in Apache Tomcat 11.0.x so that they may provide feedback. The notable changes compared to the previous milestone include: - Correct a regression in 11.0.0-M12 that broke the Tomcat JBDC connection pool - Correct a regression in 11.0.0-M12 that broke HTTP compression For full details, see the change log: https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html Applications that run on Tomcat 9 and earlier will not run on Tomcat 11 without changes. Java EE applications designed for Tomcat 9 and earlier may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat will automatically convert them to Jakarta EE and copy them to the webapps directory. Applications using deprecated APIs may require further changes. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M13/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1460 The tag is: https://github.com/apache/tomcat/tree/11.0.0-M13 de45b3f200602b98cde70debe7f656bef0bb5fa2 The proposed 11.0.0-M13 release is: [ ] -1 Broken - do not release [X] +1 Alpha - go ahead and release as 11.0.0-M13 +1 for alpha release All unit tests pass on MacOS 13.6 x86-64. I did not test tcnative/APR/openssl. Details: OpenJDK 64-Bit Server VM (build 21+35-2513, mixed mode, sharing) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Fix version set in DLL header on Windows
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new d5dbac61e Fix version set in DLL header on Windows d5dbac61e is described below commit d5dbac61e4357ea5c5c2a434b85bafd0321e065b Author: Michael Osipov AuthorDate: Thu Oct 12 17:12:19 2023 +0200 Fix version set in DLL header on Windows --- native/NMAKEmakefile | 4 ++-- xdocs/miscellaneous/changelog.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile index 1c91b5c47..ad02d3152 100644 --- a/native/NMAKEmakefile +++ b/native/NMAKEmakefile @@ -69,7 +69,7 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32 LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32" !ENDIF -LFLAGS = $(LFLAGS) /version:1.1 +LFLAGS = $(LFLAGS) /version:1.2 LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib LFLAGS = $(LFLAGS) $(APR_LIB) !IF DEFINED(WITH_FIPS) @@ -78,7 +78,7 @@ LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib ssleay32.lib /NODEFAULTLI !IF DEFINED(OPENSSL_NEW_LIBS) LFLAGS = $(LFLAGS) libssl.lib libcrypto.lib crypt32.lib !ELSE -LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib +LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib !ENDIF !ENDIF diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index a80514dbf..5e3f2ae8f 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -38,6 +38,9 @@ Align Java source compile configuration with Tomcat. (michaelo) + + Fix version set in DLL header on Windows. (michaelo) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67538] Make use of Ant's task to enfore the mininum Java build version
https://bz.apache.org/bugzilla/show_bug.cgi?id=67538 --- Comment #7 from Michael Osipov --- Also fixed in: * tomcat-native main for 2.0.7 and onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 01/02: Add Ant version (1.10.2) requirement identical to Tomcat
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-native.git commit 4478b720db92369f08151b7976f30dabc969d2ce Author: Michael Osipov AuthorDate: Thu Oct 12 16:42:16 2023 +0200 Add Ant version (1.10.2) requirement identical to Tomcat --- build.properties.default | 3 +++ build.xml | 7 +++ xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 13 insertions(+) diff --git a/build.properties.default b/build.properties.default index f97fc6e24..dda9e6380 100644 --- a/build.properties.default +++ b/build.properties.default @@ -30,6 +30,9 @@ base.path=/usr/share/java #base.path=C:/path/to/the/repository #base.path=/usr/local +# - Build tools - +ant.version.required=1.10.2 + # - Build control flags - compile.debug=true # Do not pass -deprecation (-Xlint:deprecation) flag to javac diff --git a/build.xml b/build.xml index 3be0ed0ca..f8d6b767b 100644 --- a/build.xml +++ b/build.xml @@ -26,6 +26,13 @@ + + + + + + + diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 2dc11b1a9..e37f73976 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -49,6 +49,9 @@ Align Java source compile configuration with Tomcat. (michaelo) + + Add Ant version (1.10.2) requirement identical to Tomcat. (michaelo) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] 02/02: BZ 67538: Make use of Ant's task to enfore the mininum Java build version
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-native.git commit 82a502dab27ac12d00079ae3310387b000f7e901 Author: Michael Osipov AuthorDate: Thu Oct 12 16:13:01 2023 +0200 BZ 67538: Make use of Ant's task to enfore the mininum Java build version --- build.xml | 7 +++ xdocs/miscellaneous/changelog.xml | 4 2 files changed, 11 insertions(+) diff --git a/build.xml b/build.xml index f8d6b767b..ce1f16c48 100644 --- a/build.xml +++ b/build.xml @@ -64,6 +64,13 @@ + + + + + + + diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index e37f73976..c5ea8ce09 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -33,6 +33,10 @@ + + 67538: Make use of Ant'stask + to enfore the mininum Java build version. (michaelo) + 67615: Windows binary for version 2 has incorrect version suffix compared to the GNU autoconf version. (michaelo) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated (1f32d55d5 -> 82a502dab)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git from 1f32d55d5 Align Java source compile configuration with Tomcat new 4478b720d Add Ant version (1.10.2) requirement identical to Tomcat new 82a502dab BZ 67538: Make use of Ant's task to enfore the mininum Java build version 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 | 3 +++ build.xml | 14 ++ xdocs/miscellaneous/changelog.xml | 7 +++ 3 files changed, 24 insertions(+) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
Michael, On 10/12/23 07:56, Michael Osipov wrote: On 2023/10/12 11:46:55 Christopher Schultz wrote: Michael, On 10/12/23 06:13, micha...@apache.org wrote: 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 69143e32da BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter() I'm not sure it's worth keeping the SimpleDateFormat object around after this log statement. Consider discarding it. I thought about it before, I decided not to: * The listener runs in server scope, so it is always present for the lifetime of the JVM * The listener runs periodic task which require to create the SDF over and over again instead of sharing it per instance WDYT? I forgot it runs periodically :) Honestly, it probably doesn't matter much either way. It's not an object that will be user frequently, so holding onto it doesn't matter. But it also doesn't take up very much memory, so sure you can leave it. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add new experimental verify-release build target.
This is an automated email from the ASF dual-hosted git repository.
schultz 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 714fccd0c0 Add new experimental verify-release build target.
714fccd0c0 is described below
commit 714fccd0c0d9856cd87b4b3f17db9f8c6cc3901c
Author: schultz
AuthorDate: Thu Oct 12 07:09:35 2023 -0700
Add new experimental verify-release build target.
---
build.xml | 163 +-
1 file changed, 162 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 071091425a..10ada18129 100644
--- a/build.xml
+++ b/build.xml
@@ -2699,7 +2699,7 @@ gpg.exec=${gpg.exec}
# Java Version:${java.vm.version}
# The following is provided for information only. Builds will be repeatable
-# whether or not the build environment in consistent with this information.
+# whether or not the build environment is consistent with this information.
#
# OS: ${os.arch} ${os.name} ${os.version}
# File encoding: ${file.encoding}
@@ -4007,4 +4007,165 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
+
+
+
+
+
+
+ ${contents}
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://dist.apache.org/repos/dist/release/tomcat/tomcat-${version.major}/v${version.major}.${version.minor}.${version.build}/@{src-or-bin}/@{basefile}.sha512";
/>
+
+
+
+
+https://dist.apache.org/repos/dist/dev/tomcat/tomcat-${version.major}/v${version.major}.${version.minor}.${version.build}/@{src-or-bin}/@{basefile}.sha512";
/>
+
+
+
+
+
+
+Unable to locate release hash for @{basefile}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Signature mismatch for @{basefile}:
+
+
+
+
+
+
+
+
+
+
+This does not appear to be a copy of a released tag; no
build.properties.release file exists.
+
+
+
+
+It appears there are no build artifacts to verify. Please run 'ant release'
first.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+One or more signatures failed.
+
+
+
+
+S SS SS S
+ SS S S SS
+ SS S S SS
+ SS SS S SS
+ SSS SSS
+ SSSSS SSSSS
+ SS SSSS SS
+ SS SSSS SS
+SS S S SS
+ SSSSS SSSSS
+ S SSS SSS
+ SSSSS SSSS
+ SSSSS SSS S S SSS SSS S
+ SSSSSS SSSSS S
+ SSSSS SSSS S
+ S SSSSS SSSSS S
+ S SS SS S
+ SS SS S S SSS
+ S S SS
+ SSSSS SSSS
+ SS SSSS SSSS SS
+SSS SSS SS SSS SSS
+ SS S
+
+
+All (important) signatures are verified; the build appears to be reproducible.
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67538] Make use of Ant's task to enfore the mininum Java build version
https://bz.apache.org/bugzilla/show_bug.cgi?id=67538 Michael Osipov changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #6 from Michael Osipov --- Fixed in: - main for 11.0.0-M13 and onwards - 10.1.x for 10.1.16 and onwards - 9.0.x for 9.0.83 and onwards - 8.5.x for 8.5.96 and onwards Chris, I have addded a property for 8.5 and 9.0 to disable this check to be able to run tests with older Java versions. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: BZ 67538: Make use of Ant's task to enfore the mininum Java build version
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 1927cd1b5c BZ 67538: Make use of Ant's task to enfore the mininum Java build version 1927cd1b5c is described below commit 1927cd1b5cc8b6da4fa4bcb2d6731421a7e84b66 Author: Michael Osipov AuthorDate: Thu Oct 12 15:14:46 2023 +0200 BZ 67538: Make use of Ant's task to enfore the mininum Java build version Introduce property 'skip.build.java.version' to skip Java build check to perform tests with Java 8. --- build.xml | 10 ++ webapps/docs/changelog.xml | 8 2 files changed, 18 insertions(+) diff --git a/build.xml b/build.xml index 723be26ac5..83f3eca952 100644 --- a/build.xml +++ b/build.xml @@ -116,6 +116,16 @@ + + + + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index f64befd633..3f6cd5e504 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,6 +113,14 @@ + + + +67538: Make use of Ant'stask +to enfore the mininum Java build version. (michaelo) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: BZ 67538: Make use of Ant's task to enfore the mininum Java build version
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new cbfc9eb850 BZ 67538: Make use of Ant's task to enfore the mininum Java build version cbfc9eb850 is described below commit cbfc9eb85085cd32f2e7c23fadcf1303de46eb79 Author: Michael Osipov AuthorDate: Thu Oct 12 15:14:46 2023 +0200 BZ 67538: Make use of Ant's task to enfore the mininum Java build version --- build.xml | 7 +++ webapps/docs/changelog.xml | 8 2 files changed, 15 insertions(+) diff --git a/build.xml b/build.xml index be035680d5..ea6a2b9d52 100644 --- a/build.xml +++ b/build.xml @@ -109,6 +109,13 @@ + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index ad09a9ea3d..f13e0e0639 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,6 +113,14 @@ + + + +67538: Make use of Ant'stask +to enfore the mininum Java build version. (michaelo) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: BZ 67538: Make use of Ant's task to enfore the mininum Java build version
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 eb9913a7d7 BZ 67538: Make use of Ant's task to enfore the mininum Java build version eb9913a7d7 is described below commit eb9913a7d70522f60682728a8950e993085d1d33 Author: Michael Osipov AuthorDate: Thu Oct 12 15:14:46 2023 +0200 BZ 67538: Make use of Ant's task to enfore the mininum Java build version --- build.xml | 7 +++ webapps/docs/changelog.xml | 8 2 files changed, 15 insertions(+) diff --git a/build.xml b/build.xml index d1af5a62e2..071091425a 100644 --- a/build.xml +++ b/build.xml @@ -109,6 +109,13 @@ + + + + + + + diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index faf938bb4a..ea64cd14b3 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -113,6 +113,14 @@ + + + +67538: Make use of Ant'stask +to enfore the mininum Java build version. (michaelo) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Which release artifact should we expect to be reproducible?
All, I've been working on an "ant verify-release" target and I'm finding that in the 9.0 release -- the one I'm using as a guinea pig -- the SHA-512 hashes do not match for these artifacts: apache-tomcat-9.0.82-fulldocs.tar.gz apache-tomcat-9.0.82-src.tar.gz apache-tomcat-9.0.82-src.zip They have different file sizes. The *-src artifacts seem to be off only by a few bytes (of file size, I haven't compared the contents yet) but the fulldocs are quite different. I'm thinking that maybe these artifacts aren't expected to match 100% but I'm not entirely sure. If it's possible to get these to be reproducible, I think it would be good. I did notice that the build contains in many places and in some places we are converting to CRLF and LF in others. Sometimes we are using UTF-8 and ISO-8859-1 in others. These are always specified, so I wouldn't expect there to be a problem in these areas with reproducibility (because they are consistently inconsistent). Building the fulldocs tar looks like we do not perform a fixcrlf on all files that will go into the archive, so if Rémy built on Linux (he did) and I verified on Windows (I did) I think maybe the line-endings are the problem. Do we want these artifacts to be 100% reproducible? If so, we have a little bit of work to do. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/731 Blamelist: Christopher Schultz , Michael Osipov Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] ec3c350dd6993081408e5c8c82a0aea524bc59d5 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67538] Make use of Ant's task to enfore the mininum Java build version
https://bz.apache.org/bugzilla/show_bug.cgi?id=67538 --- Comment #5 from Michael Osipov --- (In reply to Christopher Schultz from comment #3) > (In reply to Michael Osipov from comment #2) > > > Compilation is expected to be done with Java 11, but tests can be run with > > > an earlier version, IIRC. > > > > This seems to be a good point, toolchains missing here. > > Should it go like: > > JAVA_VERSION=11 ant compile > > JAVA_VERSION=8 ant test > > ? Does one use this? > > This is what I do for 8.5: build using Java 11 and run all testing using > Java 8. > > I set JAVA_HOME and run "ant test". > > https://github.com/ChristopherSchultz/apache-tomcat-stuff/blob/master/bin/ > test-tomcat-release.sh > > > So Java 11 or bust. > > Java 11 is only required for the build. For testing you can: > > https://github.com/ChristopherSchultz/apache-tomcat-stuff/blob/master/bin/ > test-tomcat-release.sh#L269-L279 Wow, hacky. With this possible, how one enforce the build JDK version of 11 if you stil want to use 8 to test? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Align Java source compile configuration with Tomcat
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/1.2.x by this push: new 06fd25f1e Align Java source compile configuration with Tomcat 06fd25f1e is described below commit 06fd25f1e717d34d50e1938dc449540e79519277 Author: Michael Osipov AuthorDate: Thu Oct 12 14:05:42 2023 +0200 Align Java source compile configuration with Tomcat --- build.properties.default | 8 build.xml | 19 ++- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build.properties.default b/build.properties.default index 5ddd86f88..37e678139 100644 --- a/build.properties.default +++ b/build.properties.default @@ -30,10 +30,10 @@ base.path=/usr/share/java #base.path=C:/path/to/the/repository #base.path=/usr/local -compile.source=1.8 -compile.target=1.8 -compile.debug=off -compile.deprecation=on +# - Build control flags - +compile.debug=true +# Do not pass -deprecation (-Xlint:deprecation) flag to javac +compile.deprecation=false base-maven.loc=https://repo.maven.apache.org/maven2 diff --git a/build.xml b/build.xml index e7fa10232..96358892d 100644 --- a/build.xml +++ b/build.xml @@ -55,6 +55,10 @@ + + + + @@ -204,12 +208,11 @@ limitations under the License.-->"> - @@ -244,13 +247,11 @@ limitations under the License.-->"> - diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 34e0a77ef..a80514dbf 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -35,6 +35,9 @@ Drop useless compile.optimize option. (michaelo) + + Align Java source compile configuration with Tomcat. (michaelo) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Align Java source compile configuration with Tomcat
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-native.git The following commit(s) were added to refs/heads/main by this push: new 1f32d55d5 Align Java source compile configuration with Tomcat 1f32d55d5 is described below commit 1f32d55d598b99cc5cb8369944bd75f3ff9d1144 Author: Michael Osipov AuthorDate: Thu Oct 12 14:05:42 2023 +0200 Align Java source compile configuration with Tomcat --- build.properties.default | 8 build.xml | 18 -- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/build.properties.default b/build.properties.default index edc5342db..f97fc6e24 100644 --- a/build.properties.default +++ b/build.properties.default @@ -30,10 +30,10 @@ base.path=/usr/share/java #base.path=C:/path/to/the/repository #base.path=/usr/local -compile.source=11 -compile.target=11 -compile.debug=off -compile.deprecation=on +# - Build control flags - +compile.debug=true +# Do not pass -deprecation (-Xlint:deprecation) flag to javac +compile.deprecation=false base-maven.loc=https://repo.maven.apache.org/maven2 diff --git a/build.xml b/build.xml index df6ed702a..3be0ed0ca 100644 --- a/build.xml +++ b/build.xml @@ -54,6 +54,9 @@ + + + @@ -197,12 +200,10 @@ limitations under the License.-->"> - @@ -237,13 +238,10 @@ limitations under the License.-->"> - diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 88e9ed553..2dc11b1a9 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -46,6 +46,9 @@ Drop useless compile.optimize option. (michaelo) + + Align Java source compile configuration with Tomcat. (michaelo) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
On 2023/10/12 11:46:55 Christopher Schultz wrote: > Michael, > > On 10/12/23 06:13, micha...@apache.org wrote: > > 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 69143e32da BZ 67667: TLSCertificateReloadListener prints > > unreadable rendering of X509Certificate#getNotAfter() > > I'm not sure it's worth keeping the SimpleDateFormat object around after > this log statement. Consider discarding it. I thought about it before, I decided not to: * The listener runs in server scope, so it is always present for the lifetime of the JVM * The listener runs periodic task which require to create the SDF over and over again instead of sharing it per instance WDYT? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
Michael,
On 10/12/23 06:13, micha...@apache.org wrote:
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 69143e32da BZ 67667: TLSCertificateReloadListener prints unreadable
rendering of X509Certificate#getNotAfter()
I'm not sure it's worth keeping the SimpleDateFormat object around after
this log statement. Consider discarding it.
-chris
69143e32da is described below
commit 69143e32da1b51c9f2c08e280f9133175f5b8dc1
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:09:02 2023 +0200
BZ 67667: TLSCertificateReloadListener prints unreadable rendering of
X509Certificate#getNotAfter()
---
.../apache/catalina/security/TLSCertificateReloadListener.java| 4 +++-
webapps/docs/changelog.xml| 8
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
index 0596732575..3db6e286c3 100644
--- a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
+++ b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
@@ -17,6 +17,7 @@
package org.apache.catalina.security;
import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Set;
@@ -45,6 +46,7 @@ public class TLSCertificateReloadListener implements LifecycleListener {
private static final Log log = LogFactory.getLog(TLSCertificateReloadListener.class);
private static final StringManager sm =
StringManager.getManager(TLSCertificateReloadListener.class);
+private final SimpleDateFormat dateFormat = new
SimpleDateFormat("-MM-dd'T'HH:mm:ssXXX");
// Configuration
private int checkPeriod = 24 * 60 * 60;
@@ -160,7 +162,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
log.warn(sm.getString("tlsCertRenewalListener.notRenewed", connector,
sslHostConfig.getHostName(),
expiringCertificate.getSubjectX500Principal().getName(),
-
expiringCertificate.getNotAfter()));
+
dateFormat.format(expiringCertificate.getNotAfter(;
}
}
} catch (IllegalArgumentException iae) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 09b0227b59..faf938bb4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+67667: TLSCertificateReloadListener prints
unreadable
+rendering of X509Certificate#getNotAfter(). (michaelo)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch 1.2.x updated: Drop useless 'compile.optimize' option
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new 5d19eda23 Drop useless 'compile.optimize' option
5d19eda23 is described below
commit 5d19eda231c9868c927e25659632847194b80d9b
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:37:35 2023 +0200
Drop useless 'compile.optimize' option
---
build.properties.default | 5 ++---
build.xml | 1 -
xdocs/miscellaneous/changelog.xml | 5 -
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0e6f0e9a8..5ddd86f88 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -5,9 +5,9 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,6 @@ compile.source=1.8
compile.target=1.8
compile.debug=off
compile.deprecation=on
-compile.optimize=on
base-maven.loc=https://repo.maven.apache.org/maven2
diff --git a/build.xml b/build.xml
index 227cb86df..e7fa10232 100644
--- a/build.xml
+++ b/build.xml
@@ -210,7 +210,6 @@ limitations under the License.-->">
target="${compile.target}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
-optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 59dfc0394..34e0a77ef 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -32,6 +32,9 @@
+
+ Drop useless compile.optimize option. (michaelo)
+
@@ -513,7 +516,7 @@
59797: Ensure that the per thread error hash maintained by
OpenSSL is cleaned up as individual threads exit to ensure it does not
- grow too large. Patch provided by Nate Clark. (markt)
+ grow too large. Patch provided by Nate Clark. (markt)
59996: Correctly handle building tc-native on a 64-bit system
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-native] branch main updated: Drop useless 'compile.optimize' option
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-native.git
The following commit(s) were added to refs/heads/main by this push:
new 97a76c3a4 Drop useless 'compile.optimize' option
97a76c3a4 is described below
commit 97a76c3a441e1bb9f38b2e9664655b016d39d842
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:37:35 2023 +0200
Drop useless 'compile.optimize' option
---
build.properties.default | 5 ++---
build.xml | 1 -
xdocs/miscellaneous/changelog.xml | 3 +++
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index abef2f347..edc5342db 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -5,9 +5,9 @@
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,6 @@ compile.source=11
compile.target=11
compile.debug=off
compile.deprecation=on
-compile.optimize=on
base-maven.loc=https://repo.maven.apache.org/maven2
diff --git a/build.xml b/build.xml
index c511fc473..df6ed702a 100644
--- a/build.xml
+++ b/build.xml
@@ -203,7 +203,6 @@ limitations under the License.-->">
target="${compile.target}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
-optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 638eb1fc4..88e9ed553 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -43,6 +43,9 @@
67616: o.a.tomcat.jni.SSL contains useless check for old
OpenSSL version. (michaelo)
+
+ Drop useless compile.optimize option. (michaelo)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.95 [CORRECTED]
On 2023/10/12 01:32:37 Christopher Schultz wrote: > The proposed Apache Tomcat 8.5.95 release is now available for voting. > > The notable changes compared to 8.5.94 are: > > - Correct a regression in 8.5.94 that broke the Tomcat JBDC >connection pool > > - Correct a regression in 8.5.94 that broke HTTP compression > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.95/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1463 > > The tag is: > https://github.com/apache/tomcat/tree/8.5.95/ > > The proposed 8.5.95 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.5.95 (stable) +1, stable! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67667] TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
https://bz.apache.org/bugzilla/show_bug.cgi?id=67667 Michael Osipov changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Michael Osipov --- Fixed in: - main for 11.0.0-M13 and onwards - 10.1.x for 10.1.16 and onwards - 9.0.x for 9.0.83 and onwards - 8.5.x for 8.5.96 and onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new b03e642842 BZ 67667: TLSCertificateReloadListener prints unreadable
rendering of X509Certificate#getNotAfter()
b03e642842 is described below
commit b03e6428420f874463fda9a44cd0031d0579a52e
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:09:02 2023 +0200
BZ 67667: TLSCertificateReloadListener prints unreadable rendering of
X509Certificate#getNotAfter()
---
.../apache/catalina/security/TLSCertificateReloadListener.java| 4 +++-
webapps/docs/changelog.xml| 8
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
index 0596732575..3db6e286c3 100644
--- a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
+++ b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
@@ -17,6 +17,7 @@
package org.apache.catalina.security;
import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Set;
@@ -45,6 +46,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
private static final Log log =
LogFactory.getLog(TLSCertificateReloadListener.class);
private static final StringManager sm =
StringManager.getManager(TLSCertificateReloadListener.class);
+private final SimpleDateFormat dateFormat = new
SimpleDateFormat("-MM-dd'T'HH:mm:ssXXX");
// Configuration
private int checkPeriod = 24 * 60 * 60;
@@ -160,7 +162,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
log.warn(sm.getString("tlsCertRenewalListener.notRenewed", connector,
sslHostConfig.getHostName(),
expiringCertificate.getSubjectX500Principal().getName(),
-
expiringCertificate.getNotAfter()));
+
dateFormat.format(expiringCertificate.getNotAfter(;
}
}
} catch (IllegalArgumentException iae) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e4388d9f74..f64befd633 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+67667: TLSCertificateReloadListener prints
unreadable
+rendering of X509Certificate#getNotAfter(). (michaelo)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
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 ec3c350dd6 BZ 67667: TLSCertificateReloadListener prints unreadable
rendering of X509Certificate#getNotAfter()
ec3c350dd6 is described below
commit ec3c350dd6993081408e5c8c82a0aea524bc59d5
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:09:02 2023 +0200
BZ 67667: TLSCertificateReloadListener prints unreadable rendering of
X509Certificate#getNotAfter()
---
.../apache/catalina/security/TLSCertificateReloadListener.java| 4 +++-
webapps/docs/changelog.xml| 8
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
index 0596732575..3db6e286c3 100644
--- a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
+++ b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
@@ -17,6 +17,7 @@
package org.apache.catalina.security;
import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Set;
@@ -45,6 +46,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
private static final Log log =
LogFactory.getLog(TLSCertificateReloadListener.class);
private static final StringManager sm =
StringManager.getManager(TLSCertificateReloadListener.class);
+private final SimpleDateFormat dateFormat = new
SimpleDateFormat("-MM-dd'T'HH:mm:ssXXX");
// Configuration
private int checkPeriod = 24 * 60 * 60;
@@ -160,7 +162,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
log.warn(sm.getString("tlsCertRenewalListener.notRenewed", connector,
sslHostConfig.getHostName(),
expiringCertificate.getSubjectX500Principal().getName(),
-
expiringCertificate.getNotAfter()));
+
dateFormat.format(expiringCertificate.getNotAfter(;
}
}
} catch (IllegalArgumentException iae) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 13a5ac0be2..cae843b18c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+67667: TLSCertificateReloadListener prints
unreadable
+rendering of X509Certificate#getNotAfter(). (michaelo)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3ade127959 BZ 67667: TLSCertificateReloadListener prints unreadable
rendering of X509Certificate#getNotAfter()
3ade127959 is described below
commit 3ade1279599f08cfcaf6802a060a6d241988
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:09:02 2023 +0200
BZ 67667: TLSCertificateReloadListener prints unreadable rendering of
X509Certificate#getNotAfter()
---
.../apache/catalina/security/TLSCertificateReloadListener.java| 4 +++-
webapps/docs/changelog.xml| 8
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
index 0596732575..3db6e286c3 100644
--- a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
+++ b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
@@ -17,6 +17,7 @@
package org.apache.catalina.security;
import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Set;
@@ -45,6 +46,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
private static final Log log =
LogFactory.getLog(TLSCertificateReloadListener.class);
private static final StringManager sm =
StringManager.getManager(TLSCertificateReloadListener.class);
+private final SimpleDateFormat dateFormat = new
SimpleDateFormat("-MM-dd'T'HH:mm:ssXXX");
// Configuration
private int checkPeriod = 24 * 60 * 60;
@@ -160,7 +162,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
log.warn(sm.getString("tlsCertRenewalListener.notRenewed", connector,
sslHostConfig.getHostName(),
expiringCertificate.getSubjectX500Principal().getName(),
-
expiringCertificate.getNotAfter()));
+
dateFormat.format(expiringCertificate.getNotAfter(;
}
}
} catch (IllegalArgumentException iae) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2582c4adc5..ad09a9ea3d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+67667: TLSCertificateReloadListener prints
unreadable
+rendering of X509Certificate#getNotAfter(). (michaelo)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: BZ 67667: TLSCertificateReloadListener prints unreadable rendering of X509Certificate#getNotAfter()
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 69143e32da BZ 67667: TLSCertificateReloadListener prints unreadable
rendering of X509Certificate#getNotAfter()
69143e32da is described below
commit 69143e32da1b51c9f2c08e280f9133175f5b8dc1
Author: Michael Osipov
AuthorDate: Thu Oct 12 12:09:02 2023 +0200
BZ 67667: TLSCertificateReloadListener prints unreadable rendering of
X509Certificate#getNotAfter()
---
.../apache/catalina/security/TLSCertificateReloadListener.java| 4 +++-
webapps/docs/changelog.xml| 8
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
index 0596732575..3db6e286c3 100644
--- a/java/org/apache/catalina/security/TLSCertificateReloadListener.java
+++ b/java/org/apache/catalina/security/TLSCertificateReloadListener.java
@@ -17,6 +17,7 @@
package org.apache.catalina.security;
import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Set;
@@ -45,6 +46,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
private static final Log log =
LogFactory.getLog(TLSCertificateReloadListener.class);
private static final StringManager sm =
StringManager.getManager(TLSCertificateReloadListener.class);
+private final SimpleDateFormat dateFormat = new
SimpleDateFormat("-MM-dd'T'HH:mm:ssXXX");
// Configuration
private int checkPeriod = 24 * 60 * 60;
@@ -160,7 +162,7 @@ public class TLSCertificateReloadListener implements
LifecycleListener {
log.warn(sm.getString("tlsCertRenewalListener.notRenewed", connector,
sslHostConfig.getHostName(),
expiringCertificate.getSubjectX500Principal().getName(),
-
expiringCertificate.getNotAfter()));
+
dateFormat.format(expiringCertificate.getNotAfter(;
}
}
} catch (IllegalArgumentException iae) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 09b0227b59..faf938bb4a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
issues do not "pop up" wrt. others).
-->
+
+
+
+67667: TLSCertificateReloadListener prints
unreadable
+rendering of X509Certificate#getNotAfter(). (michaelo)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Increment version number for next development cycle
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 8234f4dc31 Increment version number for next development cycle 8234f4dc31 is described below commit 8234f4dc31c0db7533caa976d42170c04e87b874 Author: Michael Osipov AuthorDate: Thu Oct 12 12:03:39 2023 +0200 Increment version number for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 8fd2616b02..4722989dcc 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=95 +version.build=96 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index a6e44a1f26..99afd53698 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=8.5.95 +maven.asf.release.deploy.version=8.5.96 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index af3449284b..e4388d9f74 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.1.x updated: Increment version number for next development cycle
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.1.x by this push: new f1865eb249 Increment version number for next development cycle f1865eb249 is described below commit f1865eb2497f4855b3aa3e1340a6d42940508983 Author: Michael Osipov AuthorDate: Thu Oct 12 11:59:44 2023 +0200 Increment version number for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 40b7ec4687..3e26aa27f6 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=10 version.minor=1 -version.build=15 +version.build=16 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index ae8200046a..2e69dcce7b 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=10.1.15 +maven.asf.release.deploy.version=10.1.16 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 63b5577150..2582c4adc5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Increment version number for next development cycle
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 c3d9dbc444 Increment version number for next development cycle c3d9dbc444 is described below commit c3d9dbc4448dabe1a47c65c9d22b05eaf33861f7 Author: Michael Osipov AuthorDate: Thu Oct 12 11:54:22 2023 +0200 Increment version number for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index 8ad061797f..b5af5f53c6 100644 --- a/build.properties.default +++ b/build.properties.default @@ -33,7 +33,7 @@ version.major=11 version.minor=0 version.build=0 version.patch=0 -version.suffix=-M13 +version.suffix=-M14 version.dev=-dev # - Build tools - diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 288f82806d..310e4ac9b7 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=11.0.0-M13 +maven.asf.release.deploy.version=11.0.0-M14 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 3771afc552..09b0227b59 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.95 [CORRECTED]
On Thu, Oct 12, 2023 at 3:32 AM Christopher Schultz wrote: > > The proposed Apache Tomcat 8.5.95 release is now available for voting. > > The notable changes compared to 8.5.94 are: > > - Correct a regression in 8.5.94 that broke the Tomcat JBDC >connection pool > > - Correct a regression in 8.5.94 that broke HTTP compression > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.95/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1463 > > The tag is: > https://github.com/apache/tomcat/tree/8.5.95/ > > The proposed 8.5.95 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.95 (stable) Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67697] Unable to use tomcat-jdbc 10.1.14
https://bz.apache.org/bugzilla/show_bug.cgi?id=67697 Remy Maucherat changed: What|Removed |Added Status|NEW |RESOLVED OS||All Resolution|--- |DUPLICATE --- Comment #1 from Remy Maucherat --- *** This bug has been marked as a duplicate of bug 67664 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67664] IllegalArgumentException in ConnectionPool.getProxyConstructor
https://bz.apache.org/bugzilla/show_bug.cgi?id=67664 Remy Maucherat changed: What|Removed |Added CC||rad...@gmail.com --- Comment #4 from Remy Maucherat --- *** Bug 67697 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67697] New: Unable to use tomcat-jdbc 10.1.14
https://bz.apache.org/bugzilla/show_bug.cgi?id=67697 Bug ID: 67697 Summary: Unable to use tomcat-jdbc 10.1.14 Product: Tomcat Modules Version: unspecified Hardware: Macintosh Status: NEW Severity: regression Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: rad...@gmail.com Target Milestone: --- Created attachment 39120 --> https://bz.apache.org/bugzilla/attachment.cgi?id=39120&action=edit Example app reproducing error Wanted to update to tomcat-jdbc from 10.1.13 to 10.1.14 via renovate plugin in github but our tests started failing with exception java.lang.IllegalArgumentException: org.apache.tomcat.jdbc.pool.PooledConnection is not an interface Attached is simple example with gradle, hibernate, h2 db and tomcat-jdbc pool. As soon as we switch to 10.1.13 then the error goes away. Thanks, Radovan -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.95 [CORRECTED]
> On Oct 12, 2023, at 09:32, Christopher Schultz > wrote: > > The proposed Apache Tomcat 8.5.95 release is now available for voting. > > The notable changes compared to 8.5.94 are: > > - Correct a regression in 8.5.94 that broke the Tomcat JBDC > connection pool > > - Correct a regression in 8.5.94 that broke HTTP compression > > Along with lots of other bug fixes and improvements. > > For full details, see the changelog: > https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.95/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1463 > > The tag is: > https://github.com/apache/tomcat/tree/8.5.95/ > > The proposed 8.5.95 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 8.5.95 (stable) Tests pass. Han > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 10.1.15
On Thu, Oct 12, 2023 at 2:50 AM Christopher Schultz wrote: > > The proposed Apache Tomcat 10.1.15 release is now available for > voting. > > The notable changes compared to 10.1.14 are: > > - Correct a regression in 10.1.14 that broke the Tomcat JBDC >connection pool > > - Correct a regression in 10.1.14 that broke HTTP compression > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.15/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1462 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.15 > bd69455d3331a153c411b6f1ac5e434bed06f3ce > > The proposed 10.1.15 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 10.1.15 Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
