Buildbot success in on tomcat-8.5.x

2023-04-29 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/36/builds/468
Blamelist: Rainer Jung , remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 8.5.x] 28a610b47afe261c41cc88f53d8e529770e8d7c0


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 0

  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



Buildbot success in on tomcat-9.0.x

2023-04-29 Thread buildbot
Build status: Build succeeded!
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/536
Blamelist: Rainer Jung , lihan , 
remm 
Build Text: build successful
Status Detected: restored build
Build Source Stamp: [branch 9.0.x] e3e84b45648c5e16f6941ba3099a8cb748c9e365


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



[tomcat] branch 8.5.x updated: Fix AccessLogValve unit test for %I

2023-04-29 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 28a610b47a Fix AccessLogValve unit test for %I
28a610b47a is described below

commit 28a610b47afe261c41cc88f53d8e529770e8d7c0
Author: Rainer Jung 
AuthorDate: Sat Apr 29 10:22:29 2023 +0200

Fix AccessLogValve unit test for %I
---
 test/org/apache/catalina/valves/TestAccessLogValve.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/valves/TestAccessLogValve.java 
b/test/org/apache/catalina/valves/TestAccessLogValve.java
index ad099ba9c0..d7976cdfbc 100644
--- a/test/org/apache/catalina/valves/TestAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestAccessLogValve.java
@@ -103,8 +103,8 @@ public class TestAccessLogValve extends TomcatBaseTest {
 parameterSets.add(new Object[] {"pct-h", JSON_TYPE, "/", "%h", 
"\\{\"host\":\"" + LOCAL_IP_PATTERN + "\"\\}"});
 parameterSets.add(new Object[] {"pct-H", TEXT_TYPE, "/", "%H", 
"HTTP/1.1"});
 parameterSets.add(new Object[] {"pct-H", JSON_TYPE, "/", "%H", 
"\\{\"protocol\":\"HTTP/1.1\"\\}"});
-parameterSets.add(new Object[] {"pct-I", TEXT_TYPE, "/", "%I", 
"http-nio2?-" + LOCAL_IP_PATTERN + "-auto-\\d+-exec-\\d+"});
-parameterSets.add(new Object[] {"pct-I", JSON_TYPE, "/", "%I", 
"\\{\"threadName\":\"http-nio2?-" + LOCAL_IP_PATTERN + 
"-auto-\\d+-exec-\\d+\"\\}"});
+parameterSets.add(new Object[] {"pct-I", TEXT_TYPE, "/", "%I", 
"http-(nio2?|apr)-" + LOCAL_IP_PATTERN + "-auto-\\d+-exec-\\d+"});
+parameterSets.add(new Object[] {"pct-I", JSON_TYPE, "/", "%I", 
"\\{\"threadName\":\"http-(nio2?|apr)-" + LOCAL_IP_PATTERN + 
"-auto-\\d+-exec-\\d+\"\\}"});
 parameterSets.add(new Object[] {"pct-l", TEXT_TYPE, "/", "%l", "-"});
 parameterSets.add(new Object[] {"pct-l", JSON_TYPE, "/", "%l", 
"\\{\"logicalUserName\":\"-\"\\}"});
 parameterSets.add(new Object[] {"pct-m", TEXT_TYPE, "/", "%m", "GET"});


-
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 AccessLogValve unit test for %I

2023-04-29 Thread rjung
This is an automated email from the ASF dual-hosted git repository.

rjung 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 e3e84b4564 Fix AccessLogValve unit test for %I
e3e84b4564 is described below

commit e3e84b45648c5e16f6941ba3099a8cb748c9e365
Author: Rainer Jung 
AuthorDate: Sat Apr 29 10:21:00 2023 +0200

Fix AccessLogValve unit test for %I
---
 test/org/apache/catalina/valves/TestAccessLogValve.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/org/apache/catalina/valves/TestAccessLogValve.java 
b/test/org/apache/catalina/valves/TestAccessLogValve.java
index 6a3eaf71f0..6eca0980e0 100644
--- a/test/org/apache/catalina/valves/TestAccessLogValve.java
+++ b/test/org/apache/catalina/valves/TestAccessLogValve.java
@@ -105,8 +105,8 @@ public class TestAccessLogValve extends TomcatBaseTest {
 parameterSets.add(new Object[] {"pct-h", JSON_TYPE, "/", "%h", 
"\\{\"host\":\"" + LOCAL_IP_PATTERN + "\"\\}"});
 parameterSets.add(new Object[] {"pct-H", TEXT_TYPE, "/", "%H", 
"HTTP/1.1"});
 parameterSets.add(new Object[] {"pct-H", JSON_TYPE, "/", "%H", 
"\\{\"protocol\":\"HTTP/1.1\"\\}"});
-parameterSets.add(new Object[] {"pct-I", TEXT_TYPE, "/", "%I", 
"http-nio2?-" + LOCAL_IP_PATTERN + "-auto-\\d+-exec-\\d+"});
-parameterSets.add(new Object[] {"pct-I", JSON_TYPE, "/", "%I", 
"\\{\"threadName\":\"http-nio2?-" + LOCAL_IP_PATTERN + 
"-auto-\\d+-exec-\\d+\"\\}"});
+parameterSets.add(new Object[] {"pct-I", TEXT_TYPE, "/", "%I", 
"http-(nio2?|apr)-" + LOCAL_IP_PATTERN + "-auto-\\d+-exec-\\d+"});
+parameterSets.add(new Object[] {"pct-I", JSON_TYPE, "/", "%I", 
"\\{\"threadName\":\"http-(nio2?|apr)-" + LOCAL_IP_PATTERN + 
"-auto-\\d+-exec-\\d+\"\\}"});
 parameterSets.add(new Object[] {"pct-l", TEXT_TYPE, "/", "%l", "-"});
 parameterSets.add(new Object[] {"pct-l", JSON_TYPE, "/", "%l", 
"\\{\"logicalUserName\":\"-\"\\}"});
 parameterSets.add(new Object[] {"pct-m", TEXT_TYPE, "/", "%m", "GET"});


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org