Re: (tomcat) branch main updated: Work around available tricks
On 29/01/2025 09:56, r...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. remm 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 e1cde6f020 Work around available tricks e1cde6f020 is described below commit e1cde6f02080d4d9346d3e401f1e3c5c739eb14e Author: remm AuthorDate: Wed Jan 29 10:56:09 2025 +0100 Work around available tricks available() needs to be called even though the first read returned 0 bytes. Going through everything it seems "normal" and there is no real workaround. Thanks for the test case. The one thing that doesn't look quite right is that isReady() returns true but then we read zero bytes. I need to re-read the Servlet spec and Javadoc around non-blocking reads to remind myself exactly what the expected behaviour is. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69552] Performance regression in MessageBytes.toBytes() when using non-default charset
https://bz.apache.org/bugzilla/show_bug.cgi?id=69552 --- Comment #5 from John Engebretson --- Thank you - my forked repo doesn't have it for some reason, despite syncing. Time to wipe it out and recreate. :( Nice to see you found the same behavior. Clearly UTF_8 can't go to the fast path; I'll chew on this a little while longer to see if there are any other optimizations available. -- 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 69479] The HTTP2 header data is confused in H2C, resulting in parsing failure
https://bz.apache.org/bugzilla/show_bug.cgi?id=69479 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #7 from Mark Thomas --- Two months. No response. Resolve as Works for Me. -- 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 69526] Certificate renewal issue while uplifting tomcat from 10.1.16 to 10.1.17
https://bz.apache.org/bugzilla/show_bug.cgi?id=69526 --- Comment #2 from Mark Thomas --- There is in sufficient information in this report for the Tomcat community to recreate the issue. Without sufficient information, this issue will eventually be resolved as invalid. -- 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: [PR] log ip [tomcat]
Dmole commented on PR #811:
URL: https://github.com/apache/tomcat/pull/811#issuecomment-2621844338
> The access log is where I'd expect the underlying requirement to be
handled.
Is there a way to log connectionId in the access log with something like
%{xxx}r ?
Is the access log is guaranteed to get output for any packet that could
cause an error to log ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) branch main updated: Work around available tricks
On Wed, Jan 29, 2025 at 1:14 PM Mark Thomas wrote: > > On 29/01/2025 09:56, r...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > > > remm 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 e1cde6f020 Work around available tricks > > e1cde6f020 is described below > > > > commit e1cde6f02080d4d9346d3e401f1e3c5c739eb14e > > Author: remm > > AuthorDate: Wed Jan 29 10:56:09 2025 +0100 > > > > Work around available tricks > > > > available() needs to be called even though the first read returned 0 > > bytes. > > Going through everything it seems "normal" and there is no real > > workaround. > > Thanks for the test case. > > The one thing that doesn't look quite right is that isReady() returns > true but then we read zero bytes. I need to re-read the Servlet spec and > Javadoc around non-blocking reads to remind myself exactly what the > expected behaviour is. Here onDataAvailable gets called but there are 0 bytes to read. After that the problem is that the user still has to call available/isReady, which would return 0 again. Since available/isReady is not called first I would say there's not much to fix (I did make changes that I have yet to commit to handle the chunk headers) even if it returns > 0 despite not having bytes (worst case would be a second zero bytes read). Is this really a problem and unexpected ? The TLS API is a bit the same, so IMO it's simply the usual non blocking IO API problems. So for 69545, there's no reproduction (unless it's caused by not calling available/isReady after a zero bytes read). I still don't think the code changes in available() are causing a regression since they don't affect this scenario. Rémy > Mark > > > - > 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: (tomcat) branch main updated: Work around available tricks
On 29/01/2025 12:50, Rémy Maucherat wrote: On Wed, Jan 29, 2025 at 1:14 PM Mark Thomas wrote: On 29/01/2025 09:56, r...@apache.org wrote: This is an automated email from the ASF dual-hosted git repository. remm 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 e1cde6f020 Work around available tricks e1cde6f020 is described below commit e1cde6f02080d4d9346d3e401f1e3c5c739eb14e Author: remm AuthorDate: Wed Jan 29 10:56:09 2025 +0100 Work around available tricks available() needs to be called even though the first read returned 0 bytes. Going through everything it seems "normal" and there is no real workaround. Thanks for the test case. The one thing that doesn't look quite right is that isReady() returns true but then we read zero bytes. I need to re-read the Servlet spec and Javadoc around non-blocking reads to remind myself exactly what the expected behaviour is. Here onDataAvailable gets called but there are 0 bytes to read. Agreed. Because while there are bytes on the wire, they are part of the chunk header. So data is read but it is effectively swallowed by the ChunkedInputFilter and the application sees a zero byte read. After that the problem is that the user still has to call available/isReady, which would return 0 again. Since available/isReady is not called first I would say there's not much to fix (I did make changes that I have yet to commit to handle the chunk headers) even if it returns > 0 despite not having bytes (worst case would be a second zero bytes read). Is this really a problem and unexpected ? The TLS API is a bit the same, so IMO it's simply the usual non blocking IO API problems. Having re-read the Javadoc for ServletInputStream (it was clarified for Servlet 6.1 / Tomcat 11) I agree with you. After a read() that returns anything other than -1 to indicate EOF - including 0 - the user/application has to call isReady(). The test case wasn't doing that hence it was a bug in the test case. So for 69545, there's no reproduction (unless it's caused by not calling available/isReady after a zero bytes read). Which would be an application bug. I still don't think the code changes in available() are causing a regression since they don't affect this scenario. In theory it should be possible to refactor things so the application doesn't see a zero byte read in this case but that would be a huge refactoring for little to no benefit given that applications should be making the necessary call to isReady() anyway. There zero byte read might be unexpected but there is nothing in the Javadoc that prevents it as a result of isReady() returning true or onDataAvailable() firing. This one might need redirecting to the Spring team. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Work around available tricks
This is an automated email from the ASF dual-hosted git repository.
remm 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 e1cde6f020 Work around available tricks
e1cde6f020 is described below
commit e1cde6f02080d4d9346d3e401f1e3c5c739eb14e
Author: remm
AuthorDate: Wed Jan 29 10:56:09 2025 +0100
Work around available tricks
available() needs to be called even though the first read returned 0
bytes.
Going through everything it seems "normal" and there is no real
workaround.
---
.../http11/filters/TestChunkedInputFilter.java | 33 +++---
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 225a84fee7..86071ad20d 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -839,22 +839,23 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
byte[] buf = new byte[1024];
do {
int n = is.read(buf);
-if (n <= 0) {
+if (n < 0) {
break;
+} else if (n > 0) {
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+/*
+ * After the first line, look for a pause of
at least 800ms between reads.
+ */
+if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+pauseCount++;
+}
+}
+lastRead = thisRead;
+lineCount++;
}
-String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
-Assert.assertTrue(line.length() > 0);
-long thisRead = System.nanoTime();
-if (lineCount > 0) {
- /*
-* After the first line, look for a pause of at
least 800ms between reads.
-*/
- if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
- pauseCount++;
- }
-}
-lastRead = thisRead;
-lineCount++;
} while (is.isReady());
}
@@ -965,7 +966,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
"DATA01\n", SimpleHttpClient.CRLF +
-"7"/*, */ + SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
@@ -973,7 +974,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
"DATA04\n", SimpleHttpClient.CRLF +
-"13" + SimpleHttpClient.CRLF/*, */ +
+"13" + SimpleHttpClient.CRLF,
"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
"0" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF};
-
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: Better documentation for SSLHostConfig.truststoreProvider default
This is an automated email from the ASF dual-hosted git repository. markt 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 a45e03e550 Better documentation for SSLHostConfig.truststoreProvider default a45e03e550 is described below commit a45e03e55059c6d2b40e70de7f7f7c4d3eb73804 Author: Mark Thomas AuthorDate: Wed Jan 29 09:57:10 2025 + Better documentation for SSLHostConfig.truststoreProvider default --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 9 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 036519edb7..8ac8af009e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -244,6 +244,11 @@ mapperDirectoryRedirectEnabled to true. (markt) + +Documentation. Better document the default for the +truststoreProvider attribute of a +SSLHostConfig element. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index ecd31b7e24..9516af68aa 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1481,10 +1481,11 @@ The name of the truststore provider to be used for the server certificate. The default is the value of the javax.net.ssl.trustStoreProvider system property. If - that property is null, the value of keystoreProvider is used - as the default. If neither this attribute, the default system property nor - keystoreProvider is set, the list of registered providers is - traversed in preference order and the first provider that supports the + that property is null and a single certificate has been configured for + this TLS virtual host then default will be the the value of + keystoreProvider of the single certificate. If none of these + identify a default, the list of registered providers is traversed in + preference order and the first provider that supports the truststoreType is used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69527] Resource missing caused by mishandling of the cachedContentLength value in tomcat cache
https://bz.apache.org/bugzilla/show_bug.cgi?id=69527 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED --- Comment #18 from Mark Thomas --- No response to the background thread question. I am going to assume that this issue is now resolved. -- 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 main updated (0c4af7ea19 -> ff49f19252)
This is an automated email from the ASF dual-hosted git repository. dsoumis pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 0c4af7ea19 Better documentation for SSLHostConfig.truststoreProvider default add ff49f19252 Add ParameterLimitValve to enforce request parameter limits for specific URLs (#753) No new revisions were added by this update. Summary of changes: java/org/apache/catalina/connector/Request.java| 23 +- .../apache/catalina/valves/LocalStrings.properties | 6 + .../catalina/valves/ParameterLimitValve.java | 265 + .../catalina/session/TestPersistentManager.java| 2 +- .../catalina/valves/TestParameterLimitValve.java | 428 + test/org/apache/catalina/valves/TestSSLValve.java | 70 +++- webapps/docs/changelog.xml | 5 + webapps/docs/config/valve.xml | 43 +++ 8 files changed, 823 insertions(+), 19 deletions(-) create mode 100644 java/org/apache/catalina/valves/ParameterLimitValve.java create mode 100644 test/org/apache/catalina/valves/TestParameterLimitValve.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Add ParameterLimitValve to enforce request parameter limits for specific URLs [tomcat]
dsoumis merged PR #753: URL: https://github.com/apache/tomcat/pull/753 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69552] Performance regression in MessageBytes.toBytes() when using non-default charset
https://bz.apache.org/bugzilla/show_bug.cgi?id=69552 --- Comment #3 from John Engebretson --- Thank you, that explains ISO_8859_1 vs. UTF_8. Where can I find TestMessageBytesPerformance.java? -- 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 69552] Performance regression in MessageBytes.toBytes() when using non-default charset
https://bz.apache.org/bugzilla/show_bug.cgi?id=69552 --- Comment #4 from Mark Thomas --- https://github.com/apache/tomcat/blob/9.0.x/test/org/apache/tomcat/util/buf/TestMessageBytesPerformance.java -- 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: (tomcat) branch main updated: Work around available tricks
On Wed, Jan 29, 2025 at 2:05 PM Mark Thomas wrote: > > On 29/01/2025 12:50, Rémy Maucherat wrote: > > On Wed, Jan 29, 2025 at 1:14 PM Mark Thomas wrote: > >> > >> On 29/01/2025 09:56, r...@apache.org wrote: > >>> This is an automated email from the ASF dual-hosted git repository. > >>> > >>> remm 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 e1cde6f020 Work around available tricks > >>> e1cde6f020 is described below > >>> > >>> commit e1cde6f02080d4d9346d3e401f1e3c5c739eb14e > >>> Author: remm > >>> AuthorDate: Wed Jan 29 10:56:09 2025 +0100 > >>> > >>> Work around available tricks > >>> > >>> available() needs to be called even though the first read returned 0 > >>> bytes. > >>> Going through everything it seems "normal" and there is no real > >>> workaround. > >> > >> Thanks for the test case. > >> > >> The one thing that doesn't look quite right is that isReady() returns > >> true but then we read zero bytes. I need to re-read the Servlet spec and > >> Javadoc around non-blocking reads to remind myself exactly what the > >> expected behaviour is. > > > > Here onDataAvailable gets called but there are 0 bytes to read. > > Agreed. Because while there are bytes on the wire, they are part of the > chunk header. So data is read but it is effectively swallowed by the > ChunkedInputFilter and the application sees a zero byte read. > > > After > > that the problem is that the user still has to call available/isReady, > > which would return 0 again. Since available/isReady is not called > > first I would say there's not much to fix (I did make changes that I > > have yet to commit to handle the chunk headers) even if it returns > 0 > > despite not having bytes (worst case would be a second zero bytes > > read). > > Is this really a problem and unexpected ? The TLS API is a bit the > > same, so IMO it's simply the usual non blocking IO API problems. > > Having re-read the Javadoc for ServletInputStream (it was clarified for > Servlet 6.1 / Tomcat 11) I agree with you. After a read() that returns > anything other than -1 to indicate EOF - including 0 - the > user/application has to call isReady(). The test case wasn't doing that > hence it was a bug in the test case. > > > So for 69545, there's no reproduction (unless it's caused by not > > calling available/isReady after a zero bytes read). > > Which would be an application bug. > > > I still don't > > think the code changes in available() are causing a regression since > > they don't affect this scenario. > > In theory it should be possible to refactor things so the application > doesn't see a zero byte read in this case but that would be a huge > refactoring for little to no benefit given that applications should be > making the necessary call to isReady() anyway. There zero byte read > might be unexpected but there is nothing in the Javadoc that prevents it > as a result of isReady() returning true or onDataAvailable() firing. +1 I'll probably try (again) a refactoring, but later. > This one might need redirecting to the Spring team. We would need a test case. i'll add a comment to the BZ, since I doubt the reporter is reading the dev list. Rémy > Mark > > > - > 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
[Bug 69545] Issue Posting a huge content with header transfer-encoding chunked not working from 10.1.29 version of tomcat in spring cloud gateway application using reactive webflux
https://bz.apache.org/bugzilla/show_bug.cgi?id=69545
--- Comment #13 from Remy Maucherat ---
The scenario I found involved not calling available() properly. In the end I
haven't found a regression or new issue.
Basically the code in the ReadListener has to be:
do {
int n = is.read(buf);
if (n < 0) { // == -1 is ok too
break;
}
// Do stuff
} while (is.isReady());
read returning 0 is always ok, and it needs to loop while isReady (even if read
keeps returning 0 bytes).
Not error prone at all ...
Please provide a test case to verify what is actually happening.
--
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 69556] SPAM SPAM SPAM SPAM
https://bz.apache.org/bugzilla/show_bug.cgi?id=69556 Chuck Caldarale changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID Summary|https://safehealthpharmacy. |SPAM SPAM SPAM SPAM |com | -- 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 69556] SPAM SPAM SPAM SPAM
https://bz.apache.org/bugzilla/show_bug.cgi?id=69556 --- Comment #2 from Chuck Caldarale --- The content of attachment 39985 has been deleted for the following reason: Spam -- 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 69552] Performance regression in MessageBytes.toBytes() when using non-default charset
https://bz.apache.org/bugzilla/show_bug.cgi?id=69552 --- Comment #2 from Mark Thomas --- The fast path only works because of the one to one direct mapping of bytes to characters in ISO_8859_1. That doesn't apply to UTF-8. See also TestMessageBytesPerformance and the note re changes in Java 16 onwards. Just from looking at the code for that test and the test case attached to this bug, I suspect there are two parts to this: - the efficiency of the conversion processes - the overhead of the fast vs slow path I don't see how UTF-8 could be moved to the fast path given there isn't a one to one direct mapping between bytes and characters for UTF-8. -- 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 69553] New: Visit Your Dream is a trusted tour operator for Char Dham Yatra, offering seamless packages to Badrinath, Kedarnath, Yamunotri, and Gangotri with safe transport, quality stays, and ex
https://bz.apache.org/bugzilla/show_bug.cgi?id=69553 Bug ID: 69553 Summary: Visit Your Dream is a trusted tour operator for Char Dham Yatra, offering seamless packages to Badrinath, Kedarnath, Yamunotri, and Gangotri with safe transport, quality stays, and expert guidance for a hassle-free pilgrimage. Product: Tomcat Native Version: 2.0.8 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: visityourdrea...@gmail.com Target Milestone: --- Created attachment 39984 --> https://bz.apache.org/bugzilla/attachment.cgi?id=39984&action=edit Visit Your Dream is a trusted tour operator for Char Dham Yatra, offering seamless packages to Badrinath, Kedarnath, Yamunotri, and Gangotri with safe transport, quality stays, and expert guidance for Visit Your Dream is a trusted tour operator for Char Dham Yatra, offering expertly crafted pilgrimage packages to Badrinath, Kedarnath, Yamunotri, and Gangotri. Our dedicated team ensures a seamless and enriching journey with services including comfortable transport, quality accommodations, and local guidance. We focus on delivering safe, hassle-free, and spiritually fulfilling experiences tailored to meet your needs. With years of expertise, we are committed to making your Char Dham Yatra memorable and meaningful. Choose Visit Your Dream for a well-organized, stress-free pilgrimage journey that lets you focus on devotion and tranquility. https://visityourdream.in/ -- 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: [PR] log ip [tomcat]
markt-asf commented on code in PR #811:
URL: https://github.com/apache/tomcat/pull/811#discussion_r1933498993
##
java/org/apache/coyote/http2/Http2Parser.java:
##
@@ -327,7 +329,7 @@ protected void readSettingsFrame(int flags, int
payloadSize, ByteBuffer buffer)
long value = ByteUtil.getFourBytes(setting, 2);
Setting key = Setting.valueOf(id);
if (key == Setting.UNKNOWN) {
-log.warn(sm.getString("connectionSettings.unknown",
connectionId, Integer.toString(id),
+log.warn(sm.getString("connectionSettings.unknown", rip +
"_" + connectionId, Integer.toString(id),
Long.toString(value)));
Review Comment:
The right way to add information to a log message is by adding an additional
argument to the i18n string.
##
java/org/apache/coyote/http2/Http2UpgradeHandler.java:
##
@@ -202,9 +201,19 @@ public void init(WebConnection webConnection) {
queuedRunnable = new ConcurrentLinkedQueue<>();
}
-parser = getParser(connectionId);
-
Stream stream = null;
+String rip = "-";
+if (webConnection != null) {
+try {
+stream = getStream(1, true);
+rip =
stream.getCoyoteRequest().getRequestProcessor().getRemoteAddr();
+ } catch (Http2Exception e) {
+throw new
ProtocolException(sm.getString("upgradeHandler.upgrade.fail", connectionId));
+}
+}
+
+parser = getParser(connectionId, rip);
+
Review Comment:
Duplicates code later in the method.
##
java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java:
##
@@ -82,7 +82,7 @@ public void failed(Throwable t, Void attachment) {
};
@Override
-protected Http2Parser getParser(String connectionId) {
+protected Http2Parser getParser(String connectionId, String rip) {
return new Http2AsyncParser(connectionId, this, this, socketWrapper,
this);
Review Comment:
Fails to compile
##
java/org/apache/coyote/http2/Http2UpgradeHandler.java:
##
@@ -227,7 +236,8 @@ public void init(WebConnection webConnection) {
long value = ByteUtil.getFourBytes(settings, (i * 6) + 2);
Setting key = Setting.valueOf(id);
if (key == Setting.UNKNOWN) {
-log.warn(sm.getString("connectionSettings.unknown",
connectionId, Integer.toString(id),
+String rip =
stream.getCoyoteRequest().getRequestProcessor().getRemoteAddr();
+log.warn(sm.getString("connectionSettings.unknown",
rip + "_" + connectionId, Integer.toString(id),
Long.toString(value)));
Review Comment:
Doesn't compile.
##
java/org/apache/coyote/http2/Http2AsyncParser.java:
##
@@ -38,7 +38,7 @@ class Http2AsyncParser extends Http2Parser {
private volatile Throwable error = null;
Http2AsyncParser(String connectionId, Input input, Output output,
SocketWrapperBase socketWrapper,
-Http2AsyncUpgradeHandler upgradeHandler) {
+Http2AsyncUpgradeHandler upgradeHandler,String rip) {
super(connectionId, input, output);
Review Comment:
Failed to compile
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/1249 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 39348d8ac4e76677b15a4c60804a34d01adda32a 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: 2 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
Re: [PR] Forward toString in MessageBytes toStringType [tomcat]
adwsingh commented on PR #812: URL: https://github.com/apache/tomcat/pull/812#issuecomment-2623018669 My use case is I want to avoid having to convert byte to String on repeated invocation of [MimeHeaders.getHeader](https://github.com/apache/tomcat/blob/main/java/org/apache/tomcat/util/http/MimeHeaders.java#L383). If this change is not acceptable I can change the getHeader to invoke `mh.toStringType` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Forward toString in MessageBytes toStringType [tomcat]
rmaucher closed pull request #812: Forward toString in MessageBytes toStringType URL: https://github.com/apache/tomcat/pull/812 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Forward toString in MessageBytes toStringType [tomcat]
rmaucher commented on PR #812: URL: https://github.com/apache/tomcat/pull/812#issuecomment-2623028916 toStringType changes the MB type. toString does not. This should indicate that it is wise to not change the MB type in some cases. There's a long history with these changes, you should look into the git history. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Forward toString in MessageBytes toStringType [tomcat]
adwsingh commented on PR #812: URL: https://github.com/apache/tomcat/pull/812#issuecomment-2623032339 @rmaucher in that case is the proposal in my comment acceptable? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Forward toString in MessageBytes toStringType [tomcat]
adwsingh commented on PR #812: URL: https://github.com/apache/tomcat/pull/812#issuecomment-2623032404 @rmaucher in that case is the proposal in my comment acceptable? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated (df30958b3d -> 86862a7544)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from df30958b3d Update JSign to 7.0 new 503b88b7fe Add testcase for BZ69545 new 86862a7544 Work around available tricks 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: .../http11/filters/TestChunkedInputFilter.java | 121 - 1 file changed, 117 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Add testcase for BZ69545
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 503b88b7fe4068954de72e86caad42c8fe96421f
Author: remm
AuthorDate: Tue Jan 28 21:05:16 2025 +0100
Add testcase for BZ69545
Still investigating.
---
.../http11/filters/TestChunkedInputFilter.java | 120 -
1 file changed, 116 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index c1866d9634..225a84fee7 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -24,7 +24,10 @@ import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -33,6 +36,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
@@ -816,6 +820,63 @@ public class TestChunkedInputFilter extends TomcatBaseTest
{
}
+private static class NonBlockingReadLineServlet extends HttpServlet {
+private static final long serialVersionUID = 1L;
+
+int lineCount = 0;
+int pauseCount = 0;
+long lastRead = 0;
+
+@Override
+protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+final AsyncContext ctx = req.startAsync();
+ServletInputStream is = req.getInputStream();
+is.setReadListener(new ReadListener() {
+@Override
+public void onDataAvailable() throws IOException {
+byte[] buf = new byte[1024];
+do {
+int n = is.read(buf);
+if (n <= 0) {
+break;
+}
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+ /*
+* After the first line, look for a pause of at
least 800ms between reads.
+*/
+ if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+ pauseCount++;
+ }
+}
+lastRead = thisRead;
+lineCount++;
+} while (is.isReady());
+}
+
+@Override
+public void onAllDataRead() throws IOException {
+resp.setContentType("text/plain");
+PrintWriter pw = resp.getWriter();
+pw.write(Integer.toString(lineCount) + "," +
Integer.toString(pauseCount));
+ctx.complete();
+}
+
+@Override
+public void onError(Throwable throwable) {
+throwable.printStackTrace();
+}
+
+});
+
+}
+}
+
+
private static class ReadLineClient extends SimpleHttpClient {
ReadLineClient(int port) {
@@ -852,17 +913,68 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
"Connection: close" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
-"DATA01\n" + SimpleHttpClient.CRLF,
-"7" + SimpleHttpClient.CRLF +
+"DATA01\n", SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
"DATA03\n" + SimpleHttpClient.CR,
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
-"DATA04\n" + SimpleHttpClient.CRLF,
+"DATA04\n", SimpleHttpClient.CRLF +
+"13" + SimpleHttpClient.CRLF,
+"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF};
+
+ReadLineClient client = new
ReadLineClient(tomcat.getConnector().getLocalPort());
+client.setRequest(req
(tomcat) 02/02: Work around available tricks
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 08206671035f05e205806140b11c10c6eb3ca5c3
Author: remm
AuthorDate: Wed Jan 29 10:56:09 2025 +0100
Work around available tricks
available() needs to be called even though the first read returned 0
bytes.
Going through everything it seems "normal" and there is no real
workaround.
---
.../http11/filters/TestChunkedInputFilter.java | 33 +++---
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 4ed2644799..4fa067dba3 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -839,22 +839,23 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
byte[] buf = new byte[1024];
do {
int n = is.read(buf);
-if (n <= 0) {
+if (n < 0) {
break;
+} else if (n > 0) {
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+/*
+ * After the first line, look for a pause of
at least 800ms between reads.
+ */
+if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+pauseCount++;
+}
+}
+lastRead = thisRead;
+lineCount++;
}
-String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
-Assert.assertTrue(line.length() > 0);
-long thisRead = System.nanoTime();
-if (lineCount > 0) {
- /*
-* After the first line, look for a pause of at
least 800ms between reads.
-*/
- if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
- pauseCount++;
- }
-}
-lastRead = thisRead;
-lineCount++;
} while (is.isReady());
}
@@ -965,7 +966,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
"DATA01\n", SimpleHttpClient.CRLF +
-"7"/*, */ + SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
@@ -973,7 +974,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
"DATA04\n", SimpleHttpClient.CRLF +
-"13" + SimpleHttpClient.CRLF/*, */ +
+"13" + SimpleHttpClient.CRLF,
"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
"0" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF};
-
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 (39348d8ac4 -> 0820667103)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 39348d8ac4 Update JSign to 7.0 new 937f65c775 Add testcase for BZ69545 new 0820667103 Work around available tricks 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: .../http11/filters/TestChunkedInputFilter.java | 121 - 1 file changed, 117 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Work around available tricks
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 86862a7544bded47734b565e19de5f1b7e8f5ea1
Author: remm
AuthorDate: Wed Jan 29 10:56:09 2025 +0100
Work around available tricks
available() needs to be called even though the first read returned 0
bytes.
Going through everything it seems "normal" and there is no real
workaround.
---
.../http11/filters/TestChunkedInputFilter.java | 33 +++---
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 225a84fee7..86071ad20d 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -839,22 +839,23 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
byte[] buf = new byte[1024];
do {
int n = is.read(buf);
-if (n <= 0) {
+if (n < 0) {
break;
+} else if (n > 0) {
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+/*
+ * After the first line, look for a pause of
at least 800ms between reads.
+ */
+if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+pauseCount++;
+}
+}
+lastRead = thisRead;
+lineCount++;
}
-String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
-Assert.assertTrue(line.length() > 0);
-long thisRead = System.nanoTime();
-if (lineCount > 0) {
- /*
-* After the first line, look for a pause of at
least 800ms between reads.
-*/
- if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
- pauseCount++;
- }
-}
-lastRead = thisRead;
-lineCount++;
} while (is.isReady());
}
@@ -965,7 +966,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
"DATA01\n", SimpleHttpClient.CRLF +
-"7"/*, */ + SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
@@ -973,7 +974,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
"DATA04\n", SimpleHttpClient.CRLF +
-"13" + SimpleHttpClient.CRLF/*, */ +
+"13" + SimpleHttpClient.CRLF,
"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
"0" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Work around available tricks
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0871cda88209cc372f9f8c0a3bba419f9f2b344d
Author: remm
AuthorDate: Wed Jan 29 10:56:09 2025 +0100
Work around available tricks
available() needs to be called even though the first read returned 0
bytes.
Going through everything it seems "normal" and there is no real
workaround.
---
.../http11/filters/TestChunkedInputFilter.java | 33 +++---
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 225a84fee7..86071ad20d 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -839,22 +839,23 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
byte[] buf = new byte[1024];
do {
int n = is.read(buf);
-if (n <= 0) {
+if (n < 0) {
break;
+} else if (n > 0) {
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+/*
+ * After the first line, look for a pause of
at least 800ms between reads.
+ */
+if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+pauseCount++;
+}
+}
+lastRead = thisRead;
+lineCount++;
}
-String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
-Assert.assertTrue(line.length() > 0);
-long thisRead = System.nanoTime();
-if (lineCount > 0) {
- /*
-* After the first line, look for a pause of at
least 800ms between reads.
-*/
- if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
- pauseCount++;
- }
-}
-lastRead = thisRead;
-lineCount++;
} while (is.isReady());
}
@@ -965,7 +966,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
"DATA01\n", SimpleHttpClient.CRLF +
-"7"/*, */ + SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
@@ -973,7 +974,7 @@ public class TestChunkedInputFilter extends TomcatBaseTest {
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
"DATA04\n", SimpleHttpClient.CRLF +
-"13" + SimpleHttpClient.CRLF/*, */ +
+"13" + SimpleHttpClient.CRLF,
"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
"0" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF};
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Add testcase for BZ69545
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 937f65c775de40c75ea8f3ad5ab514a90a71977c
Author: remm
AuthorDate: Tue Jan 28 21:05:16 2025 +0100
Add testcase for BZ69545
Still investigating.
---
.../http11/filters/TestChunkedInputFilter.java | 120 -
1 file changed, 116 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index 2c51060e9c..4ed2644799 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -24,7 +24,10 @@ import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
+import javax.servlet.AsyncContext;
+import javax.servlet.ReadListener;
import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -33,6 +36,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
@@ -816,6 +820,63 @@ public class TestChunkedInputFilter extends TomcatBaseTest
{
}
+private static class NonBlockingReadLineServlet extends HttpServlet {
+private static final long serialVersionUID = 1L;
+
+int lineCount = 0;
+int pauseCount = 0;
+long lastRead = 0;
+
+@Override
+protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+final AsyncContext ctx = req.startAsync();
+ServletInputStream is = req.getInputStream();
+is.setReadListener(new ReadListener() {
+@Override
+public void onDataAvailable() throws IOException {
+byte[] buf = new byte[1024];
+do {
+int n = is.read(buf);
+if (n <= 0) {
+break;
+}
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+ /*
+* After the first line, look for a pause of at
least 800ms between reads.
+*/
+ if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+ pauseCount++;
+ }
+}
+lastRead = thisRead;
+lineCount++;
+} while (is.isReady());
+}
+
+@Override
+public void onAllDataRead() throws IOException {
+resp.setContentType("text/plain");
+PrintWriter pw = resp.getWriter();
+pw.write(Integer.toString(lineCount) + "," +
Integer.toString(pauseCount));
+ctx.complete();
+}
+
+@Override
+public void onError(Throwable throwable) {
+throwable.printStackTrace();
+}
+
+});
+
+}
+}
+
+
private static class ReadLineClient extends SimpleHttpClient {
ReadLineClient(int port) {
@@ -852,17 +913,68 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
"Connection: close" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
-"DATA01\n" + SimpleHttpClient.CRLF,
-"7" + SimpleHttpClient.CRLF +
+"DATA01\n", SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
"DATA03\n" + SimpleHttpClient.CR,
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
-"DATA04\n" + SimpleHttpClient.CRLF,
+"DATA04\n", SimpleHttpClient.CRLF +
+"13" + SimpleHttpClient.CRLF,
+"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF};
+
+ReadLineClient client = new
ReadLineClient(tomcat.getConnector().getLocalPort());
+client.setRequest(request);
+
+
(tomcat) branch 10.1.x updated (1eb95846d6 -> 0871cda882)
This is an automated email from the ASF dual-hosted git repository. remm pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 1eb95846d6 Update JSign to 7.0 new dd342aac6b Add testcase for BZ69545 new 0871cda882 Work around available tricks 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: .../http11/filters/TestChunkedInputFilter.java | 121 - 1 file changed, 117 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Invoke toStringType instead of toString in MimeHeaders [tomcat]
adwsingh opened a new pull request, #813: URL: https://github.com/apache/tomcat/pull/813 This is to avoid having to convert from Bytes to String again for the same header. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-11.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/112/builds/1490 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 11.0.x] 86862a7544bded47734b565e19de5f1b7e8f5ea1 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 compile: 1 shell_7: 0 shell_8: 0 shell_9: 0 shell_10: 0 Rsync docs to nightlies.apache.org: 0 shell_11: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_12: 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
[PR] Forward toString in MessageBytes toStringType [tomcat]
adwsingh opened a new pull request, #812: URL: https://github.com/apache/tomcat/pull/812 toString doesn't check if the value hasn't been cached and toStringType does it. I couldn't find a reason not to do the same for toString -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1588 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 0871cda88209cc372f9f8c0a3bba419f9f2b344d 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: 2 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
(tomcat) 01/02: Add testcase for BZ69545
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dd342aac6bd3b56dc7e4a18bc033056de1f05cff
Author: remm
AuthorDate: Tue Jan 28 21:05:16 2025 +0100
Add testcase for BZ69545
Still investigating.
---
.../http11/filters/TestChunkedInputFilter.java | 120 -
1 file changed, 116 insertions(+), 4 deletions(-)
diff --git a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
index c1866d9634..225a84fee7 100644
--- a/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
+++ b/test/org/apache/coyote/http11/filters/TestChunkedInputFilter.java
@@ -24,7 +24,10 @@ import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -33,6 +36,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.TesterServlet;
import org.apache.catalina.startup.Tomcat;
@@ -816,6 +820,63 @@ public class TestChunkedInputFilter extends TomcatBaseTest
{
}
+private static class NonBlockingReadLineServlet extends HttpServlet {
+private static final long serialVersionUID = 1L;
+
+int lineCount = 0;
+int pauseCount = 0;
+long lastRead = 0;
+
+@Override
+protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+
+final AsyncContext ctx = req.startAsync();
+ServletInputStream is = req.getInputStream();
+is.setReadListener(new ReadListener() {
+@Override
+public void onDataAvailable() throws IOException {
+byte[] buf = new byte[1024];
+do {
+int n = is.read(buf);
+if (n <= 0) {
+break;
+}
+String line = new String(buf, 0, n,
StandardCharsets.UTF_8);
+Assert.assertTrue(line.length() > 0);
+long thisRead = System.nanoTime();
+if (lineCount > 0) {
+ /*
+* After the first line, look for a pause of at
least 800ms between reads.
+*/
+ if ((thisRead - lastRead) >
TimeUnit.MILLISECONDS.toNanos(800)) {
+ pauseCount++;
+ }
+}
+lastRead = thisRead;
+lineCount++;
+} while (is.isReady());
+}
+
+@Override
+public void onAllDataRead() throws IOException {
+resp.setContentType("text/plain");
+PrintWriter pw = resp.getWriter();
+pw.write(Integer.toString(lineCount) + "," +
Integer.toString(pauseCount));
+ctx.complete();
+}
+
+@Override
+public void onError(Throwable throwable) {
+throwable.printStackTrace();
+}
+
+});
+
+}
+}
+
+
private static class ReadLineClient extends SimpleHttpClient {
ReadLineClient(int port) {
@@ -852,17 +913,68 @@ public class TestChunkedInputFilter extends
TomcatBaseTest {
"Connection: close" + SimpleHttpClient.CRLF +
SimpleHttpClient.CRLF +
"7" + SimpleHttpClient.CRLF +
-"DATA01\n" + SimpleHttpClient.CRLF,
-"7" + SimpleHttpClient.CRLF +
+"DATA01\n", SimpleHttpClient.CRLF +
+"7", SimpleHttpClient.CRLF +
"DATA02\n" + SimpleHttpClient.CRLF,
"7" + SimpleHttpClient.CRLF +
// Split the CRLF between writes
"DATA03\n" + SimpleHttpClient.CR,
SimpleHttpClient.LF +
"7" + SimpleHttpClient.CRLF +
-"DATA04\n" + SimpleHttpClient.CRLF,
+"DATA04\n", SimpleHttpClient.CRLF +
+"13" + SimpleHttpClient.CRLF,
+"DATA05DATA05DATA05\n" + SimpleHttpClient.CRLF +
+"0" + SimpleHttpClient.CRLF +
+SimpleHttpClient.CRLF};
+
+ReadLineClient client = new
ReadLineClient(tomcat.getConnector().getLocalPort());
+client.setRequest(req
Re: [PR] log ip [tomcat]
markt-asf commented on PR #811: URL: https://github.com/apache/tomcat/pull/811#issuecomment-2621914508 I have relatively little tolerance for PRs that fail to compile. I have even less tolerance for PRs that still fail to compile after this problem has been pointed out once. Logging the connection ID in the access log looks like a candidate for an addition to the `ExtendedAccessLogValve`. If a request gets as far as sending at least one byte to Tomcat it should appear in the access log. Dedicated, separate loggers are provided for TLS handshake failures -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69532] Performance optimization in Util.getExpressionFactory()
https://bz.apache.org/bugzilla/show_bug.cgi?id=69532 --- Comment #6 from John Engebretson --- This patch also reduces the runtime of the existing perf test TestELParserPerformance.testExpressions() by about 15-20%, and heap usage by 25%. Hopefully it is indeed thread safe? -- 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 69532] Performance optimization in Util.getExpressionFactory()
https://bz.apache.org/bugzilla/show_bug.cgi?id=69532 --- Comment #7 from Mark Thomas --- I like it. I do have a couple of minor comments: - ExpressionFactoryCache needs to be package private. It can't be public as we aren't allowed to add classes to the public API of a specification package. - New files need the standard ALv2 header -- 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 10.1.x updated: Update Commons Pool to 2.12.1
This is an automated email from the ASF dual-hosted git repository.
markt 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 f7576994f8 Update Commons Pool to 2.12.1
f7576994f8 is described below
commit f7576994f8b97425ce3902c303ba6a6259240dcd
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:03:26 2025 +
Update Commons Pool to 2.12.1
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 -
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 10 +--
.../dbcp/pool2/KeyedPooledObjectFactory.java | 8 ---
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 4 --
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 36 +++
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 8 ---
.../apache/tomcat/dbcp/pool2/UsageTracking.java| 1 -
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 2 -
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 16 +
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 32 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 1 -
.../dbcp/pool2/impl/DefaultPooledObject.java | 2 -
.../dbcp/pool2/impl/DefaultPooledObjectInfo.java | 3 +-
.../pool2/impl/DefaultPooledObjectInfoMBean.java | 2 -
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 10 ++-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 50 ---
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 29 +
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 73 +-
.../dbcp/pool2/impl/GenericObjectPoolConfig.java | 24 +++
.../pool2/impl/InterruptibleReentrantLock.java | 2 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 44 +++--
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 7 +--
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 5 +-
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 27 +++-
webapps/docs/changelog.xml | 3 +
26 files changed, 142 insertions(+), 260 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 687b3df6ee..13e6606c8f 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -67,7 +67,7 @@ Unused classes removed
Sub-tree
src/main/java/org/apache/commons/pool2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.12.0 (2023-09-30)
+rel/commons-pool-2.12.1 (2025-01-27)
DBCP2
No unused code removed
diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
index b6108c73a7..94ed157997 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
@@ -49,7 +49,6 @@ public abstract class BaseObjectPool extends BaseObject
implements ObjectPool
* closed.
*
* @throws IllegalStateException when this pool has been closed.
- *
* @see #isClosed()
*/
protected final void assertOpen() throws IllegalStateException {
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index e0cf3205c4..6d1ba97f45 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -49,7 +49,7 @@ import java.util.NoSuchElementException;
* }
* }
*
- * {@link KeyedObjectPool} implementations may choose to store at most
+ * {@link KeyedObjectPool} implementations may choose to store at most
* one instance per key value, or may choose to maintain a pool of instances
* for each key (essentially creating a {@link java.util.Map Map} of
* {@link ObjectPool pools}).
@@ -66,7 +66,6 @@ import java.util.NoSuchElementException;
* @see KeyedPooledObjectFactory
* @see ObjectPool
* @see org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool
GenericKeyedObjectPool
- *
* @since 2.0
*/
public interface KeyedObjectPool extends Closeable {
@@ -78,7 +77,6 @@ public interface KeyedObjectPool extends Closeable {
* "pre-loading" a pool with idle objects (Optional operation).
*
* @param key the key a new instance should be added to
- *
* @throws Exception
* when {@link KeyedPooledObjectFactory#makeObject} fails.
* @throws IllegalStateException
@@ -161,9 +159,7 @@ public interface KeyedObjectPool extends Closeable {
*
*
* @param key the key used to obtain the object
- *
* @return an instance from this pool.
- *
* @throws IllegalStateException
* after {@link #close close} has been called on this pool
* @throws Exception
@@ -190,7 +186,6 @@ public interface KeyedObjectPool extends Closeable {
* the given {@code key} (optional operation).
*
* @param key the key to clear
- *
* @throws Unsuppor
(tomcat) branch 9.0.x updated: Update Commons Pool to 2.12.1
This is an automated email from the ASF dual-hosted git repository.
markt 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 6a23571702 Update Commons Pool to 2.12.1
6a23571702 is described below
commit 6a235717029b61e20e0c568bf14c2547fed6dae3
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:03:26 2025 +
Update Commons Pool to 2.12.1
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 -
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 10 +--
.../dbcp/pool2/KeyedPooledObjectFactory.java | 8 ---
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 4 --
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 36 +++
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 8 ---
.../apache/tomcat/dbcp/pool2/UsageTracking.java| 1 -
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 2 -
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 16 +
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 32 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 1 -
.../dbcp/pool2/impl/DefaultPooledObject.java | 2 -
.../dbcp/pool2/impl/DefaultPooledObjectInfo.java | 3 +-
.../pool2/impl/DefaultPooledObjectInfoMBean.java | 2 -
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 10 ++-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 50 ---
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 29 +
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 73 +-
.../dbcp/pool2/impl/GenericObjectPoolConfig.java | 24 +++
.../pool2/impl/InterruptibleReentrantLock.java | 2 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 44 +++--
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 7 +--
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 5 +-
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 27 +++-
webapps/docs/changelog.xml | 3 +
26 files changed, 142 insertions(+), 260 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 687b3df6ee..13e6606c8f 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -67,7 +67,7 @@ Unused classes removed
Sub-tree
src/main/java/org/apache/commons/pool2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.12.0 (2023-09-30)
+rel/commons-pool-2.12.1 (2025-01-27)
DBCP2
No unused code removed
diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
index b6108c73a7..94ed157997 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
@@ -49,7 +49,6 @@ public abstract class BaseObjectPool extends BaseObject
implements ObjectPool
* closed.
*
* @throws IllegalStateException when this pool has been closed.
- *
* @see #isClosed()
*/
protected final void assertOpen() throws IllegalStateException {
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index e0cf3205c4..6d1ba97f45 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -49,7 +49,7 @@ import java.util.NoSuchElementException;
* }
* }
*
- * {@link KeyedObjectPool} implementations may choose to store at most
+ * {@link KeyedObjectPool} implementations may choose to store at most
* one instance per key value, or may choose to maintain a pool of instances
* for each key (essentially creating a {@link java.util.Map Map} of
* {@link ObjectPool pools}).
@@ -66,7 +66,6 @@ import java.util.NoSuchElementException;
* @see KeyedPooledObjectFactory
* @see ObjectPool
* @see org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool
GenericKeyedObjectPool
- *
* @since 2.0
*/
public interface KeyedObjectPool extends Closeable {
@@ -78,7 +77,6 @@ public interface KeyedObjectPool extends Closeable {
* "pre-loading" a pool with idle objects (Optional operation).
*
* @param key the key a new instance should be added to
- *
* @throws Exception
* when {@link KeyedPooledObjectFactory#makeObject} fails.
* @throws IllegalStateException
@@ -161,9 +159,7 @@ public interface KeyedObjectPool extends Closeable {
*
*
* @param key the key used to obtain the object
- *
* @return an instance from this pool.
- *
* @throws IllegalStateException
* after {@link #close close} has been called on this pool
* @throws Exception
@@ -190,7 +186,6 @@ public interface KeyedObjectPool extends Closeable {
* the given {@code key} (optional operation).
*
* @param key the key to clear
- *
* @throws Unsupporte
(tomcat) branch main updated: Update Commons Pool to 2.12.1
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
The following commit(s) were added to refs/heads/main by this push:
new ee5fa5efbe Update Commons Pool to 2.12.1
ee5fa5efbe is described below
commit ee5fa5efbe25934b83e431e553b733152234fda4
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:03:26 2025 +
Update Commons Pool to 2.12.1
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 -
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 10 +--
.../dbcp/pool2/KeyedPooledObjectFactory.java | 8 ---
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 4 --
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 36 +++
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 8 ---
.../apache/tomcat/dbcp/pool2/UsageTracking.java| 1 -
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 2 -
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 16 +
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 32 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 1 -
.../dbcp/pool2/impl/DefaultPooledObject.java | 2 -
.../dbcp/pool2/impl/DefaultPooledObjectInfo.java | 3 +-
.../pool2/impl/DefaultPooledObjectInfoMBean.java | 2 -
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 10 ++-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 50 ---
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 29 +
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 73 +-
.../dbcp/pool2/impl/GenericObjectPoolConfig.java | 24 +++
.../pool2/impl/InterruptibleReentrantLock.java | 2 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 44 +++--
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 7 +--
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 5 +-
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 27 +++-
webapps/docs/changelog.xml | 3 +
26 files changed, 142 insertions(+), 260 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 8fc200f810..c81293c991 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -58,7 +58,7 @@ Unused classes removed
Sub-tree
src/main/java/org/apache/commons/pool2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.12.0 (2023-09-30)
+rel/commons-pool-2.12.1 (2025-01-27)
DBCP2
No unused code removed
diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
index b6108c73a7..94ed157997 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
@@ -49,7 +49,6 @@ public abstract class BaseObjectPool extends BaseObject
implements ObjectPool
* closed.
*
* @throws IllegalStateException when this pool has been closed.
- *
* @see #isClosed()
*/
protected final void assertOpen() throws IllegalStateException {
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index e0cf3205c4..6d1ba97f45 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -49,7 +49,7 @@ import java.util.NoSuchElementException;
* }
* }
*
- * {@link KeyedObjectPool} implementations may choose to store at most
+ * {@link KeyedObjectPool} implementations may choose to store at most
* one instance per key value, or may choose to maintain a pool of instances
* for each key (essentially creating a {@link java.util.Map Map} of
* {@link ObjectPool pools}).
@@ -66,7 +66,6 @@ import java.util.NoSuchElementException;
* @see KeyedPooledObjectFactory
* @see ObjectPool
* @see org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool
GenericKeyedObjectPool
- *
* @since 2.0
*/
public interface KeyedObjectPool extends Closeable {
@@ -78,7 +77,6 @@ public interface KeyedObjectPool extends Closeable {
* "pre-loading" a pool with idle objects (Optional operation).
*
* @param key the key a new instance should be added to
- *
* @throws Exception
* when {@link KeyedPooledObjectFactory#makeObject} fails.
* @throws IllegalStateException
@@ -161,9 +159,7 @@ public interface KeyedObjectPool extends Closeable {
*
*
* @param key the key used to obtain the object
- *
* @return an instance from this pool.
- *
* @throws IllegalStateException
* after {@link #close close} has been called on this pool
* @throws Exception
@@ -190,7 +186,6 @@ public interface KeyedObjectPool extends Closeable {
* the given {@code key} (optional operation).
*
* @param key the key to clear
- *
* @throws UnsupportedO
(tomcat) branch 11.0.x updated: Update Commons Pool to 2.12.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new ad698a118c Update Commons Pool to 2.12.1
ad698a118c is described below
commit ad698a118cc8c684b49bd7fe8ef2338742ffe3e9
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:03:26 2025 +
Update Commons Pool to 2.12.1
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 1 -
.../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 10 +--
.../dbcp/pool2/KeyedPooledObjectFactory.java | 8 ---
java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 4 --
java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 36 +++
.../tomcat/dbcp/pool2/PooledObjectFactory.java | 8 ---
.../apache/tomcat/dbcp/pool2/UsageTracking.java| 1 -
.../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 2 -
.../dbcp/pool2/impl/BaseGenericObjectPool.java | 16 +
.../dbcp/pool2/impl/BaseObjectPoolConfig.java | 32 +-
.../dbcp/pool2/impl/DefaultEvictionPolicy.java | 1 -
.../dbcp/pool2/impl/DefaultPooledObject.java | 2 -
.../dbcp/pool2/impl/DefaultPooledObjectInfo.java | 3 +-
.../pool2/impl/DefaultPooledObjectInfoMBean.java | 2 -
.../tomcat/dbcp/pool2/impl/EvictionTimer.java | 10 ++-
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 50 ---
.../pool2/impl/GenericKeyedObjectPoolConfig.java | 29 +
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 73 +-
.../dbcp/pool2/impl/GenericObjectPoolConfig.java | 24 +++
.../pool2/impl/InterruptibleReentrantLock.java | 2 +-
.../dbcp/pool2/impl/LinkedBlockingDeque.java | 44 +++--
.../tomcat/dbcp/pool2/impl/PoolImplUtils.java | 7 +--
.../dbcp/pool2/impl/SoftReferenceObjectPool.java | 5 +-
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 27 +++-
webapps/docs/changelog.xml | 3 +
26 files changed, 142 insertions(+), 260 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 8fc200f810..c81293c991 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -58,7 +58,7 @@ Unused classes removed
Sub-tree
src/main/java/org/apache/commons/pool2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-rel/commons-pool-2.12.0 (2023-09-30)
+rel/commons-pool-2.12.1 (2025-01-27)
DBCP2
No unused code removed
diff --git a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
index b6108c73a7..94ed157997 100644
--- a/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/BaseObjectPool.java
@@ -49,7 +49,6 @@ public abstract class BaseObjectPool extends BaseObject
implements ObjectPool
* closed.
*
* @throws IllegalStateException when this pool has been closed.
- *
* @see #isClosed()
*/
protected final void assertOpen() throws IllegalStateException {
diff --git a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
index e0cf3205c4..6d1ba97f45 100644
--- a/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
+++ b/java/org/apache/tomcat/dbcp/pool2/KeyedObjectPool.java
@@ -49,7 +49,7 @@ import java.util.NoSuchElementException;
* }
* }
*
- * {@link KeyedObjectPool} implementations may choose to store at most
+ * {@link KeyedObjectPool} implementations may choose to store at most
* one instance per key value, or may choose to maintain a pool of instances
* for each key (essentially creating a {@link java.util.Map Map} of
* {@link ObjectPool pools}).
@@ -66,7 +66,6 @@ import java.util.NoSuchElementException;
* @see KeyedPooledObjectFactory
* @see ObjectPool
* @see org.apache.tomcat.dbcp.pool2.impl.GenericKeyedObjectPool
GenericKeyedObjectPool
- *
* @since 2.0
*/
public interface KeyedObjectPool extends Closeable {
@@ -78,7 +77,6 @@ public interface KeyedObjectPool extends Closeable {
* "pre-loading" a pool with idle objects (Optional operation).
*
* @param key the key a new instance should be added to
- *
* @throws Exception
* when {@link KeyedPooledObjectFactory#makeObject} fails.
* @throws IllegalStateException
@@ -161,9 +159,7 @@ public interface KeyedObjectPool extends Closeable {
*
*
* @param key the key used to obtain the object
- *
* @return an instance from this pool.
- *
* @throws IllegalStateException
* after {@link #close close} has been called on this pool
* @throws Exception
@@ -190,7 +186,6 @@ public interface KeyedObjectPool extends Closeable {
* the given {@code key} (optional operation).
*
* @param key the key to clear
- *
* @throws Unsuppor
(tomcat) branch 11.0.x updated: Better documentation for SSLHostConfig.truststoreProvider default
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/11.0.x by this push: new cf47e9f5e4 Better documentation for SSLHostConfig.truststoreProvider default cf47e9f5e4 is described below commit cf47e9f5e4bcaf53ce840a172dbdc4e41119dfc5 Author: Mark Thomas AuthorDate: Wed Jan 29 09:57:10 2025 + Better documentation for SSLHostConfig.truststoreProvider default --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 9 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index feb77c567a..bc6b50132e 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -253,6 +253,11 @@ mapperDirectoryRedirectEnabled to true. (markt) + +Documentation. Better document the default for the +truststoreProvider attribute of a +SSLHostConfig element. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 1400289003..1bf4517c4d 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1456,10 +1456,11 @@ The name of the truststore provider to be used for the server certificate. The default is the value of the javax.net.ssl.trustStoreProvider system property. If - that property is null, the value of keystoreProvider is used - as the default. If neither this attribute, the default system property nor - keystoreProvider is set, the list of registered providers is - traversed in preference order and the first provider that supports the + that property is null and a single certificate has been configured for + this TLS virtual host then default will be the the value of + keystoreProvider of the single certificate. If none of these + identify a default, the list of registered providers is traversed in + preference order and the first provider that supports the truststoreType is used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Better documentation for SSLHostConfig.truststoreProvider default
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 The following commit(s) were added to refs/heads/main by this push: new 0c4af7ea19 Better documentation for SSLHostConfig.truststoreProvider default 0c4af7ea19 is described below commit 0c4af7ea1977db7be76c3ba6864167cda210259c Author: Mark Thomas AuthorDate: Wed Jan 29 09:57:10 2025 + Better documentation for SSLHostConfig.truststoreProvider default --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 9 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 41ffa3b2c0..06c26659a6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -303,6 +303,11 @@ mapperDirectoryRedirectEnabled to true. (markt) + +Documentation. Better document the default for the +truststoreProvider attribute of a +SSLHostConfig element. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 265ff47772..9d8935a604 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1456,10 +1456,11 @@ The name of the truststore provider to be used for the server certificate. The default is the value of the javax.net.ssl.trustStoreProvider system property. If - that property is null, the value of keystoreProvider is used - as the default. If neither this attribute, the default system property nor - keystoreProvider is set, the list of registered providers is - traversed in preference order and the first provider that supports the + that property is null and a single certificate has been configured for + this TLS virtual host then default will be the the value of + keystoreProvider of the single certificate. If none of these + identify a default, the list of registered providers is traversed in + preference order and the first provider that supports the truststoreType is used. - 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: Better documentation for SSLHostConfig.truststoreProvider default
This is an automated email from the ASF dual-hosted git repository. markt 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 b873b459e7 Better documentation for SSLHostConfig.truststoreProvider default b873b459e7 is described below commit b873b459e7080a85a2d47dea085d4ac5892ba44a Author: Mark Thomas AuthorDate: Wed Jan 29 09:57:10 2025 + Better documentation for SSLHostConfig.truststoreProvider default --- webapps/docs/changelog.xml | 5 + webapps/docs/config/http.xml | 9 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 84fbc23e01..64474429b5 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -239,6 +239,11 @@ mapperDirectoryRedirectEnabled to true. (markt) + +Documentation. Better document the default for the +truststoreProvider attribute of a +SSLHostConfig element. (markt) + diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index e4a3cb1fc0..6222b2af32 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1589,10 +1589,11 @@ The name of the truststore provider to be used for the server certificate. The default is the value of the javax.net.ssl.trustStoreProvider system property. If - that property is null, the value of keystoreProvider is used - as the default. If neither this attribute, the default system property nor - keystoreProvider is set, the list of registered providers is - traversed in preference order and the first provider that supports the + that property is null and a single certificate has been configured for + this TLS virtual host then default will be the the value of + keystoreProvider of the single certificate. If none of these + identify a default, the list of registered providers is traversed in + preference order and the first provider that supports the truststoreType is used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69556] New: https://safehealthpharmacy.com
https://bz.apache.org/bugzilla/show_bug.cgi?id=69556 Bug ID: 69556 Summary: https://safehealthpharmacy.com Product: Tomcat Native Version: 2.0.8 Hardware: PC OS: Windows XP Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: copoyo4...@andinews.com Target Milestone: --- https://safehealthpharmacy.com -- 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 69556] https://safehealthpharmacy.com
https://bz.apache.org/bugzilla/show_bug.cgi?id=69556 --- Comment #1 from tyler44 --- Created attachment 39985 --> https://bz.apache.org/bugzilla/attachment.cgi?id=39985&action=edit https://safehealthpharmacy.com -- 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) 01/04: Update UnboundID to 7.0.2
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 99071c1ac5726ab90177ed19f85ebdfef134dc47
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:45:52 2025 +
Update UnboundID to 7.0.2
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 241b202f3b..3202deb6ba 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -256,10 +256,10 @@
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=7.0.1
+unboundid.version=7.0.2
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=6bd8681b89886989a65316bbe03429263c0f8b442ac92e17d55dffa1035f12d8fc0b363fba8a23cac7a1d6fc93f1c50233ace83ca8769f5a0a3eee8544a9a5cb
+unboundid.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
@@ -268,7 +268,7 @@
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.vers
checkstyle.version=10.20.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=e7de3f1745b3dcd0b56993f30f01453bf4d44935cacc83863cd84c94453fdf7486dbd1610bd95e9aa8083104b06af69416cfb7f39ca5b8112cb17fa36028e279
+checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ed74fb511f..e8e0a70908 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -334,6 +334,9 @@
Update Byte Buddy to 1.16.1. (markt)
+
+Update UnboundID to 7.0.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (8f6d0a6ea0 -> 64a6ba7812)
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 8f6d0a6ea0 Update Byte Buddy to 1.16.1 new 99071c1ac5 Update UnboundID to 7.0.2 new 207f7627b3 Update Checkstyle to 10.21.2 new 40a71ac61f Update SpotBugs to 4.9.0 new 64a6ba7812 Update JSign to 7.0 The 4 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 | 16 webapps/docs/changelog.xml | 12 2 files changed, 20 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Update JSign to 7.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit df30958b3d5dab2b7807c28acd525b1a420e9905
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:53:38 2025 +
Update JSign to 7.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 20d62c949f..3c4961b1d5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -313,10 +313,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=9e5c914bf68adda356fac74c5c172157|bb25183c9987fedba89e4475787ff9d9270b0736
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ae6040359e..dfb43d4431 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -284,6 +284,9 @@
Update SpotBugs to 4.9.0. (markt)
+
+Update JSign to 7.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Update SpotBugs to 4.9.0
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 40a71ac61fe6a58aa9908f2f35664d8ebc786ae5
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:50:40 2025 +
Update SpotBugs to 4.9.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4a044c0076..3892866543 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -283,10 +283,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.6
+spotbugs.version=4.9.0
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=2fe8083fe52bd04b6b1ac8fe9ea3c1ae544aa6eb07ea0d602a46d54d0537355e8a79af687ee2f96cbd7bd59d60d74609e4b89df97ec935387fc6cf925e0a3dd6
+spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 766d450da6..58ee03622e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -340,6 +340,9 @@
Update Checkstyle to 10.21.2. (markt)
+
+Update SpotBugs to 4.9.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Update SpotBugs to 4.9.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fb24cbdba9869e549348b36b3bba725ae1391549
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:50:40 2025 +
Update SpotBugs to 4.9.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 79bd3dc33b..20d62c949f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -283,10 +283,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.6
+spotbugs.version=4.9.0
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=2fe8083fe52bd04b6b1ac8fe9ea3c1ae544aa6eb07ea0d602a46d54d0537355e8a79af687ee2f96cbd7bd59d60d74609e4b89df97ec935387fc6cf925e0a3dd6
+spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b5d461733e..ae6040359e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -281,6 +281,9 @@
Update Checkstyle to 10.21.2. (markt)
+
+Update SpotBugs to 4.9.0. (markt)
+
-
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 (79ff4f58a8 -> 1eb95846d6)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 79ff4f58a8 Update Byte Buddy to 1.16.1 new 26b7ea47ed Update UnboundID to 7.0.2 new 26d6aa3a31 Update Checkstyle to 10.21.2 new 0f1f7362b0 Update SpotBugs to 4.9.0 new 1eb95846d6 Update JSign to 7.0 The 4 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 | 16 webapps/docs/changelog.xml | 12 2 files changed, 20 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Update Checkstyle to 10.21.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 576f10fcd263b9a2576bf58368c16a05573f0980
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:47:40 2025 +
Update Checkstyle to 10.21.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 00403027d0..79bd3dc33b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.20.2
+checkstyle.version=10.21.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
+checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9aac06f0a4..b5d461733e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -278,6 +278,9 @@
Update UnboundID to 7.0.2. (markt)
+
+Update Checkstyle to 10.21.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Update Checkstyle to 10.21.2
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 207f7627b312cf3b21d89b5952a9cc825f307adc
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:47:40 2025 +
Update Checkstyle to 10.21.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3202deb6ba..4a044c0076 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.20.2
+checkstyle.version=10.21.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
+checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e8e0a70908..766d450da6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -337,6 +337,9 @@
Update UnboundID to 7.0.2. (markt)
+
+Update Checkstyle to 10.21.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Update JSign to 7.0
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 64a6ba781269fab74b25181d569d15dd023c0486
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:53:38 2025 +
Update JSign to 7.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 3892866543..74856f3492 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -313,10 +313,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=9e5c914bf68adda356fac74c5c172157|bb25183c9987fedba89e4475787ff9d9270b0736
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 58ee03622e..6cefaf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -343,6 +343,9 @@
Update SpotBugs to 4.9.0. (markt)
+
+Update JSign to 7.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated (6c4acd1e9f -> df30958b3d)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 6c4acd1e9f Update Byte Buddy to 1.16.1 new 1fbf403774 Update UnboundID to 7.0.2 new 576f10fcd2 Update Checkstyle to 10.21.2 new fb24cbdba9 Update SpotBugs to 4.9.0 new df30958b3d Update JSign to 7.0 The 4 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 | 16 webapps/docs/changelog.xml | 12 2 files changed, 20 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Update UnboundID to 7.0.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 26b7ea47ed4e0b804d36af35598cbf59fc2bd013
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:45:52 2025 +
Update UnboundID to 7.0.2
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c62de7f2d7..55225c3818 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -277,10 +277,10 @@
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=7.0.1
+unboundid.version=7.0.2
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=6bd8681b89886989a65316bbe03429263c0f8b442ac92e17d55dffa1035f12d8fc0b363fba8a23cac7a1d6fc93f1c50233ace83ca8769f5a0a3eee8544a9a5cb
+unboundid.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
@@ -289,7 +289,7 @@
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.vers
checkstyle.version=10.20.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=e7de3f1745b3dcd0b56993f30f01453bf4d44935cacc83863cd84c94453fdf7486dbd1610bd95e9aa8083104b06af69416cfb7f39ca5b8112cb17fa36028e279
+checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ea47fcbe6a..417bbad886 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -266,6 +266,9 @@
Update Byte Buddy to 1.16.1. (markt)
+
+Update UnboundID to 7.0.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Update SpotBugs to 4.9.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0f1f7362b02d9e6ee87499fa77a9e432ee035a06
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:50:40 2025 +
Update SpotBugs to 4.9.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 82ed31f09c..8ae6b1e9ab 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -304,10 +304,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.6
+spotbugs.version=4.9.0
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=2fe8083fe52bd04b6b1ac8fe9ea3c1ae544aa6eb07ea0d602a46d54d0537355e8a79af687ee2f96cbd7bd59d60d74609e4b89df97ec935387fc6cf925e0a3dd6
+spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f42f298b42..9ffa797278 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -272,6 +272,9 @@
Update Checkstyle to 10.21.2. (markt)
+
+Update SpotBugs to 4.9.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Update JSign to 7.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1eb95846d6886aded1fd498f12cbcdfa4c6cfbd3
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:53:38 2025 +
Update JSign to 7.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8ae6b1e9ab..75bc8384c6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -334,10 +334,10 @@
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.vers
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=9e5c914bf68adda356fac74c5c172157|bb25183c9987fedba89e4475787ff9d9270b0736
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9ffa797278..45f709f024 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -275,6 +275,9 @@
Update SpotBugs to 4.9.0. (markt)
+
+Update JSign to 7.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Update UnboundID to 7.0.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1fbf403774efc8719328628272bb9c9c9c3c1f0a
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:45:52 2025 +
Update UnboundID to 7.0.2
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1f194cbcac..00403027d0 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -256,10 +256,10 @@
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=7.0.1
+unboundid.version=7.0.2
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=6bd8681b89886989a65316bbe03429263c0f8b442ac92e17d55dffa1035f12d8fc0b363fba8a23cac7a1d6fc93f1c50233ace83ca8769f5a0a3eee8544a9a5cb
+unboundid.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
@@ -268,7 +268,7 @@
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.vers
checkstyle.version=10.20.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=e7de3f1745b3dcd0b56993f30f01453bf4d44935cacc83863cd84c94453fdf7486dbd1610bd95e9aa8083104b06af69416cfb7f39ca5b8112cb17fa36028e279
+checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a89de77c20..9aac06f0a4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -275,6 +275,9 @@
Update Byte Buddy to 1.16.1. (markt)
+
+Update UnboundID to 7.0.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Update Checkstyle to 10.21.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 26d6aa3a3107fc75b76ab499e5c1cb6a612ab840
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:47:40 2025 +
Update Checkstyle to 10.21.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 55225c3818..82ed31f09c 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -286,10 +286,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.20.2
+checkstyle.version=10.21.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
+checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 417bbad886..f42f298b42 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -269,6 +269,9 @@
Update UnboundID to 7.0.2. (markt)
+
+Update Checkstyle to 10.21.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Update SpotBugs to 4.9.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit bf1de3737435d9e7ba94b8e37cdf3d90da9a3942
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:50:40 2025 +
Update SpotBugs to 4.9.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 89ddc8912d..ee6d492b5d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -306,10 +306,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.6
+spotbugs.version=4.9.0
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=2fe8083fe52bd04b6b1ac8fe9ea3c1ae544aa6eb07ea0d602a46d54d0537355e8a79af687ee2f96cbd7bd59d60d74609e4b89df97ec935387fc6cf925e0a3dd6
+spotbugs.checksum.value=84dc14d73e2ac12afd6987c5ff10c92398f28392c60a760c13764243ad24a8f77b8444530641745053204dd9f32ca36ec953632a940f88a94f52e14232c61130
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c1eedd7f23..116e972337 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -263,6 +263,9 @@
Update Checkstyle to 10.21.2. (markt)
+
+Update SpotBugs to 4.9.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Update Checkstyle to 10.21.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b2d5e486fd51eab1f40cf68760d2230c5ce78812
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:47:40 2025 +
Update Checkstyle to 10.21.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 2fb89ce8eb..89ddc8912d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -288,10 +288,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.20.2
+checkstyle.version=10.21.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
+checkstyle.checksum.value=0d19bcbbd62a674f0f174cc5aabf920fe8a01102d1de269c7c7bb9c31219c15d6a95d79c7d175de03664061ed1e8c3683b26a4e4a70957d32e367f16a33b7b69
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e08b866ffb..c1eedd7f23 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -260,6 +260,9 @@
Update UnboundID to 7.0.2. (markt)
+
+Update Checkstyle to 10.21.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Update UnboundID to 7.0.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3cc256d0802cb80ed2fd4c7e43c432a55dc7b4e7
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:45:52 2025 +
Update UnboundID to 7.0.2
---
build.properties.default | 6 +++---
webapps/docs/changelog.xml | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9cf7067417..2fb89ce8eb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -279,10 +279,10 @@
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=7.0.1
+unboundid.version=7.0.2
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=6bd8681b89886989a65316bbe03429263c0f8b442ac92e17d55dffa1035f12d8fc0b363fba8a23cac7a1d6fc93f1c50233ace83ca8769f5a0a3eee8544a9a5cb
+unboundid.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
@@ -291,7 +291,7 @@
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.vers
checkstyle.version=10.20.2
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=e7de3f1745b3dcd0b56993f30f01453bf4d44935cacc83863cd84c94453fdf7486dbd1610bd95e9aa8083104b06af69416cfb7f39ca5b8112cb17fa36028e279
+checkstyle.checksum.value=425a003273c8fb3ddcefae8273b322dae2186ccb48344c55e8a4a8251915ef0c595cd69566c3ef33476c3151bcd5b20a3492b2917c4959a83e30ca363cbce88e
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ffdd9b531d..e08b866ffb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -257,6 +257,9 @@
Update Byte Buddy to 1.16.1. (markt)
+
+Update UnboundID to 7.0.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Update JSign to 7.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 39348d8ac4e76677b15a4c60804a34d01adda32a
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:53:38 2025 +
Update JSign to 7.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ee6d492b5d..73677b23be 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -326,10 +326,10 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=6.0
+jsign.version=7.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
+jsign.checksum.value=9e5c914bf68adda356fac74c5c172157|bb25183c9987fedba89e4475787ff9d9270b0736
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 116e972337..54be6722b7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -266,6 +266,9 @@
Update SpotBugs to 4.9.0. (markt)
+
+Update JSign to 7.0. (markt)
+
-
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 (868d4f7613 -> 39348d8ac4)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 868d4f7613 Update Byte Buddy to 1.16.1 new 3cc256d080 Update UnboundID to 7.0.2 new b2d5e486fd Update Checkstyle to 10.21.2 new bf1de37374 Update SpotBugs to 4.9.0 new 39348d8ac4 Update JSign to 7.0 The 4 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 | 16 webapps/docs/changelog.xml | 12 2 files changed, 20 insertions(+), 8 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 11.0.x updated: Update Byte Buddy to 1.16.1
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 6c4acd1e9f Update Byte Buddy to 1.16.1
6c4acd1e9f is described below
commit 6c4acd1e9f129361398c8779edd63696cf906fe8
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:43:51 2025 +
Update Byte Buddy to 1.16.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 35330d5097..1f194cbcac 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -247,10 +247,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.15.10
+bytebuddy.version=1.16.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=0b029979f5bf509510f91c1a49fd4adb|635c873fadd853c084f84fdc3cbd58c5dd8537f9
+bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b3bb911822..a89de77c20 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -272,6 +272,9 @@
Update the internal fork of Commons Pool to 2.12.1. (markt)
+
+Update Byte Buddy to 1.16.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update Byte Buddy to 1.16.1
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
The following commit(s) were added to refs/heads/main by this push:
new 8f6d0a6ea0 Update Byte Buddy to 1.16.1
8f6d0a6ea0 is described below
commit 8f6d0a6ea0376df11d58ea195992a7f2930ba7e4
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:43:51 2025 +
Update Byte Buddy to 1.16.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7c890a8c7d..241b202f3b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -247,10 +247,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.15.10
+bytebuddy.version=1.16.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=0b029979f5bf509510f91c1a49fd4adb|635c873fadd853c084f84fdc3cbd58c5dd8537f9
+bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ce9c0519b8..ed74fb511f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -331,6 +331,9 @@
Update the internal fork of Commons Pool to 2.12.1. (markt)
+
+Update Byte Buddy to 1.16.1. (markt)
+
-
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: Update Byte Buddy to 1.16.1
This is an automated email from the ASF dual-hosted git repository.
markt 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 79ff4f58a8 Update Byte Buddy to 1.16.1
79ff4f58a8 is described below
commit 79ff4f58a8005864501edcb13673b365303cec1e
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:43:51 2025 +
Update Byte Buddy to 1.16.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index eb163c4b92..c62de7f2d7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -268,10 +268,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.15.10
+bytebuddy.version=1.16.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=0b029979f5bf509510f91c1a49fd4adb|635c873fadd853c084f84fdc3cbd58c5dd8537f9
+bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7997d21c17..ea47fcbe6a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -263,6 +263,9 @@
Update the internal fork of Commons Pool to 2.12.1. (markt)
+
+Update Byte Buddy to 1.16.1. (markt)
+
-
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: Update Byte Buddy to 1.16.1
This is an automated email from the ASF dual-hosted git repository.
markt 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 868d4f7613 Update Byte Buddy to 1.16.1
868d4f7613 is described below
commit 868d4f7613983c630cac2dc7f23b2c6e3015e249
Author: Mark Thomas
AuthorDate: Wed Jan 29 18:43:51 2025 +
Update Byte Buddy to 1.16.1
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f26ba55bbd..9cf7067417 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -270,10 +270,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - byte-buddy, used by EasyMock, version 1.12.18 or later -
-bytebuddy.version=1.15.10
+bytebuddy.version=1.16.1
bytebuddy.checksum.enabled=true
bytebuddy.checksum.algorithm=MD5|SHA-1
-bytebuddy.checksum.value=0b029979f5bf509510f91c1a49fd4adb|635c873fadd853c084f84fdc3cbd58c5dd8537f9
+bytebuddy.checksum.value=ba44d75d8a9a19e029ce52a8010b2238|f95f4d5efa5e07706129048a62b38a0acb35592c
bytebuddy.home=${base.path}/byte-buddy-${bytebuddy.version}
bytebuddy.jar=${bytebuddy.home}/byte-buddy-${bytebuddy.version}.jar
bytebuddy.loc=${base-maven.loc}/net/bytebuddy/byte-buddy/${bytebuddy.version}/byte-buddy-${bytebuddy.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b68cef669a..ffdd9b531d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -254,6 +254,9 @@
Update the internal fork of Commons Pool to 2.12.1. (markt)
+
+Update Byte Buddy to 1.16.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
