[GitHub] [tomcat] kang-hl commented on pull request #614: Remove unnecessary reset
kang-hl commented on PR #614: URL: https://github.com/apache/tomcat/pull/614#issuecomment-1543285158 > The method is necessary. It releases the reference to the SocketWrapper, allowing it ti be GC'd. NioSocketWrapper is referenced by NioChannel, and it may need to release the reference. -- 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
[GitHub] [tomcat] kang-hl commented on pull request #614: Remove unnecessary reset
kang-hl commented on PR #614: URL: https://github.com/apache/tomcat/pull/614#issuecomment-1543272195 NioSocketWrapper is referenced by NioChannel, and it may need to release the reference. -- 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 8.5.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 9f37ce0770 Fix typo
9f37ce0770 is described below
commit 9f37ce0770f3a65d07d1e88c55672337c2619393
Author: lihan
AuthorDate: Fri Apr 28 10:57:48 2023 +0800
Fix typo
---
test/org/apache/catalina/filters/TestRateLimitFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index 7e986e75d0..ca21f5e1f4 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -74,7 +74,7 @@ public class TestRateLimitFilter extends TomcatBaseTest {
// Sleep for up to 10s for clients to complete
int count = 0;
while (count < 100 && (tc1.results[24] == 0 || tc2.results[49] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
-tc3.results[allowedRequests] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
+tc3.results[allowedRequests] == 0 ||
tc4.results[allowedRequests - 1] == 0 ||
tc4.results[allowedRequests] == 0)) {
Thread.sleep(100);
count++;
-
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: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan 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 ef5339cc0d Fix typo
ef5339cc0d is described below
commit ef5339cc0db07614a20fe7a335a2db1b8754cb04
Author: lihan
AuthorDate: Fri Apr 28 10:57:48 2023 +0800
Fix typo
---
test/org/apache/catalina/filters/TestRateLimitFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index ce7467eb64..7e92351f8d 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -74,7 +74,7 @@ public class TestRateLimitFilter extends TomcatBaseTest {
// Sleep for up to 10s for clients to complete
int count = 0;
while (count < 100 && (tc1.results[24] == 0 || tc2.results[49] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
-tc3.results[allowedRequests] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
+tc3.results[allowedRequests] == 0 ||
tc4.results[allowedRequests - 1] == 0 ||
tc4.results[allowedRequests] == 0)) {
Thread.sleep(100);
count++;
-
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: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan 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 131d81b879 Fix typo
131d81b879 is described below
commit 131d81b879d42876668b666dcda385e0d01fdd08
Author: lihan
AuthorDate: Fri Apr 28 10:57:48 2023 +0800
Fix typo
---
test/org/apache/catalina/filters/TestRateLimitFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index b47e67ed60..ac418726ce 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -74,7 +74,7 @@ public class TestRateLimitFilter extends TomcatBaseTest {
// Sleep for up to 10s for clients to complete
int count = 0;
while (count < 100 && (tc1.results[24] == 0 || tc2.results[49] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
-tc3.results[allowedRequests] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
+tc3.results[allowedRequests] == 0 ||
tc4.results[allowedRequests - 1] == 0 ||
tc4.results[allowedRequests] == 0)) {
Thread.sleep(100);
count++;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
lihan 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 f9366fb6c5 Fix typo
f9366fb6c5 is described below
commit f9366fb6c55ded9ca198cecc9aa31c2acf97e244
Author: lihan
AuthorDate: Fri Apr 28 10:57:48 2023 +0800
Fix typo
---
test/org/apache/catalina/filters/TestRateLimitFilter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index b47e67ed60..ac418726ce 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -74,7 +74,7 @@ public class TestRateLimitFilter extends TomcatBaseTest {
// Sleep for up to 10s for clients to complete
int count = 0;
while (count < 100 && (tc1.results[24] == 0 || tc2.results[49] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
-tc3.results[allowedRequests] == 0 ||
tc3.results[allowedRequests - 1] == 0 ||
+tc3.results[allowedRequests] == 0 ||
tc4.results[allowedRequests - 1] == 0 ||
tc4.results[allowedRequests] == 0)) {
Thread.sleep(100);
count++;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.89
Igal, On 5/10/23 17:05, Igal Sapir wrote: Chris, On Wed, May 10, 2023 at 12:28 PM Christopher Schultz < ch...@christopherschultz.net> wrote: Igal, On 5/10/23 14:16, Igal Sapir wrote: The error that I see on Java 8 is: Testsuite: org.apache.catalina.filters.TestMapperWebapps Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec Testcase: null took 0.001 sec Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. at java.lang.Thread.run(Thread.java:750) Thanks for clarifying. Do you get a core file or hs_err.[pid] or anything like that, or just "computer says no"? The "ant clean test" ends with this output: === ant output begin === test-status: [concat] Testsuites with skipped tests: [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.filters.TestMapperWebapps.NIO2.txt BUILD FAILED /workspace/src/tomcat/8.5.x/build.xml:1525: Some tests completed with an Error. See /workspace/build/tomcat/8.5.x/build/logs for details, search for "ERROR". Total time: 19 seconds === ant output end === The file at the path mentioned in the ant output contains the text that I posted earlier, with the text "junit.framework.AssertionFailedError: Forked Java VM exited abnormally". No PID that I see anywhere but I might not be looking at the right place? It would probably be in the CWD where you launched ant. So "ant test && ls" should give you any files like that. I don't see any such file What happens if you give "ant test" a specific test case to run: ant -Dtest.entry=org.apache.catalina.filters.TestMapperWebapps test ? That was a specific test case. I have the following entry in build.properties: test.entry=org.apache.catalina.filters.TestMapperWebapps Confirmed with the following command: ❯ ant echoproperties | grep entry [echoproperties] test.entry=org.apache.catalina.filters.TestMapperWebapps Perfect. Can you try playing-around with fork="true"/"false" or some of the other debug-related settings on the thing? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.89
Chris, On Wed, May 10, 2023 at 12:28 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > Igal, > > On 5/10/23 14:16, Igal Sapir wrote: > >>> The error that I see on Java 8 is: > >>> > >>> Testsuite: org.apache.catalina.filters.TestMapperWebapps > >>> Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec > >>> Testcase: null took 0.001 sec > >>> Caused an ERROR > >>> Forked Java VM exited abnormally. Please note the time in the report > does > >>> not reflect the time until the VM exit. > >>> junit.framework.AssertionFailedError: Forked Java VM exited abnormally. > >>> Please note the time in the report does not reflect the time until the > VM > >>> exit. > >>> at java.lang.Thread.run(Thread.java:750) > >>> > >> > >> Thanks for clarifying. Do you get a core file or hs_err.[pid] or > >> anything like that, or just "computer says no"? > >> > > > > The "ant clean test" ends with this output: > > > > === ant output begin === > > test-status: > >[concat] Testsuites with skipped tests: > >[concat] Testsuites with failed tests: > >[concat] TEST-org.apache.catalina.filters.TestMapperWebapps.NIO2.txt > > > > BUILD FAILED > > /workspace/src/tomcat/8.5.x/build.xml:1525: Some tests completed with an > > Error. See /workspace/build/tomcat/8.5.x/build/logs for details, search > for > > "ERROR". > > > > Total time: 19 seconds > > === ant output end === > > > > The file at the path mentioned in the ant output contains the text that I > > posted earlier, with the text "junit.framework.AssertionFailedError: > Forked > > Java VM exited abnormally". > > > > No PID that I see anywhere but I might not be looking at the right place? > > It would probably be in the CWD where you launched ant. So "ant test && > ls" should give you any files like that. > I don't see any such file > > What happens if you give "ant test" a specific test case to run: > > ant -Dtest.entry=org.apache.catalina.filters.TestMapperWebapps test > > ? > That was a specific test case. I have the following entry in build.properties: test.entry=org.apache.catalina.filters.TestMapperWebapps Confirmed with the following command: ❯ ant echoproperties | grep entry [echoproperties] test.entry=org.apache.catalina.filters.TestMapperWebapps Best, Igal > > >>> Yes, that test fails consistently for me. > >> > >> Well, at least that's something. > >> > >> Will it fail if you run *only* that one test? Or does it have to be > >> running as part of the whole test-suite? > >> > > > > It fails both when run with the whole test-suite and when run as a single > > test. The output above is from a single test run. > > That looks like the whole test suite to me. Did you use "test.entry"? > > -chris > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 8.5.89
Igal, On 5/10/23 14:16, Igal Sapir wrote: The error that I see on Java 8 is: Testsuite: org.apache.catalina.filters.TestMapperWebapps Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec Testcase: null took 0.001 sec Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. at java.lang.Thread.run(Thread.java:750) Thanks for clarifying. Do you get a core file or hs_err.[pid] or anything like that, or just "computer says no"? The "ant clean test" ends with this output: === ant output begin === test-status: [concat] Testsuites with skipped tests: [concat] Testsuites with failed tests: [concat] TEST-org.apache.catalina.filters.TestMapperWebapps.NIO2.txt BUILD FAILED /workspace/src/tomcat/8.5.x/build.xml:1525: Some tests completed with an Error. See /workspace/build/tomcat/8.5.x/build/logs for details, search for "ERROR". Total time: 19 seconds === ant output end === The file at the path mentioned in the ant output contains the text that I posted earlier, with the text "junit.framework.AssertionFailedError: Forked Java VM exited abnormally". No PID that I see anywhere but I might not be looking at the right place? It would probably be in the CWD where you launched ant. So "ant test && ls" should give you any files like that. What happens if you give "ant test" a specific test case to run: ant -Dtest.entry=org.apache.catalina.filters.TestMapperWebapps test ? Yes, that test fails consistently for me. Well, at least that's something. Will it fail if you run *only* that one test? Or does it have to be running as part of the whole test-suite? It fails both when run with the whole test-suite and when run as a single test. The output above is from a single test run. That looks like the whole test suite to me. Did you use "test.entry"? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix comment typo
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 c820bf7160 Fix comment typo
c820bf7160 is described below
commit c820bf7160f90f8dd040c3954a8a783d76b2b564
Author: Mark Thomas
AuthorDate: Wed May 10 20:19:05 2023 +0100
Fix comment typo
---
java/org/apache/tomcat/util/compat/JreCompat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/JreCompat.java
b/java/org/apache/tomcat/util/compat/JreCompat.java
index 2fc13d62c6..3de6908893 100644
--- a/java/org/apache/tomcat/util/compat/JreCompat.java
+++ b/java/org/apache/tomcat/util/compat/JreCompat.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Field;
/**
* This is the base implementation class for JRE compatibility and provides an
- * implementation based on Java 11. Sub-classes may extend this class and
provide
+ * implementation based on Java 17. Sub-classes may extend this class and
provide
* alternative implementations for later JRE versions
*/
public class JreCompat {
-
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: Fix typo
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 421f987b52 Fix typo
421f987b52 is described below
commit 421f987b52c1e6156c3624a2ca20ecfae0ea2242
Author: Mark Thomas
AuthorDate: Wed May 10 20:15:16 2023 +0100
Fix typo
---
java/org/apache/tomcat/util/compat/Jre19Compat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java
b/java/org/apache/tomcat/util/compat/Jre19Compat.java
index fb94810b40..45ce68b666 100644
--- a/java/org/apache/tomcat/util/compat/Jre19Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java
@@ -36,7 +36,7 @@ public class Jre19Compat extends Jre16Compat {
try {
c1 = Class.forName("java.lang.WrongThreadException");
} catch (ClassNotFoundException cnfe) {
-// Must be pre-Java 16
+// Must be pre-Java 19
log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix typo
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 7290990c63 Fix typo
7290990c63 is described below
commit 7290990c631beee5729e7aadb2eda38fdfbf2a29
Author: Mark Thomas
AuthorDate: Wed May 10 20:15:16 2023 +0100
Fix typo
---
java/org/apache/tomcat/util/compat/Jre19Compat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java
b/java/org/apache/tomcat/util/compat/Jre19Compat.java
index 9fb26f0090..60ee0c2dc1 100644
--- a/java/org/apache/tomcat/util/compat/Jre19Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java
@@ -36,7 +36,7 @@ public class Jre19Compat extends JreCompat {
try {
c1 = Class.forName("java.lang.WrongThreadException");
} catch (ClassNotFoundException cnfe) {
-// Must be pre-Java 16
+// Must be pre-Java 19
log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 95012589df Fix typo
95012589df is described below
commit 95012589dfad32e33e5e8f1e8333ae26ec48902f
Author: Mark Thomas
AuthorDate: Wed May 10 20:15:16 2023 +0100
Fix typo
---
java/org/apache/tomcat/util/compat/Jre19Compat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java
b/java/org/apache/tomcat/util/compat/Jre19Compat.java
index fb94810b40..45ce68b666 100644
--- a/java/org/apache/tomcat/util/compat/Jre19Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java
@@ -36,7 +36,7 @@ public class Jre19Compat extends Jre16Compat {
try {
c1 = Class.forName("java.lang.WrongThreadException");
} catch (ClassNotFoundException cnfe) {
-// Must be pre-Java 16
+// Must be pre-Java 19
log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
}
-
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: Fix typo
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 bf3d9069ff Fix typo
bf3d9069ff is described below
commit bf3d9069ffeac8aec2a77a4d9ed2bccb6ca816b7
Author: Mark Thomas
AuthorDate: Wed May 10 20:15:16 2023 +0100
Fix typo
---
java/org/apache/tomcat/util/compat/Jre19Compat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/compat/Jre19Compat.java
b/java/org/apache/tomcat/util/compat/Jre19Compat.java
index fb94810b40..45ce68b666 100644
--- a/java/org/apache/tomcat/util/compat/Jre19Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre19Compat.java
@@ -36,7 +36,7 @@ public class Jre19Compat extends Jre16Compat {
try {
c1 = Class.forName("java.lang.WrongThreadException");
} catch (ClassNotFoundException cnfe) {
-// Must be pre-Java 16
+// Must be pre-Java 19
log.debug(sm.getString("jre19Compat.javaPre19"), cnfe);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #614: Remove unnecessary reset
markt-asf closed pull request #614: Remove unnecessary reset URL: https://github.com/apache/tomcat/pull/614 -- 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
[GitHub] [tomcat] markt-asf commented on pull request #614: Remove unnecessary reset
markt-asf commented on PR #614: URL: https://github.com/apache/tomcat/pull/614#issuecomment-1542634643 The method is necessary. It releases the reference to the SocketWrapper, allowing it ti be GC'd. -- 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 success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/552 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 31203aafe9e4b2ba40463a1db71430b1ffef1edc Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.89
Chris, On Wed, May 10, 2023 at 11:08 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > Igal, > > On 5/10/23 13:49, Igal Sapir wrote: > > Chris, > > > > On Wed, May 10, 2023 at 9:58 AM Christopher Schultz < > > ch...@christopherschultz.net> wrote: > > > >> Igal, > >> > >> On 5/10/23 12:12, Igal Sapir wrote: > >>> Chris, > >>> > >>> On Wed, May 10, 2023 at 8:13 AM Christopher Schultz < > >>> ch...@christopherschultz.net> wrote: > >>> > Igal, > > On 5/10/23 08:48, Igal Sapir wrote: > > Mark, > > > > On Wed, May 10, 2023 at 12:43 AM Mark Thomas > wrote: > > > >> On 09/05/2023 23:28, Igal Sapir wrote: > >>> ch...@christopherschultz.net> wrote: > >> > >> > >> > The proposed 8.5.89 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.5.88 (stable) > > > >>> I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps > >>> > >>> FWIW I got that error before so I don't think that it should hold > >> back > >> the > >>> release. I would just feel much better if I could understand how > it > >> is > >>> possible for "System cannot be resolved"? I tried it with Java 17 > >> and > >> Java > >>> 8. > >> > >> That is a known issue with the Eclipse compiler and Java 17. Are you > >> sure it also fails with Java 8 with "ant clean test"? > >> > > > > Thank you for looking into this, but with the upcoming sunset of > Tomcat > 8.5 > > I think that it's fine to ignore this issue as it seems like it's > something > > specific to my setup. If you're still interested in more details > though, I > > am including them below. > > > > Yes, I am running "ant clean test", but I should have been more clear > >> and > > specified that with Java 8 I get another error: > > > > === Java 8 error begin === > > Testsuite: org.apache.catalina.filters.TestMapperWebapps > > Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec > > > > Testcase: null took 0.001 sec > >Caused an ERROR > > Forked Java VM exited abnormally. Please note the time in the report > >> does > > not reflect the time until the VM exit. > > junit.framework.AssertionFailedError: Forked Java VM exited > abnormally. > > Please note the time in the report does not reflect the time until > the > >> VM > > exit. > >at java.lang.Thread.run(Thread.java:750) > > > > === Java version === > > ❯ java -version > > openjdk version "1.8.0_322" > > OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build > > 1.8.0_322-b06) > > OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build > 25.322-b06, > > mixed mode) > > > > === Java home === > > ❯ echo $JAVA_HOME > > /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 > > > > === Ant properties === > > ❯ ant echoproperties | grep java > > [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar > > [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 > > [echoproperties] ant.java.version=1.8 > > [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib > > [echoproperties] build.java.version=11 > > [echoproperties] > java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 > > > > [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment > > [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob > > [echoproperties] java.class.path=/opt/java > > /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > > > > >> > /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an > > > > >> > t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ > > opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- > > > >> > 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja > > va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a > > nt-1.10.8/lib/ant-jsch.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java > > /apache-ant-1.10.8/lib/an >
Re: [VOTE] Release Apache Tomcat 8.5.89
Igal, On 5/10/23 13:49, Igal Sapir wrote: Chris, On Wed, May 10, 2023 at 9:58 AM Christopher Schultz < ch...@christopherschultz.net> wrote: Igal, On 5/10/23 12:12, Igal Sapir wrote: Chris, On Wed, May 10, 2023 at 8:13 AM Christopher Schultz < ch...@christopherschultz.net> wrote: Igal, On 5/10/23 08:48, Igal Sapir wrote: Mark, On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: On 09/05/2023 23:28, Igal Sapir wrote: ch...@christopherschultz.net> wrote: The proposed 8.5.89 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.88 (stable) I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps FWIW I got that error before so I don't think that it should hold back the release. I would just feel much better if I could understand how it is possible for "System cannot be resolved"? I tried it with Java 17 and Java 8. That is a known issue with the Eclipse compiler and Java 17. Are you sure it also fails with Java 8 with "ant clean test"? Thank you for looking into this, but with the upcoming sunset of Tomcat 8.5 I think that it's fine to ignore this issue as it seems like it's something specific to my setup. If you're still interested in more details though, I am including them below. Yes, I am running "ant clean test", but I should have been more clear and specified that with Java 8 I get another error: === Java 8 error begin === Testsuite: org.apache.catalina.filters.TestMapperWebapps Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec Testcase: null took 0.001 sec Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. at java.lang.Thread.run(Thread.java:750) === Java version === ❯ java -version openjdk version "1.8.0_322" OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build 1.8.0_322-b06) OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, mixed mode) === Java home === ❯ echo $JAVA_HOME /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 === Ant properties === ❯ ant echoproperties | grep java [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 [echoproperties] ant.java.version=1.8 [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib [echoproperties] build.java.version=11 [echoproperties] java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob [echoproperties] java.class.path=/opt/java /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a nt-1.10.8/lib/ant-jsch.jar\:/opt/java /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java /apache-ant-1.10.8/lib/an t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bcel. jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar [echoproperties] java.class.version=52.0 [echoproperties] java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed [echoproperties] java.ext.dirs=/opt/java /zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/ext\:/usr/java/packages/lib/ext [echoproperties] java.home=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre [echoproperties] java.io.tmpdir=/tmp [echoproperties] java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib [echoproperties] java.net.preferIPv4Stack=false [echoproperties] java.runtime.name=OpenJDK Runtime Environment [echoproperties] java.runtime.version=1.8.0_322-b06 [echoproperties] java.specification.name=Java Platform API Specification [echoproperties]
Re: [VOTE] Release Apache Tomcat 8.5.89
Chris, On Wed, May 10, 2023 at 9:58 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > Igal, > > On 5/10/23 12:12, Igal Sapir wrote: > > Chris, > > > > On Wed, May 10, 2023 at 8:13 AM Christopher Schultz < > > ch...@christopherschultz.net> wrote: > > > >> Igal, > >> > >> On 5/10/23 08:48, Igal Sapir wrote: > >>> Mark, > >>> > >>> On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: > >>> > On 09/05/2023 23:28, Igal Sapir wrote: > > ch...@christopherschultz.net> wrote: > > > > >> The proposed 8.5.89 release is: > >> [ ] Broken - do not release > >> [ ] Stable - go ahead and release as 8.5.88 (stable) > >> > >> > > I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps > > > > FWIW I got that error before so I don't think that it should hold > back > the > > release. I would just feel much better if I could understand how it > is > > possible for "System cannot be resolved"? I tried it with Java 17 > and > Java > > 8. > > That is a known issue with the Eclipse compiler and Java 17. Are you > sure it also fails with Java 8 with "ant clean test"? > > >>> > >>> Thank you for looking into this, but with the upcoming sunset of Tomcat > >> 8.5 > >>> I think that it's fine to ignore this issue as it seems like it's > >> something > >>> specific to my setup. If you're still interested in more details > >> though, I > >>> am including them below. > >>> > >>> Yes, I am running "ant clean test", but I should have been more clear > and > >>> specified that with Java 8 I get another error: > >>> > >>> === Java 8 error begin === > >>> Testsuite: org.apache.catalina.filters.TestMapperWebapps > >>> Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec > >>> > >>> Testcase: null took 0.001 sec > >>> Caused an ERROR > >>> Forked Java VM exited abnormally. Please note the time in the report > does > >>> not reflect the time until the VM exit. > >>> junit.framework.AssertionFailedError: Forked Java VM exited abnormally. > >>> Please note the time in the report does not reflect the time until the > VM > >>> exit. > >>> at java.lang.Thread.run(Thread.java:750) > >>> > >>> === Java version === > >>> ❯ java -version > >>> openjdk version "1.8.0_322" > >>> OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build > >>> 1.8.0_322-b06) > >>> OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, > >>> mixed mode) > >>> > >>> === Java home === > >>> ❯ echo $JAVA_HOME > >>> /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 > >>> > >>> === Ant properties === > >>> ❯ ant echoproperties | grep java > >>> [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar > >>> [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 > >>> [echoproperties] ant.java.version=1.8 > >>> [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib > >>> [echoproperties] build.java.version=11 > >>> [echoproperties] > >> java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 > >>> > >>> [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment > >>> [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob > >>> [echoproperties] java.class.path=/opt/java > >>> /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > >>> > >> > /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an > >>> > >> > t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ > >>> opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- > >>> > 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja > >>> va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a > >>> nt-1.10.8/lib/ant-jsch.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/an > >>> t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java > >>> /apache-ant-1.10.8/lib/ant-apache-bcel. > >>> jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar > >>> [echoproperties] java.class.version=52.0 > >>> [echoproperties] > >>> > >> > java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed > >>> > >>>
[tomcat] branch main updated: Code clean-up - formatting. No functional change.
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 612e2cd302 Code clean-up - formatting. No functional change.
612e2cd302 is described below
commit 612e2cd302e73340d2b2d85c21cdb5a67d3c9cca
Author: Mark Thomas
AuthorDate: Wed May 10 17:04:27 2023 +0100
Code clean-up - formatting. No functional change.
Main purpose is to trigger CI build to test building with Java 21
---
java/org/apache/catalina/ant/jmx/Arg.java | 8 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 40 +++--
.../catalina/ant/jmx/JMXAccessorConditionBase.java | 36 +++--
.../catalina/ant/jmx/JMXAccessorCreateTask.java| 49 +++---
.../ant/jmx/JMXAccessorEqualsCondition.java| 9 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 26 ++--
.../catalina/ant/jmx/JMXAccessorInvokeTask.java| 67
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 25 +--
.../catalina/ant/jmx/JMXAccessorSetTask.java | 44 +++---
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 173 +
.../ant/jmx/JMXAccessorUnregisterTask.java | 28 ++--
11 files changed, 251 insertions(+), 254 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/Arg.java
b/java/org/apache/catalina/ant/jmx/Arg.java
index dc47302f3a..ba9059cae8 100644
--- a/java/org/apache/catalina/ant/jmx/Arg.java
+++ b/java/org/apache/catalina/ant/jmx/Arg.java
@@ -21,12 +21,12 @@ public class Arg {
private String type;
private String value;
-public void setType( String type) {
-this.type=type;
+public void setType(String type) {
+this.type = type;
}
-public void setValue( String value ) {
-this.value=value;
+public void setValue(String value) {
+this.value = value;
}
public String getValue() {
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index 37e2e6a762..9fe020b2ac 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -20,6 +20,7 @@ import org.apache.tools.ant.BuildException;
/**
* Definition:
+ *
*
* path id="catalina_ant"
* fileset dir="${catalina.home}/server/lib"
@@ -38,6 +39,7 @@ import org.apache.tools.ant.BuildException;
*
*
* Usage: Wait for start backup node
+ *
*
* target name="wait"
* jmxOpen
@@ -61,28 +63,30 @@ import org.apache.tools.ant.BuildException;
* fail if="server.timeout" message="Server ${url} don't answer
inside ${maxwait} sec" /
* echo message="Server ${url} alive" /
* /target
- *
*
+ *
* Allowed operation between jmx attribute and reference value:
*
- * == equals
- * != not equals
+ * == equals
+ * != not equals
* greater than (gt;)
* = greater than or equals (gt;=)
* lesser than (lt;)
* = lesser than or equals (lt;=)
*
- * NOTE: For numeric expressions the type must be set and use xml
entities as operations.
+ * NOTE: For numeric expressions the type must be set and use xml
entities as operations.
* As type we currently support long and double.
+ *
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorCondition extends JMXAccessorConditionBase {
// - Instance Variables
-private String operation = "==" ;
-private String type = "long" ;
+private String operation = "==";
+private String type = "long";
private String unlessCondition;
private String ifCondition;
@@ -95,6 +99,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getOperation() {
return operation;
}
+
/**
* @param operation The operation to set.
*/
@@ -108,6 +113,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getType() {
return type;
}
+
/**
* @param type The type to set.
*/
@@ -121,23 +127,26 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getIf() {
return ifCondition;
}
+
/**
* Only execute if a property of the given name exists in the current
project.
+ *
* @param c property name
*/
public void setIf(String c) {
ifCondition = c;
}
- /**
+/**
* @return Returns the unlessCondition.
*/
public String getUnless() {
return unlessCondition;
}
+
/**
- * Only execute if a property of the given name does not
- * exist in the current project.
+ * Only execute if a property of the given name does not exist in the
current project.
+ *
* @param c property name
Re: [VOTE] Release Apache Tomcat 8.5.89
Igal, On 5/10/23 12:12, Igal Sapir wrote: Chris, On Wed, May 10, 2023 at 8:13 AM Christopher Schultz < ch...@christopherschultz.net> wrote: Igal, On 5/10/23 08:48, Igal Sapir wrote: Mark, On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: On 09/05/2023 23:28, Igal Sapir wrote: ch...@christopherschultz.net> wrote: The proposed 8.5.89 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.88 (stable) I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps FWIW I got that error before so I don't think that it should hold back the release. I would just feel much better if I could understand how it is possible for "System cannot be resolved"? I tried it with Java 17 and Java 8. That is a known issue with the Eclipse compiler and Java 17. Are you sure it also fails with Java 8 with "ant clean test"? Thank you for looking into this, but with the upcoming sunset of Tomcat 8.5 I think that it's fine to ignore this issue as it seems like it's something specific to my setup. If you're still interested in more details though, I am including them below. Yes, I am running "ant clean test", but I should have been more clear and specified that with Java 8 I get another error: === Java 8 error begin === Testsuite: org.apache.catalina.filters.TestMapperWebapps Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec Testcase: null took 0.001 sec Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. at java.lang.Thread.run(Thread.java:750) === Java version === ❯ java -version openjdk version "1.8.0_322" OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build 1.8.0_322-b06) OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, mixed mode) === Java home === ❯ echo $JAVA_HOME /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 === Ant properties === ❯ ant echoproperties | grep java [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 [echoproperties] ant.java.version=1.8 [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib [echoproperties] build.java.version=11 [echoproperties] java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob [echoproperties] java.class.path=/opt/java /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a nt-1.10.8/lib/ant-jsch.jar\:/opt/java /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java /apache-ant-1.10.8/lib/an t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bcel. jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar [echoproperties] java.class.version=52.0 [echoproperties] java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed [echoproperties] java.ext.dirs=/opt/java /zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/ext\:/usr/java/packages/lib/ext [echoproperties] java.home=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre [echoproperties] java.io.tmpdir=/tmp [echoproperties] java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib [echoproperties] java.net.preferIPv4Stack=false [echoproperties] java.runtime.name=OpenJDK Runtime Environment [echoproperties] java.runtime.version=1.8.0_322-b06 [echoproperties] java.specification.name=Java Platform API Specification [echoproperties] java.specification.vendor=Oracle Corporation [echoproperties] java.specification.version=1.8 [echoproperties] java.vendor=Azul Systems, Inc. [echoproperties]
Re: [VOTE] Release Apache Tomcat 8.5.89
Chris, On Wed, May 10, 2023 at 8:13 AM Christopher Schultz < ch...@christopherschultz.net> wrote: > Igal, > > On 5/10/23 08:48, Igal Sapir wrote: > > Mark, > > > > On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: > > > >> On 09/05/2023 23:28, Igal Sapir wrote: > >>> ch...@christopherschultz.net> wrote: > >> > >> > >> > The proposed 8.5.89 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.5.88 (stable) > > > >>> I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps > >>> > >>> FWIW I got that error before so I don't think that it should hold back > >> the > >>> release. I would just feel much better if I could understand how it is > >>> possible for "System cannot be resolved"? I tried it with Java 17 and > >> Java > >>> 8. > >> > >> That is a known issue with the Eclipse compiler and Java 17. Are you > >> sure it also fails with Java 8 with "ant clean test"? > >> > > > > Thank you for looking into this, but with the upcoming sunset of Tomcat > 8.5 > > I think that it's fine to ignore this issue as it seems like it's > something > > specific to my setup. If you're still interested in more details > though, I > > am including them below. > > > > Yes, I am running "ant clean test", but I should have been more clear and > > specified that with Java 8 I get another error: > > > > === Java 8 error begin === > > Testsuite: org.apache.catalina.filters.TestMapperWebapps > > Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec > > > > Testcase: null took 0.001 sec > > Caused an ERROR > > Forked Java VM exited abnormally. Please note the time in the report does > > not reflect the time until the VM exit. > > junit.framework.AssertionFailedError: Forked Java VM exited abnormally. > > Please note the time in the report does not reflect the time until the VM > > exit. > > at java.lang.Thread.run(Thread.java:750) > > > > === Java version === > > ❯ java -version > > openjdk version "1.8.0_322" > > OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build > > 1.8.0_322-b06) > > OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, > > mixed mode) > > > > === Java home === > > ❯ echo $JAVA_HOME > > /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 > > > > === Ant properties === > > ❯ ant echoproperties | grep java > > [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar > > [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 > > [echoproperties] ant.java.version=1.8 > > [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib > > [echoproperties] build.java.version=11 > > [echoproperties] > java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 > > > > [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment > > [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob > > [echoproperties] java.class.path=/opt/java > > /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > > > /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an > > > t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ > > opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- > > 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja > > va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a > > nt-1.10.8/lib/ant-jsch.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java > > /apache-ant-1.10.8/lib/an > > t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java > > /apache-ant-1.10.8/lib/ant-apache-bcel. > > jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar > > [echoproperties] java.class.version=52.0 > > [echoproperties] > > > java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed > > > > [echoproperties] java.ext.dirs=/opt/java > > > /zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/ext\:/usr/java/packages/lib/ext > > > > [echoproperties] > java.home=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre > > > > [echoproperties] java.io.tmpdir=/tmp > > [echoproperties] > > > java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib > > > > [echoproperties]
[tomcat] branch 8.5.x updated: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6ee0828b13 Code clean-up - formatting. No functional change.
6ee0828b13 is described below
commit 6ee0828b13d26ec563923f8e217a7896858679a0
Author: Mark Thomas
AuthorDate: Wed May 10 17:06:50 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index 4f8aa81b46..f0dd05f482 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -154,10 +154,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
}
continue;
}
-if (value == null) {
-continue;
-}
-if ("modelerType".equals(attName)) {
+if ((value == null) || "modelerType".equals(attName)) {
continue;
}
createProperty(pname + attName, value);
-
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: Code clean-up - formatting. No functional change.
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 31203aafe9 Code clean-up - formatting. No functional change.
31203aafe9 is described below
commit 31203aafe9e4b2ba40463a1db71430b1ffef1edc
Author: Mark Thomas
AuthorDate: Wed May 10 17:05:54 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index 4f8aa81b46..f0dd05f482 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -154,10 +154,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
}
continue;
}
-if (value == null) {
-continue;
-}
-if ("modelerType".equals(attName)) {
+if ((value == null) || "modelerType".equals(attName)) {
continue;
}
createProperty(pname + attName, value);
-
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: Code clean-up - formatting. No functional change.
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 b47ac43da6 Code clean-up - formatting. No functional change.
b47ac43da6 is described below
commit b47ac43da6a7bdea27e3319816906fd22cd574f9
Author: Mark Thomas
AuthorDate: Wed May 10 17:05:01 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index 4f8aa81b46..f0dd05f482 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -154,10 +154,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
}
continue;
}
-if (value == null) {
-continue;
-}
-if ("modelerType".equals(attName)) {
+if ((value == null) || "modelerType".equals(attName)) {
continue;
}
createProperty(pname + attName, value);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Improve locking of utility executor
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 ea9a80fe743fca86362a2184806941b655bd0088
Author: Mark Thomas
AuthorDate: Thu May 4 11:41:57 2023 +0100
Improve locking of utility executor
Fixes some edge cases around calling setUtilityThreads() during stop
---
java/org/apache/catalina/core/StandardServer.java | 51 +--
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 8db5d8f05a..f7ac2d2e61 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -429,27 +429,30 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
return;
}
this.utilityThreads = utilityThreads;
-if (oldUtilityThreads != utilityThreads && utilityExecutor != null) {
-
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
+synchronized (utilityExecutorLock) {
+if (oldUtilityThreads != utilityThreads && utilityExecutor !=
null) {
+
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
+}
}
}
+/*
+ * Callers must be holding utilityExecutorLock
+ */
private void reconfigureUtilityExecutor(int threads) {
-synchronized (utilityExecutorLock) {
-// The ScheduledThreadPoolExecutor doesn't use MaximumPoolSize,
only CorePoolSize is available
-if (utilityExecutor != null) {
-utilityExecutor.setCorePoolSize(threads);
-} else {
-ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new
ScheduledThreadPoolExecutor(threads,
-new TaskThreadFactory("Catalina-utility-",
utilityThreadsAsDaemon, Thread.MIN_PRIORITY));
-scheduledThreadPoolExecutor.setKeepAliveTime(10,
TimeUnit.SECONDS);
-scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
-
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
-utilityExecutor = scheduledThreadPoolExecutor;
-utilityExecutorWrapper = new
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(
-utilityExecutor);
-}
+// The ScheduledThreadPoolExecutor doesn't use MaximumPoolSize, only
CorePoolSize is available
+if (utilityExecutor != null) {
+utilityExecutor.setCorePoolSize(threads);
+} else {
+ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new
ScheduledThreadPoolExecutor(threads,
+new TaskThreadFactory("Catalina-utility-",
utilityThreadsAsDaemon, Thread.MIN_PRIORITY));
+scheduledThreadPoolExecutor.setKeepAliveTime(10, TimeUnit.SECONDS);
+scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
+
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+utilityExecutor = scheduledThreadPoolExecutor;
+utilityExecutorWrapper = new
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(
+utilityExecutor);
}
}
@@ -981,8 +984,10 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
super.initInternal();
// Initialize utility executor
-reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
-register(utilityExecutor, "type=UtilityExecutor");
+synchronized (utilityExecutorLock) {
+
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
+register(utilityExecutor, "type=UtilityExecutor");
+}
// Register global String cache
// Note although the cache is global, if there are multiple Servers
@@ -1042,10 +1047,12 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
unregister(onameStringCache);
-if (utilityExecutor != null) {
-utilityExecutor.shutdownNow();
-unregister("type=UtilityExecutor");
-utilityExecutor = null;
+synchronized (utilityExecutorLock) {
+if (utilityExecutor != null) {
+utilityExecutor.shutdownNow();
+unregister("type=UtilityExecutor");
+utilityExecutor = null;
+}
}
super.destroyInternal();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Move management of utility executor from init/destroy to start/stop
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 de6aacea433f28786329ac14f32d41a4d9951ebb
Author: Mark Thomas
AuthorDate: Thu May 4 14:41:01 2023 +0100
Move management of utility executor from init/destroy to start/stop
---
java/org/apache/catalina/connector/Connector.java | 14 ---
java/org/apache/catalina/core/ContainerBase.java | 20 +++-
java/org/apache/catalina/core/StandardServer.java | 28 +++---
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 5 +++-
webapps/docs/changelog.xml | 5
5 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index c504210b64..7339f961b2 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -982,9 +982,6 @@ public class Connector extends LifecycleMBeanBase {
// Initialize adapter
adapter = new CoyoteAdapter(this);
protocolHandler.setAdapter(adapter);
-if (service != null) {
-
protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
-}
// Make sure parseBodyMethodsSet has a default
if (null == parseBodyMethodsSet) {
@@ -1033,9 +1030,15 @@ public class Connector extends LifecycleMBeanBase {
setState(LifecycleState.STARTING);
+// Configure the utility executor before starting the protocol handler
+if (protocolHandler != null && service != null) {
+
protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
+}
+
try {
protocolHandler.start();
} catch (Exception e) {
+// Includes NPE - protocolHandler will be null for invalid
protocol if throwOnFailure is false
throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerStartFailed"),
e);
}
}
@@ -1058,6 +1061,11 @@ public class Connector extends LifecycleMBeanBase {
} catch (Exception e) {
throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerStopFailed"),
e);
}
+
+// Remove the utility executor once the protocol handler has been
stopped
+if (protocolHandler != null) {
+protocolHandler.setUtilityExecutor(null);
+}
}
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 7c96f5de5e..c5bc5994a6 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -820,13 +820,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
}
-@Override
-protected void initInternal() throws LifecycleException {
-reconfigureStartStopExecutor(getStartStopThreads());
-super.initInternal();
-}
-
-
private void reconfigureStartStopExecutor(int threads) {
if (threads == 1) {
// Use a fake executor
@@ -852,6 +845,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
@Override
protected synchronized void startInternal() throws LifecycleException {
+reconfigureStartStopExecutor(getStartStopThreads());
+
// Start our subordinate components, if any
logger = null;
getLogger();
@@ -958,6 +953,12 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).stop();
}
+
+// If init fails, this may be null
+if (startStopExecutor != null) {
+startStopExecutor.shutdownNow();
+startStopExecutor = null;
+}
}
@Override
@@ -987,11 +988,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
parent.removeChild(this);
}
-// If init fails, this may be null
-if (startStopExecutor != null) {
-startStopExecutor.shutdownNow();
-}
-
super.destroyInternal();
}
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index f7ac2d2e61..00e70c8b48 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -909,6 +909,12 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
fireLifecycleEvent(CONFIGURE_START_EVENT, null);
setState(LifecycleState.STARTING);
+// Initialize utility executor
+synchronized (utilityExecutorLock) {
+
[tomcat] branch 9.0.x updated (9d644f3693 -> de6aacea43)
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 9d644f3693 Add date for 9.0.75 new ea9a80fe74 Improve locking of utility executor new de6aacea43 Move management of utility executor from init/destroy to start/stop 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: java/org/apache/catalina/connector/Connector.java | 14 +++-- java/org/apache/catalina/core/ContainerBase.java | 20 +++- java/org/apache/catalina/core/StandardServer.java | 59 -- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 5 +- webapps/docs/changelog.xml | 5 ++ 5 files changed, 61 insertions(+), 42 deletions(-) - 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 (21b9309999 -> 9c3e2c8148)
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 21b930 Update checkstyle patterns for generated parser code new 17b76c6181 Improve locking of utility executor new 9c3e2c8148 Move management of utility executor from init/destroy to start/stop 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: java/org/apache/catalina/connector/Connector.java | 14 +++-- java/org/apache/catalina/core/ContainerBase.java | 20 +++- java/org/apache/catalina/core/StandardServer.java | 59 -- .../apache/catalina/ha/tcp/SimpleTcpCluster.java | 5 +- webapps/docs/changelog.xml | 9 5 files changed, 65 insertions(+), 42 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Move management of utility executor from init/destroy to start/stop
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 9c3e2c8148a513bcd2813761632988d82126df9d
Author: Mark Thomas
AuthorDate: Thu May 4 14:41:01 2023 +0100
Move management of utility executor from init/destroy to start/stop
---
java/org/apache/catalina/connector/Connector.java | 14 ---
java/org/apache/catalina/core/ContainerBase.java | 20 +++-
java/org/apache/catalina/core/StandardServer.java | 28 +++---
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 5 +++-
webapps/docs/changelog.xml | 9 +++
5 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index f9893b992e..18e865e157 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -994,9 +994,6 @@ public class Connector extends LifecycleMBeanBase {
// Initialize adapter
adapter = new CoyoteAdapter(this);
protocolHandler.setAdapter(adapter);
-if (service != null) {
-
protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
-}
// Make sure parseBodyMethodsSet has a default
if (null == parseBodyMethodsSet) {
@@ -1037,9 +1034,15 @@ public class Connector extends LifecycleMBeanBase {
setState(LifecycleState.STARTING);
+// Configure the utility executor before starting the protocol handler
+if (protocolHandler != null && service != null) {
+
protocolHandler.setUtilityExecutor(service.getServer().getUtilityExecutor());
+}
+
try {
protocolHandler.start();
} catch (Exception e) {
+// Includes NPE - protocolHandler will be null for invalid
protocol if throwOnFailure is false
throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerStartFailed"),
e);
}
}
@@ -1062,6 +1065,11 @@ public class Connector extends LifecycleMBeanBase {
} catch (Exception e) {
throw new
LifecycleException(sm.getString("coyoteConnector.protocolHandlerStopFailed"),
e);
}
+
+// Remove the utility executor once the protocol handler has been
stopped
+if (protocolHandler != null) {
+protocolHandler.setUtilityExecutor(null);
+}
}
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 7c96f5de5e..c5bc5994a6 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -820,13 +820,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
}
-@Override
-protected void initInternal() throws LifecycleException {
-reconfigureStartStopExecutor(getStartStopThreads());
-super.initInternal();
-}
-
-
private void reconfigureStartStopExecutor(int threads) {
if (threads == 1) {
// Use a fake executor
@@ -852,6 +845,8 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
@Override
protected synchronized void startInternal() throws LifecycleException {
+reconfigureStartStopExecutor(getStartStopThreads());
+
// Start our subordinate components, if any
logger = null;
getLogger();
@@ -958,6 +953,12 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
if (cluster instanceof Lifecycle) {
((Lifecycle) cluster).stop();
}
+
+// If init fails, this may be null
+if (startStopExecutor != null) {
+startStopExecutor.shutdownNow();
+startStopExecutor = null;
+}
}
@Override
@@ -987,11 +988,6 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
parent.removeChild(this);
}
-// If init fails, this may be null
-if (startStopExecutor != null) {
-startStopExecutor.shutdownNow();
-}
-
super.destroyInternal();
}
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 227784dbb3..5459131810 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -905,6 +905,12 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
fireLifecycleEvent(CONFIGURE_START_EVENT, null);
setState(LifecycleState.STARTING);
+// Initialize utility executor
+synchronized (utilityExecutorLock) {
+
[tomcat] 01/02: Improve locking of utility executor
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 17b76c618145b6d431ade2d1844a65bf04f9ece7
Author: Mark Thomas
AuthorDate: Thu May 4 11:41:57 2023 +0100
Improve locking of utility executor
Fixes some edge cases around calling setUtilityThreads() during stop
---
java/org/apache/catalina/core/StandardServer.java | 51 +--
1 file changed, 29 insertions(+), 22 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index 5f4637153b..227784dbb3 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -425,27 +425,30 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
return;
}
this.utilityThreads = utilityThreads;
-if (oldUtilityThreads != utilityThreads && utilityExecutor != null) {
-
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
+synchronized (utilityExecutorLock) {
+if (oldUtilityThreads != utilityThreads && utilityExecutor !=
null) {
+
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
+}
}
}
+/*
+ * Callers must be holding utilityExecutorLock
+ */
private void reconfigureUtilityExecutor(int threads) {
-synchronized (utilityExecutorLock) {
-// The ScheduledThreadPoolExecutor doesn't use MaximumPoolSize,
only CorePoolSize is available
-if (utilityExecutor != null) {
-utilityExecutor.setCorePoolSize(threads);
-} else {
-ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new
ScheduledThreadPoolExecutor(threads,
-new TaskThreadFactory("Catalina-utility-",
utilityThreadsAsDaemon, Thread.MIN_PRIORITY));
-scheduledThreadPoolExecutor.setKeepAliveTime(10,
TimeUnit.SECONDS);
-scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
-
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
-utilityExecutor = scheduledThreadPoolExecutor;
-utilityExecutorWrapper = new
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(
-utilityExecutor);
-}
+// The ScheduledThreadPoolExecutor doesn't use MaximumPoolSize, only
CorePoolSize is available
+if (utilityExecutor != null) {
+utilityExecutor.setCorePoolSize(threads);
+} else {
+ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new
ScheduledThreadPoolExecutor(threads,
+new TaskThreadFactory("Catalina-utility-",
utilityThreadsAsDaemon, Thread.MIN_PRIORITY));
+scheduledThreadPoolExecutor.setKeepAliveTime(10, TimeUnit.SECONDS);
+scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
+
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+utilityExecutor = scheduledThreadPoolExecutor;
+utilityExecutorWrapper = new
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(
+utilityExecutor);
}
}
@@ -977,8 +980,10 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
super.initInternal();
// Initialize utility executor
-reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
-register(utilityExecutor, "type=UtilityExecutor");
+synchronized (utilityExecutorLock) {
+
reconfigureUtilityExecutor(getUtilityThreadsInternal(utilityThreads));
+register(utilityExecutor, "type=UtilityExecutor");
+}
// Register global String cache
// Note although the cache is global, if there are multiple Servers
@@ -1013,10 +1018,12 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
unregister(onameStringCache);
-if (utilityExecutor != null) {
-utilityExecutor.shutdownNow();
-unregister("type=UtilityExecutor");
-utilityExecutor = null;
+synchronized (utilityExecutorLock) {
+if (utilityExecutor != null) {
+utilityExecutor.shutdownNow();
+unregister("type=UtilityExecutor");
+utilityExecutor = null;
+}
}
super.destroyInternal();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 9.0.75 available
The Apache Tomcat team announces the immediate availability of Apache Tomcat 9.0.75. Apache Tomcat 9 is an open source software implementation of the Java Servlet, JavaServer Pages, Java Unified Expression Language, Java WebSocket and JASPIC technologies. Apache Tomcat 9.0.75 is a bugfix and feature release. The notable changes compared to 9.0.74 include: - Many improvements to the json access log valve. - Deprecate support for the HTTP Connector settings rejectIllegalHeader and allowHostHeaderMismatch. Along with lots of other bug fixes and improvements. Please refer to the change log for the complete list of changes: https://tomcat.apache.org/tomcat-9.0-doc/changelog.html Downloads: https://tomcat.apache.org/download-90.cgi Migration guides from Apache Tomcat 7.x and 8.x: https://tomcat.apache.org/migration.html Enjoy! - The Apache Tomcat team - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Fwd: Call for Presentations, Community Over Code 2023
All, Please see below for the Call for Presentations (CFP) for the upcoming Community Over Code (formerly ApacheCon) Conference. While it's great to hear from committers and PMC members from Tomcat, I prefer to see presentations that come from *outside* of that group. So if you are doing something interesting with Tomcat (or really anything else on the list below, or anything semi-related to any ASF project), please don't hesitate to submit a proposal. You don't even have to write the presentation until you find our if it's been selected, so if you just have an idea, feel free to submit it. Thanks, -chris Forwarded Message Subject: Call for Presentations, Community Over Code 2023 Date: Tue, 09 May 2023 14:24:09 -0700 From: Rich Bowen Reply-To: plann...@apachecon.com To: plann...@apachecon.com (Note: You are receiving this because you are subscribed to the dev@ list for one or more Apache Software Foundation projects.) The Call for Presentations (CFP) for Community Over Code (formerly Apachecon) 2023 is open at https://communityovercode.org/call-for-presentations/, and will close Thu, 13 Jul 2023 23:59:59 GMT. The event will be held in Halifax, Canada, October 7-10, 2023. We welcome submissions on any topic related to the Apache Software Foundation, Apache projects, or the communities around those projects. We are specifically looking for presentations in the following catetegories: Fintech Search Big Data, Storage Big Data, Compute Internet of Things Groovy Incubator Community Data Engineering Performance Engineering Geospatial API/Microservices Frameworks Content Wrangling Tomcat and httpd Cloud and Runtime Streaming Sustainability - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Switch HTTP/2 to use RFC 9218 priorities rather than RFC 7540
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 3c4572b75e Switch HTTP/2 to use RFC 9218 priorities rather than RFC
7540
3c4572b75e is described below
commit 3c4572b75e57375fadbb85a5a2e133b67db912c3
Author: Mark Thomas
AuthorDate: Tue May 9 20:01:46 2023 +0100
Switch HTTP/2 to use RFC 9218 priorities rather than RFC 7540
---
.../apache/coyote/http2/AbstractNonZeroStream.java | 88 ---
java/org/apache/coyote/http2/AbstractStream.java | 49 --
.../coyote/http2/ConnectionSettingsBase.java | 16 +
java/org/apache/coyote/http2/Constants.java| 7 +-
java/org/apache/coyote/http2/FrameType.java| 25 +-
java/org/apache/coyote/http2/Http2Parser.java | 74 ++-
.../apache/coyote/http2/Http2UpgradeHandler.java | 383 +
.../apache/coyote/http2/LocalStrings.properties| 9 +-
.../apache/coyote/http2/LocalStrings_es.properties | 3 -
.../apache/coyote/http2/LocalStrings_fr.properties | 9 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 9 +-
.../apache/coyote/http2/LocalStrings_ko.properties | 5 -
.../coyote/http2/LocalStrings_zh_CN.properties | 5 -
java/org/apache/coyote/http2/Setting.java | 4 +
java/org/apache/coyote/http2/Stream.java | 36 +-
.../util/http/parser/LocalStrings.properties | 14 +
.../util/http/parser/LocalStrings_fr.properties| 14 +
.../util/http/parser/LocalStrings_ja.properties| 14 +
.../util/http/parser/LocalStrings_ko.properties| 14 +
.../util/http/parser/LocalStrings_zh_CN.properties | 8 +
.../apache/tomcat/util/http/parser/Priority.java | 92
.../tomcat/util/http/parser/StructuredField.java | 598 +
test/org/apache/coyote/http2/Http2TestBase.java| 48 +-
.../apache/coyote/http2/TestAbstractStream.java| 286 --
.../apache/coyote/http2/TestHttp2Section_5_3.java | 303 ---
test/org/apache/coyote/http2/TestRfc9218.java | 174 ++
.../tomcat/util/http/parser/TestPriority.java | 32 +-
.../http/parser/TesterHttpWgStructuredField.java | 130 +
webapps/docs/changelog.xml | 9 +
29 files changed, 1406 insertions(+), 1052 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index 9eea0b1ccb..aae614f42c 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -17,11 +17,6 @@
package org.apache.coyote.http2;
import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.res.StringManager;
/**
* Base class for all streams other than stream 0, the connection. Primarily
provides functionality shared between full
@@ -29,15 +24,10 @@ import org.apache.tomcat.util.res.StringManager;
*/
abstract class AbstractNonZeroStream extends AbstractStream {
-private static final Log log =
LogFactory.getLog(AbstractNonZeroStream.class);
-private static final StringManager sm =
StringManager.getManager(AbstractNonZeroStream.class);
-
protected static final ByteBuffer ZERO_LENGTH_BYTEBUFFER =
ByteBuffer.allocate(0);
protected final StreamStateMachine state;
-private volatile int weight = Constants.DEFAULT_WEIGHT;
-
AbstractNonZeroStream(String connectionId, Integer identifier) {
super(identifier);
@@ -51,84 +41,6 @@ abstract class AbstractNonZeroStream extends AbstractStream {
}
-@Override
-final int getWeight() {
-return weight;
-}
-
-
-/*
- * General method used when reprioritising a stream and care needs to be
taken not to create circular references.
- *
- * Changes to the priority tree need to be synchronized at the connection
level. This is the caller's
- * responsibility.
- */
-final void rePrioritise(AbstractStream parent, boolean exclusive, int
weight) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("stream.reprioritisation.debug",
getConnectionId(), getIdAsString(),
-Boolean.toString(exclusive), parent.getIdAsString(),
Integer.toString(weight)));
-}
-
-// Check if new parent is a descendant of this stream
-if (isDescendant(parent)) {
-parent.detachFromParent();
-// Cast is always safe since any descendant of this stream must be
-// an instance of AbstractNonZeroStream
-getParentStream().addChild((AbstractNonZeroStream) parent);
-}
-
-if (exclusive) {
-// Need to move children of the new parent to be children of this
-// stream. Slightly
Re: [VOTE] Release Apache Tomcat 8.5.89
Igal, On 5/10/23 08:48, Igal Sapir wrote: Mark, On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: On 09/05/2023 23:28, Igal Sapir wrote: ch...@christopherschultz.net> wrote: The proposed 8.5.89 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.88 (stable) I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps FWIW I got that error before so I don't think that it should hold back the release. I would just feel much better if I could understand how it is possible for "System cannot be resolved"? I tried it with Java 17 and Java 8. That is a known issue with the Eclipse compiler and Java 17. Are you sure it also fails with Java 8 with "ant clean test"? Thank you for looking into this, but with the upcoming sunset of Tomcat 8.5 I think that it's fine to ignore this issue as it seems like it's something specific to my setup. If you're still interested in more details though, I am including them below. Yes, I am running "ant clean test", but I should have been more clear and specified that with Java 8 I get another error: === Java 8 error begin === Testsuite: org.apache.catalina.filters.TestMapperWebapps Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec Testcase: null took 0.001 sec Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. at java.lang.Thread.run(Thread.java:750) === Java version === ❯ java -version openjdk version "1.8.0_322" OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build 1.8.0_322-b06) OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, mixed mode) === Java home === ❯ echo $JAVA_HOME /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 === Ant properties === ❯ ant echoproperties | grep java [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 [echoproperties] ant.java.version=1.8 [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib [echoproperties] build.java.version=11 [echoproperties] java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob [echoproperties] java.class.path=/opt/java /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a nt-1.10.8/lib/ant-jsch.jar\:/opt/java /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java /apache-ant-1.10.8/lib/an t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bcel. jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar [echoproperties] java.class.version=52.0 [echoproperties] java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed [echoproperties] java.ext.dirs=/opt/java /zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/ext\:/usr/java/packages/lib/ext [echoproperties] java.home=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre [echoproperties] java.io.tmpdir=/tmp [echoproperties] java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib [echoproperties] java.net.preferIPv4Stack=false [echoproperties] java.runtime.name=OpenJDK Runtime Environment [echoproperties] java.runtime.version=1.8.0_322-b06 [echoproperties] java.specification.name=Java Platform API Specification [echoproperties] java.specification.vendor=Oracle Corporation [echoproperties] java.specification.version=1.8 [echoproperties] java.vendor=Azul Systems, Inc. [echoproperties] java.vendor.url=http\://www.azul.com/ [echoproperties] java.vendor.url.bug=http\://www.azul.com/support/ [echoproperties] java.version=1.8.0_322 [echoproperties] java.vm.info=mixed mode [echoproperties]
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/551 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 9d644f369331f51682becfe7299464b877c20a81 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
svn commit: r1909722 - in /tomcat/site/trunk/docs/tomcat-9.0-doc: ./ annotationapi/ annotationapi/javax/annotation/ annotationapi/javax/annotation/security/ annotationapi/javax/annotation/sql/ api/ ap
Author: remm Date: Wed May 10 14:46:27 2023 New Revision: 1909722 URL: http://svn.apache.org/viewvc?rev=1909722=rev Log: Docs update for 9.0.75 [This commit notification would consist of 101 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1909721 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: remm Date: Wed May 10 14:40:52 2023 New Revision: 1909721 URL: http://svn.apache.org/viewvc?rev=1909721=rev Log: Update website for 9.0.75 Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-90.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-90.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-9.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1909721=1909720=1909721=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Wed May 10 14:40:52 2023 @@ -37,7 +37,7 @@ tomcat.loc=https://downloads.apache.org/ # - Tomcat versions - tomcat8.5=8.5.88 -tomcat9.0=9.0.74 +tomcat9.0=9.0.75 tomcat10.0=10.0.27 tomcat10.1=10.1.8 tomcat11.0=11.0.0-M6 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1909721=1909720=1909721=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed May 10 14:40:52 2023 @@ -74,8 +74,8 @@ Latest Stable 9.0.x Release -2023-04-18 -9.0.74 +2023-05-10 +9.0.75 Modified: tomcat/site/trunk/docs/download-90.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1909721=1909720=1909721=diff == --- tomcat/site/trunk/docs/download-90.html (original) +++ tomcat/site/trunk/docs/download-90.html Wed May 10 14:40:52 2023 @@ -10,7 +10,7 @@ Quick Navigation -[define v]9.0.74[end] +[define v]9.0.75[end] https://downloads.apache.org/tomcat/tomcat-9/KEYS;>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1909721=1909720=1909721=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Wed May 10 14:40:52 2023 @@ -34,6 +34,25 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2023-05-10 Tomcat 9.0.75 Released + +The Apache Tomcat Project is proud to announce the release of version 9.0.75 +of Apache Tomcat. This release implements specifications that are part of the +Java EE 8 platform. The notable changes compared to 9.0.74 include: + +Many improvements to the json access log valve. +Deprecate support for the HTTP Connector settings rejectIllegalHeader and + allowHostHeaderMismatch. + + +Full details of these changes, and all the other changes, are available in the +Tomcat 9 +changelog. + + + +https://tomcat.apache.org/download-90.cgi;>Download + 2023-05-09 Tomcat 11.0.0-M6 Released The Apache Tomcat Project is proud to announce the release of version 11.0.0-M6 @@ -124,30 +143,6 @@ reach https://tomcat.apache.org https://tomcat.apache.org/download-80.cgi;>Download -2023-04-18 Tomcat 9.0.74 Released - -The Apache Tomcat Project is proud to announce the release of version 9.0.74 -of Apache Tomcat. This release implements specifications that are part of the -Java EE 8 platform. The notable changes compared to 9.0.73 include: - -Correct a regression in the fix for bug 66442 that meant that streams - without a response body did not decrement the active stream count - when completing, leading to - ERR_HTTP2_SERVER_REFUSED_STREAM for some connections. -Add an access log valve that uses a json format. Based on a pull request - provided by Thomas Meyer. -Refactor synchronization blocks locking on SocketWrapper to use - ReentrantLock to support users wishing to experiment with project Loom. - - -Full details of these changes, and all the other changes, are available in the -Tomcat 9 -changelog. - - - -https://tomcat.apache.org/download-90.cgi;>Download - 2023-04-19 Tomcat 10.1.8 Released The Apache Tomcat Project is proud to announce the release of version 10.1.8 Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1909721=1909720=1909721=diff == --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Wed May 10 14:40:52 2023 @@ -458,7
[tomcat] branch 9.0.x updated: Add date for 9.0.75
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 The following commit(s) were added to refs/heads/9.0.x by this push: new 9d644f3693 Add date for 9.0.75 9d644f3693 is described below commit 9d644f369331f51682becfe7299464b877c20a81 Author: remm AuthorDate: Wed May 10 15:55:09 2023 +0200 Add date for 9.0.75 --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 25bf02c440..aa60bbafb9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -123,7 +123,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r61786 - /dev/tomcat/tomcat-9/v9.0.75/ /release/tomcat/tomcat-9/v9.0.75/
Author: remm Date: Wed May 10 13:53:21 2023 New Revision: 61786 Log: Release Apache Tomcat 9.0.75 Added: release/tomcat/tomcat-9/v9.0.75/ - copied from r61785, dev/tomcat/tomcat-9/v9.0.75/ Removed: dev/tomcat/tomcat-9/v9.0.75/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Release Apache Tomcat 9.0.75
The following votes were cast: Binding: +1: lihan, markt, isapir, remm, funkman, jclere Non binding: +1: Dimitris Soumis No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.89
I can verify the same errors as Igal both when running with Java 17 and 8 on Fedora 36 with Apache Ant 1.10.12. Kind regards, Dimitris On Wed, May 10, 2023 at 4:01 PM Igal Sapir wrote: > Mark, > > On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: > > > On 09/05/2023 23:28, Igal Sapir wrote: > > > ch...@christopherschultz.net> wrote: > > > > > > > > >> The proposed 8.5.89 release is: > > >> [ ] Broken - do not release > > >> [ ] Stable - go ahead and release as 8.5.88 (stable) > > >> > > >> > > > I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps > > > > > > FWIW I got that error before so I don't think that it should hold back > > the > > > release. I would just feel much better if I could understand how it is > > > possible for "System cannot be resolved"? I tried it with Java 17 and > > Java > > > 8. > > > > That is a known issue with the Eclipse compiler and Java 17. Are you > > sure it also fails with Java 8 with "ant clean test"? > > > > Thank you for looking into this, but with the upcoming sunset of Tomcat 8.5 > I think that it's fine to ignore this issue as it seems like it's something > specific to my setup. If you're still interested in more details though, I > am including them below. > > Yes, I am running "ant clean test", but I should have been more clear and > specified that with Java 8 I get another error: > > === Java 8 error begin === > Testsuite: org.apache.catalina.filters.TestMapperWebapps > Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec > > Testcase: null took 0.001 sec > Caused an ERROR > Forked Java VM exited abnormally. Please note the time in the report does > not reflect the time until the VM exit. > junit.framework.AssertionFailedError: Forked Java VM exited abnormally. > Please note the time in the report does not reflect the time until the VM > exit. > at java.lang.Thread.run(Thread.java:750) > > === Java version === > ❯ java -version > openjdk version "1.8.0_322" > OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build > 1.8.0_322-b06) > OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, > mixed mode) > > === Java home === > ❯ echo $JAVA_HOME > /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 > > === Ant properties === > ❯ ant echoproperties | grep java > [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar > [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 > [echoproperties] ant.java.version=1.8 > [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib > [echoproperties] build.java.version=11 > [echoproperties] > java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 > > [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment > [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob > [echoproperties] java.class.path=/opt/java > /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an > t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ > opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- > 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja > va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a > nt-1.10.8/lib/ant-jsch.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java > /apache-ant-1.10.8/lib/an > t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java > /apache-ant-1.10.8/lib/ant-apache-bcel. > jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar > [echoproperties] java.class.version=52.0 > [echoproperties] > > java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed > > [echoproperties] java.ext.dirs=/opt/java > > /zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/ext\:/usr/java/packages/lib/ext > > [echoproperties] > java.home=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre > > [echoproperties] java.io.tmpdir=/tmp > [echoproperties] > > java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib > > [echoproperties] java.net.preferIPv4Stack=false > [echoproperties] java.runtime.name=OpenJDK Runtime Environment > [echoproperties] java.runtime.version=1.8.0_322-b06 > [echoproperties]
Re: [VOTE] Release Apache Tomcat 10.1.9
On Tue, May 9, 2023 at 6:57 PM Christopher Schultz wrote: > > The proposed Apache Tomcat 10.1.9 release is now available for > voting. > > The notable changes compared to 10.1.8 are: > > - Many improvements to the JSON access log valve. > > - Deprecate support for the HTTP Connector settings rejectIllegalHeader >and allowHostHeaderMismatch and reject HTTP headers without names. > > - Add a RateLimitFilter which can be used to mitigate DoS and Brute >Force attacks. > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.9/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1435 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.9 > 5d45c1a9359c2298d7140c1ca90cb8c43809a168 > > The proposed 10.1.9 release is: > [ ] Broken - do not release > [X] Stable - go ahead and release as 10.1.9 Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 8.5.89
Mark, On Wed, May 10, 2023 at 12:43 AM Mark Thomas wrote: > On 09/05/2023 23:28, Igal Sapir wrote: > > ch...@christopherschultz.net> wrote: > > > > >> The proposed 8.5.89 release is: > >> [ ] Broken - do not release > >> [ ] Stable - go ahead and release as 8.5.88 (stable) > >> > >> > > I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps > > > > FWIW I got that error before so I don't think that it should hold back > the > > release. I would just feel much better if I could understand how it is > > possible for "System cannot be resolved"? I tried it with Java 17 and > Java > > 8. > > That is a known issue with the Eclipse compiler and Java 17. Are you > sure it also fails with Java 8 with "ant clean test"? > Thank you for looking into this, but with the upcoming sunset of Tomcat 8.5 I think that it's fine to ignore this issue as it seems like it's something specific to my setup. If you're still interested in more details though, I am including them below. Yes, I am running "ant clean test", but I should have been more clear and specified that with Java 8 I get another error: === Java 8 error begin === Testsuite: org.apache.catalina.filters.TestMapperWebapps Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0 sec Testcase: null took 0.001 sec Caused an ERROR Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. junit.framework.AssertionFailedError: Forked Java VM exited abnormally. Please note the time in the report does not reflect the time until the VM exit. at java.lang.Thread.run(Thread.java:750) === Java version === ❯ java -version openjdk version "1.8.0_322" OpenJDK Runtime Environment (Zulu 8.60.0.21-CA-linux64) (build 1.8.0_322-b06) OpenJDK 64-Bit Server VM (Zulu 8.60.0.21-CA-linux64) (build 25.322-b06, mixed mode) === Java home === ❯ echo $JAVA_HOME /opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64 === Ant properties === ❯ ant echoproperties | grep java [echoproperties] ant.core.lib=/opt/java/apache-ant-1.10.8/lib/ant.jar [echoproperties] ant.home=/opt/java/apache-ant-1.10.8 [echoproperties] ant.java.version=1.8 [echoproperties] ant.library.dir=/opt/java/apache-ant-1.10.8/lib [echoproperties] build.java.version=11 [echoproperties] java.7.home=/opt/java/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 [echoproperties] java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment [echoproperties] java.awt.printerjob=sun.print.PSPrinterJob [echoproperties] java.class.path=/opt/java /apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-imageio.jar\:/opt/java/apache-ant-1.10.8/lib/an t-jai.jar\:/opt/java/apache-ant-1.10.8/lib/ant-apache-xalan2.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-oro.jar\:/ opt/java/apache-ant-1.10.8/lib/ant-launcher.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-net.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-regexp.jar\:/opt/java /apache-ant-1.10.8/lib/ant-testutil.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-resolver.jar\:/opt/java /apache-ant-1.10.8/lib/ant-antlr.jar\:/opt/java/apache-ant- 1.10.8/lib/ant.jar\:/opt/java/apache-ant-1.10.8/lib/ant-xz.jar\:/opt/java /apache-ant-1.10.8/lib/ant-swing.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junit4.jar\:/opt/ja va/apache-ant-1.10.8/lib/ant-netrexx.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-log4j.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bsf.jar\:/opt/java/apache-a nt-1.10.8/lib/ant-jsch.jar\:/opt/java /apache-ant-1.10.8/lib/ant-jdepend.jar\:/opt/java /apache-ant-1.10.8/lib/ant-junitlauncher.jar\:/opt/java /apache-ant-1.10.8/lib/an t-javamail.jar\:/opt/java/apache-ant-1.10.8/lib/ant-jmf.jar\:/opt/java /apache-ant-1.10.8/lib/ant-commons-logging.jar\:/opt/java /apache-ant-1.10.8/lib/ant-apache-bcel. jar\:/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/lib/tools.jar [echoproperties] java.class.version=52.0 [echoproperties] java.endorsed.dirs=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/endorsed [echoproperties] java.ext.dirs=/opt/java /zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre/lib/ext\:/usr/java/packages/lib/ext [echoproperties] java.home=/opt/java/zulu8.60.0.21-ca-jdk8.0.322-linux_x64/jre [echoproperties] java.io.tmpdir=/tmp [echoproperties] java.library.path=/usr/java/packages/lib/amd64\:/usr/lib64\:/lib64\:/lib\:/usr/lib [echoproperties] java.net.preferIPv4Stack=false [echoproperties] java.runtime.name=OpenJDK Runtime Environment [echoproperties] java.runtime.version=1.8.0_322-b06 [echoproperties] java.specification.name=Java Platform API Specification [echoproperties] java.specification.vendor=Oracle Corporation [echoproperties] java.specification.version=1.8 [echoproperties] java.vendor=Azul Systems, Inc. [echoproperties] java.vendor.url=http\://www.azul.com/ [echoproperties] java.vendor.url.bug=http\://www.azul.com/support/ [echoproperties] java.version=1.8.0_322 [echoproperties] java.vm.info=mixed mode
[tomcat] branch 8.5.x updated: Back port JSON parser to 8.5.x (required by HTTP/2 priority back port)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 43ca6e08bc Back port JSON parser to 8.5.x (required by HTTP/2 priority
back port)
43ca6e08bc is described below
commit 43ca6e08bc09f2caa46988c6335939344b208c45
Author: Mark Thomas
AuthorDate: Wed May 10 11:59:47 2023 +0100
Back port JSON parser to 8.5.x (required by HTTP/2 priority back port)
---
build.xml | 13 +-
java/org/apache/tomcat/util/json/JSONParser.java | 655
java/org/apache/tomcat/util/json/JSONParser.jjt| 384 +
.../tomcat/util/json/JSONParserConstants.java | 122 +++
.../tomcat/util/json/JSONParserTokenManager.java | 869 +
.../apache/tomcat/util/json/JavaCharStream.java| 641 +++
.../tomcat/util/json/LocalStrings.properties | 16 +
.../tomcat/util/json/LocalStrings_de.properties| 16 +
.../tomcat/util/json/LocalStrings_fr.properties| 16 +
.../tomcat/util/json/LocalStrings_ja.properties| 16 +
.../tomcat/util/json/LocalStrings_ko.properties| 16 +
.../tomcat/util/json/LocalStrings_zh_CN.properties | 16 +
.../apache/tomcat/util/json/ParseException.java| 212 +
java/org/apache/tomcat/util/json/Token.java| 147
.../org/apache/tomcat/util/json/TokenMgrError.java | 163
15 files changed, 3297 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index d407be0407..c2232942af 100644
--- a/build.xml
+++ b/build.xml
@@ -629,13 +629,16 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/java/org/apache/tomcat/util/json/JSONParser.java
b/java/org/apache/tomcat/util/json/JSONParser.java
new file mode 100644
index 00..0842017739
--- /dev/null
+++ b/java/org/apache/tomcat/util/json/JSONParser.java
@@ -0,0 +1,655 @@
+/* JSONParser.java */
+/* Generated By:JavaCC: Do not edit this line. JSONParser.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.json;
+
+/**
+ * Basic JSON parser generated by JavaCC. It consumes the input provided
through the constructor when
+ * {@code parseObject()}, {@code parseList()}, or {@code parse()} are called,
and there is no way to directly
+ * reset the state.
+ */
+@SuppressWarnings("all") // Ignore warnings in generated code
+public class JSONParser implements JSONParserConstants {
+
+private boolean nativeNumbers = false;
+
+public JSONParser(String input) {
+this(new java.io.StringReader(input));
+}
+
+/**
+ * Parses a JSON object into a Java {@code Map}.
+ */
+public java.util.LinkedHashMap parseObject() throws
ParseException {
+java.util.LinkedHashMap toReturn = object();
+if (!ensureEOF()) {
+throw new IllegalStateException("Expected EOF, but still had
content to parse");
+}
+return toReturn;
+}
+
+/**
+ * Parses a JSON array into a Java {@code List}.
+ */
+public java.util.ArrayList parseArray() throws ParseException {
+java.util.ArrayList toReturn = list();
+if (!ensureEOF()) {
+throw new IllegalStateException("Expected EOF, but still had
content to parse");
+}
+return toReturn;
+}
+
+/**
+ * Parses any JSON-parseable object, returning the value.
+ */
+public Object parse() throws ParseException {
+Object toReturn = anything();
+if (!ensureEOF()) {
+throw new IllegalStateException("Expected EOF, but still had
content to parse");
+}
+return toReturn;
+}
+
+private static String substringBefore(String str, char delim) {
+int pos = str.indexOf(delim);
+if (pos == -1) {
+return str;
+}
+return str.substring(0, pos);
+}
+
+public void setNativeNumbers(boolean value) {
+this.nativeNumbers =
[tomcat] 02/02: Update checkstyle patterns for generated parser code
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 d9f871534f209724b0e176c2d049fc3857c4cc82 Author: Mark Thomas AuthorDate: Wed May 10 11:36:58 2023 +0100 Update checkstyle patterns for generated parser code JSONFilter.java was not being scanned --- build.xml | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index ef15f37441..bb29c06422 100644 --- a/build.xml +++ b/build.xml @@ -869,14 +869,16 @@ - - - - - - + + + + + + + + - 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 (ad291a0531 -> d9f871534f)
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 ad291a0531 Switch HTTP/2 to use RFC 9218 priorities rather than RFC
7540
new 6a582ea9de Rename for consistency with other JavaCC files
new d9f871534f Update checkstyle patterns for generated parser code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 14 --
.../tomcat/util/json/{JSONParser.jj => JSONParser.jjt} | 0
2 files changed, 8 insertions(+), 6 deletions(-)
rename java/org/apache/tomcat/util/json/{JSONParser.jj => JSONParser.jjt}
(100%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Rename for consistency with other JavaCC files
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 6a582ea9de4836a39df6cab86054978b01ca3277
Author: Mark Thomas
AuthorDate: Wed May 10 11:26:06 2023 +0100
Rename for consistency with other JavaCC files
---
java/org/apache/tomcat/util/json/{JSONParser.jj => JSONParser.jjt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/java/org/apache/tomcat/util/json/JSONParser.jj
b/java/org/apache/tomcat/util/json/JSONParser.jjt
similarity index 100%
rename from java/org/apache/tomcat/util/json/JSONParser.jj
rename to java/org/apache/tomcat/util/json/JSONParser.jjt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Rename for consistency with other JavaCC files
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 af2f66f509032648b26e8825aa399349e8ac78d8
Author: Mark Thomas
AuthorDate: Wed May 10 11:26:06 2023 +0100
Rename for consistency with other JavaCC files
---
java/org/apache/tomcat/util/json/{JSONParser.jj => JSONParser.jjt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/java/org/apache/tomcat/util/json/JSONParser.jj
b/java/org/apache/tomcat/util/json/JSONParser.jjt
similarity index 100%
rename from java/org/apache/tomcat/util/json/JSONParser.jj
rename to java/org/apache/tomcat/util/json/JSONParser.jjt
-
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 (169b81341f -> 21b9309999)
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 169b81341f Switch HTTP/2 to use RFC 9218 priorities rather than RFC
7540
new af2f66f509 Rename for consistency with other JavaCC files
new 21b930 Update checkstyle patterns for generated parser code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 14 --
.../tomcat/util/json/{JSONParser.jj => JSONParser.jjt} | 0
2 files changed, 8 insertions(+), 6 deletions(-)
rename java/org/apache/tomcat/util/json/{JSONParser.jj => JSONParser.jjt}
(100%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update checkstyle patterns for generated parser code
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 21b930cac58eed5da3a44608c7e87000a168 Author: Mark Thomas AuthorDate: Wed May 10 11:36:58 2023 +0100 Update checkstyle patterns for generated parser code JSONFilter.java was not being scanned --- build.xml | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 27ba36423b..5eb1cca34b 100644 --- a/build.xml +++ b/build.xml @@ -876,14 +876,16 @@ - - - - - - + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update checkstyle patterns for generated parser code
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 f31b71020aea719abbdb6bbcad84c2f02bb90deb Author: Mark Thomas AuthorDate: Wed May 10 11:36:58 2023 +0100 Update checkstyle patterns for generated parser code JSONFilter.java was not being scanned --- build.xml | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 123b6002ce..a919258b03 100644 --- a/build.xml +++ b/build.xml @@ -871,14 +871,16 @@ - - - - - - + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (9fac707f1e -> f31b71020a)
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 9fac707f1e Add release date for 11.0.0-M6
new 2e9181358c Rename for consistency with other JavaCC files
new f31b71020a Update checkstyle patterns for generated parser code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 14 --
.../tomcat/util/json/{JSONParser.jj => JSONParser.jjt} | 0
2 files changed, 8 insertions(+), 6 deletions(-)
rename java/org/apache/tomcat/util/json/{JSONParser.jj => JSONParser.jjt}
(100%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Rename for consistency with other JavaCC files
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 2e9181358cc43746b491877f79366f13aae3a8c7
Author: Mark Thomas
AuthorDate: Wed May 10 11:26:06 2023 +0100
Rename for consistency with other JavaCC files
---
java/org/apache/tomcat/util/json/{JSONParser.jj => JSONParser.jjt} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/java/org/apache/tomcat/util/json/JSONParser.jj
b/java/org/apache/tomcat/util/json/JSONParser.jjt
similarity index 100%
rename from java/org/apache/tomcat/util/json/JSONParser.jj
rename to java/org/apache/tomcat/util/json/JSONParser.jjt
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Increment version for next development cycle
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 366dfb7cb6 Increment version for next development cycle 366dfb7cb6 is described below commit 366dfb7cb64716962c8e1c3895c70668f741e523 Author: Mark Thomas AuthorDate: Wed May 10 10:43:08 2023 +0100 Increment version for next development cycle --- build.properties.default | 2 +- res/maven/mvn.properties.default | 2 +- webapps/docs/changelog.xml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.properties.default b/build.properties.default index e80d877faf..3fbcbdb3f2 100644 --- a/build.properties.default +++ b/build.properties.default @@ -31,7 +31,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=89 +version.build=90 version.patch=0 version.suffix= version.dev=-dev diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default index 326292d0fc..14a79e3ad6 100644 --- a/res/maven/mvn.properties.default +++ b/res/maven/mvn.properties.default @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=8.5.89 +maven.asf.release.deploy.version=8.5.90 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9ebe17b493..1e951b4fa1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -104,7 +104,9 @@ They eventually become mixed with the numbered issues (i.e., numbered issues do not "pop up" wrt. others). --> - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 9.0.75
On 5/4/23 16:20, Rémy Maucherat wrote: [X] +1, Stable - go ahead and release as 9.0.75 Tested on fedora 37. -- Cheers Jean-Frederic - 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: Switch HTTP/2 to use RFC 9218 priorities rather than RFC 7540
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 ad291a0531 Switch HTTP/2 to use RFC 9218 priorities rather than RFC
7540
ad291a0531 is described below
commit ad291a05314e82b8183467f56a45741c416b7a4d
Author: Mark Thomas
AuthorDate: Tue May 9 20:01:46 2023 +0100
Switch HTTP/2 to use RFC 9218 priorities rather than RFC 7540
---
.../apache/coyote/http2/AbstractNonZeroStream.java | 88 ---
java/org/apache/coyote/http2/AbstractStream.java | 47 --
.../coyote/http2/ConnectionSettingsBase.java | 16 +
java/org/apache/coyote/http2/Constants.java| 7 +-
java/org/apache/coyote/http2/FrameType.java| 25 +-
java/org/apache/coyote/http2/Http2AsyncParser.java | 3 +
java/org/apache/coyote/http2/Http2Parser.java | 82 ++-
.../apache/coyote/http2/Http2UpgradeHandler.java | 367 +
.../apache/coyote/http2/LocalStrings.properties| 9 +-
.../apache/coyote/http2/LocalStrings_cs.properties | 1 -
.../apache/coyote/http2/LocalStrings_es.properties | 3 -
.../apache/coyote/http2/LocalStrings_fr.properties | 9 +-
.../apache/coyote/http2/LocalStrings_ja.properties | 9 +-
.../apache/coyote/http2/LocalStrings_ko.properties | 5 -
.../coyote/http2/LocalStrings_zh_CN.properties | 5 -
java/org/apache/coyote/http2/Setting.java | 4 +
java/org/apache/coyote/http2/Stream.java | 36 +-
.../util/http/parser/LocalStrings.properties | 14 +
.../util/http/parser/LocalStrings_fr.properties| 14 +
.../util/http/parser/LocalStrings_ja.properties| 14 +
.../util/http/parser/LocalStrings_ko.properties| 14 +
.../util/http/parser/LocalStrings_zh_CN.properties | 8 +
.../apache/tomcat/util/http/parser/Priority.java | 92
.../tomcat/util/http/parser/StructuredField.java | 598 +
test/org/apache/coyote/http2/Http2TestBase.java| 48 +-
.../apache/coyote/http2/TestAbstractStream.java| 286 --
.../apache/coyote/http2/TestHttp2Section_5_3.java | 303 ---
test/org/apache/coyote/http2/TestRfc9218.java | 174 ++
.../tomcat/util/http/parser/TestPriority.java | 32 +-
.../http/parser/TesterHttpWgStructuredField.java | 130 +
webapps/docs/changelog.xml | 9 +
31 files changed, 1400 insertions(+), 1052 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
index 9eea0b1ccb..aae614f42c 100644
--- a/java/org/apache/coyote/http2/AbstractNonZeroStream.java
+++ b/java/org/apache/coyote/http2/AbstractNonZeroStream.java
@@ -17,11 +17,6 @@
package org.apache.coyote.http2;
import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.res.StringManager;
/**
* Base class for all streams other than stream 0, the connection. Primarily
provides functionality shared between full
@@ -29,15 +24,10 @@ import org.apache.tomcat.util.res.StringManager;
*/
abstract class AbstractNonZeroStream extends AbstractStream {
-private static final Log log =
LogFactory.getLog(AbstractNonZeroStream.class);
-private static final StringManager sm =
StringManager.getManager(AbstractNonZeroStream.class);
-
protected static final ByteBuffer ZERO_LENGTH_BYTEBUFFER =
ByteBuffer.allocate(0);
protected final StreamStateMachine state;
-private volatile int weight = Constants.DEFAULT_WEIGHT;
-
AbstractNonZeroStream(String connectionId, Integer identifier) {
super(identifier);
@@ -51,84 +41,6 @@ abstract class AbstractNonZeroStream extends AbstractStream {
}
-@Override
-final int getWeight() {
-return weight;
-}
-
-
-/*
- * General method used when reprioritising a stream and care needs to be
taken not to create circular references.
- *
- * Changes to the priority tree need to be synchronized at the connection
level. This is the caller's
- * responsibility.
- */
-final void rePrioritise(AbstractStream parent, boolean exclusive, int
weight) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("stream.reprioritisation.debug",
getConnectionId(), getIdAsString(),
-Boolean.toString(exclusive), parent.getIdAsString(),
Integer.toString(weight)));
-}
-
-// Check if new parent is a descendant of this stream
-if (isDescendant(parent)) {
-parent.detachFromParent();
-// Cast is always safe since any descendant of this stream must be
-// an instance of AbstractNonZeroStream
-getParentStream().addChild((AbstractNonZeroStream) parent);
-}
-
-if (exclusive) {
Re: [VOTE] Release Apache Tomcat 10.1.9
Tests pass on Fedora 36 with Java 17. On Tue, May 9, 2023 at 8:01 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > The proposed Apache Tomcat 10.1.9 release is now available for > voting. > > The notable changes compared to 10.1.8 are: > > - Many improvements to the JSON access log valve. > > - Deprecate support for the HTTP Connector settings rejectIllegalHeader >and allowHostHeaderMismatch and reject HTTP headers without names. > > - Add a RateLimitFilter which can be used to mitigate DoS and Brute >Force attacks. > > For full details, see the change log: > https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html > > Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 > without changes. Java EE applications designed for Tomcat 9 and earlier > may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat > will automatically convert them to Jakarta EE and copy them to the > webapps directory. > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.9/ > > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1435 > > The tag is: > https://github.com/apache/tomcat/tree/10.1.9 > 5d45c1a9359c2298d7140c1ca90cb8c43809a168 > > The proposed 10.1.9 release is: > [ ] Broken - do not release > [X ] Stable - go ahead and release as 10.1.9 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [VOTE] Release Apache Tomcat 8.5.89
On 09/05/2023 23:28, Igal Sapir wrote: ch...@christopherschultz.net> wrote: The proposed 8.5.89 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 8.5.88 (stable) I get FAILED test for org.apache.catalina.mapper.TestMapperWebapps FWIW I got that error before so I don't think that it should hold back the release. I would just feel much better if I could understand how it is possible for "System cannot be resolved"? I tried it with Java 17 and Java 8. That is a known issue with the Eclipse compiler and Java 17. Are you sure it also fails with Java 8 with "ant clean test"? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
