Buildbot success in on tomcat-8.5.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/689 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 8.5.x] 28ae1a311a04fc66e521b5dba97dae523fd03ac6 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
Buildbot failure in on tomcat-10.1.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/44/builds/1056 Blamelist: Mark Thomas Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 10.1.x] 96a5a983df47652a8cd74cd570811c85a6416381 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tine to tag
On 05/12/2023 20:07, Rémy Maucherat wrote: On Tue, Dec 5, 2023 at 8:02 PM Mark Thomas wrote: Hi all, There are a few tasks to complete but we are close to being in a position to tag the December release. The remaining tasks are: - check dependencies for updates - sync with POEditor - fix the new test that fails on NIO2 + Windows - maybe some further improvements to the unit tests Thoughts on tagging once the above tasks are complete? +1 Quick update. All the above is done apart from the POEditor sync. The other task I am looking at is the reported WebSocket memory leak. I haven't been able to recreate it yet. I'm just setting up a Windows based test environment for the issue in case it is OS specific. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tine to tag
Mark, On 12/5/23 14:01, Mark Thomas wrote: There are a few tasks to complete but we are close to being in a position to tag the December release. The remaining tasks are: - check dependencies for updates - sync with POEditor - fix the new test that fails on NIO2 + Windows - maybe some further improvements to the unit tests Thoughts on tagging once the above tasks are complete? +1 -chris - 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: Improve error handling
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 be48ff50e7 Improve error handling
be48ff50e7 is described below
commit be48ff50e7858009d309d930adbbc4bba64500ee
Author: Mark Thomas
AuthorDate: Wed Dec 6 15:06:09 2023 +
Improve error handling
---
webapps/docs/changelog.xml | 8
.../classes/websocket/snake/SnakeAnnotation.java | 23 ++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7e02870dd5..17a855e5b1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,14 @@
+
+
+
+Examples. Improve the error handling so snakes associated with a user
+that drops from the network are removed from the game. (markt)
+
+
+
diff --git
a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
index c030dbcabe..d3d9700021 100644
--- a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
@@ -17,7 +17,7 @@
package websocket.snake;
import java.awt.Color;
-import java.io.EOFException;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
@@ -115,19 +115,26 @@ public class SnakeAnnotation {
@OnError
-public void onError(Throwable t) throws Throwable {
-// Most likely cause is a user closing their browser. Check to see if
-// the root cause is EOF and if it is ignore it.
-// Protect against infinite loops.
+public void onError(Throwable t, Session session) throws Throwable {
+/*
+ * Assume all errors are fatal. Close the session and remove the snake
from the game.
+ */
+session.close();
+onClose();
+/*
+ * Correct action depends on root cause. Protect against infinite
loops while looking for root cause.
+ */
int count = 0;
Throwable root = t;
while (root.getCause() != null && count < 20) {
root = root.getCause();
count ++;
}
-if (root instanceof EOFException) {
-// Assume this is triggered by the user closing their browser and
-// ignore it.
+if (root instanceof IOException) {
+/*
+ * User going away can present in different ways depending on
their platform and exactly what went wrong.
+ * Assume that any IO issue is some form of the user going away
and ignore it.
+ */
} else {
throw t;
}
-
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: Improve error handling
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 28ae1a311a Improve error handling
28ae1a311a is described below
commit 28ae1a311a04fc66e521b5dba97dae523fd03ac6
Author: Mark Thomas
AuthorDate: Wed Dec 6 15:06:09 2023 +
Improve error handling
---
webapps/docs/changelog.xml | 8
.../classes/websocket/snake/SnakeAnnotation.java | 23 ++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6a577ef1cd..2b17983db3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,14 @@
+
+
+
+Examples. Improve the error handling so snakes associated with a user
+that drops from the network are removed from the game. (markt)
+
+
+
diff --git
a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
index c030dbcabe..d3d9700021 100644
--- a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
@@ -17,7 +17,7 @@
package websocket.snake;
import java.awt.Color;
-import java.io.EOFException;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
@@ -115,19 +115,26 @@ public class SnakeAnnotation {
@OnError
-public void onError(Throwable t) throws Throwable {
-// Most likely cause is a user closing their browser. Check to see if
-// the root cause is EOF and if it is ignore it.
-// Protect against infinite loops.
+public void onError(Throwable t, Session session) throws Throwable {
+/*
+ * Assume all errors are fatal. Close the session and remove the snake
from the game.
+ */
+session.close();
+onClose();
+/*
+ * Correct action depends on root cause. Protect against infinite
loops while looking for root cause.
+ */
int count = 0;
Throwable root = t;
while (root.getCause() != null && count < 20) {
root = root.getCause();
count ++;
}
-if (root instanceof EOFException) {
-// Assume this is triggered by the user closing their browser and
-// ignore it.
+if (root instanceof IOException) {
+/*
+ * User going away can present in different ways depending on
their platform and exactly what went wrong.
+ * Assume that any IO issue is some form of the user going away
and ignore it.
+ */
} else {
throw t;
}
-
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: Improve error handling
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 96a5a983df Improve error handling
96a5a983df is described below
commit 96a5a983df47652a8cd74cd570811c85a6416381
Author: Mark Thomas
AuthorDate: Wed Dec 6 15:06:09 2023 +
Improve error handling
---
webapps/docs/changelog.xml | 8
.../classes/websocket/snake/SnakeAnnotation.java | 23 ++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 17548be679..9be9adafd4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,14 @@
+
+
+
+Examples. Improve the error handling so snakes associated with a user
+that drops from the network are removed from the game. (markt)
+
+
+
diff --git
a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
index 43d61c6dc5..7f14ab8cca 100644
--- a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
@@ -17,7 +17,7 @@
package websocket.snake;
import java.awt.Color;
-import java.io.EOFException;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
@@ -115,19 +115,26 @@ public class SnakeAnnotation {
@OnError
-public void onError(Throwable t) throws Throwable {
-// Most likely cause is a user closing their browser. Check to see if
-// the root cause is EOF and if it is ignore it.
-// Protect against infinite loops.
+public void onError(Throwable t, Session session) throws Throwable {
+/*
+ * Assume all errors are fatal. Close the session and remove the snake
from the game.
+ */
+session.close();
+onClose();
+/*
+ * Correct action depends on root cause. Protect against infinite
loops while looking for root cause.
+ */
int count = 0;
Throwable root = t;
while (root.getCause() != null && count < 20) {
root = root.getCause();
count ++;
}
-if (root instanceof EOFException) {
-// Assume this is triggered by the user closing their browser and
-// ignore it.
+if (root instanceof IOException) {
+/*
+ * User going away can present in different ways depending on
their platform and exactly what went wrong.
+ * Assume that any IO issue is some form of the user going away
and ignore it.
+ */
} else {
throw t;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Improve error handling
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 7a775e37ba Improve error handling
7a775e37ba is described below
commit 7a775e37ba58f1674590d43d9032b3f627de0708
Author: Mark Thomas
AuthorDate: Wed Dec 6 15:06:09 2023 +
Improve error handling
---
webapps/docs/changelog.xml | 8
.../classes/websocket/snake/SnakeAnnotation.java | 23 ++
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5396795f2c..da75aafb7c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -155,6 +155,14 @@
+
+
+
+Examples. Improve the error handling so snakes associated with a user
+that drops from the network are removed from the game. (markt)
+
+
+
diff --git
a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
index 43d61c6dc5..7f14ab8cca 100644
--- a/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
+++ b/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
@@ -17,7 +17,7 @@
package websocket.snake;
import java.awt.Color;
-import java.io.EOFException;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
@@ -115,19 +115,26 @@ public class SnakeAnnotation {
@OnError
-public void onError(Throwable t) throws Throwable {
-// Most likely cause is a user closing their browser. Check to see if
-// the root cause is EOF and if it is ignore it.
-// Protect against infinite loops.
+public void onError(Throwable t, Session session) throws Throwable {
+/*
+ * Assume all errors are fatal. Close the session and remove the snake
from the game.
+ */
+session.close();
+onClose();
+/*
+ * Correct action depends on root cause. Protect against infinite
loops while looking for root cause.
+ */
int count = 0;
Throwable root = t;
while (root.getCause() != null && count < 20) {
root = root.getCause();
count ++;
}
-if (root instanceof EOFException) {
-// Assume this is triggered by the user closing their browser and
-// ignore it.
+if (root instanceof IOException) {
+/*
+ * User going away can present in different ways depending on
their platform and exactly what went wrong.
+ * Assume that any IO issue is some form of the user going away
and ignore it.
+ */
} else {
throw t;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-8.5.x
Build status: BUILD FAILED: failed 'rsync -av ...' (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/688 Blamelist: Mark Thomas Build Text: failed 'rsync -av ...' (failure) Status Detected: new failure Build Source Stamp: [branch 8.5.x] d95294f9bc24cf304d30a19e4513732a4807c760 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: 2 -- 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 SpotBugs warning - align with 9.0.x
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 d95294f9bc Fix SpotBugs warning - align with 9.0.x
d95294f9bc is described below
commit d95294f9bc24cf304d30a19e4513732a4807c760
Author: Mark Thomas
AuthorDate: Wed Dec 6 11:55:41 2023 +
Fix SpotBugs warning - align with 9.0.x
---
.../util/security/ConcurrentMessageDigest.java | 31 +++---
.../tomcat/util/security/LocalStrings.properties | 2 ++
.../util/security/LocalStrings_fr.properties | 2 ++
.../util/security/LocalStrings_ja.properties | 2 ++
.../util/security/LocalStrings_ko.properties | 2 ++
.../util/security/LocalStrings_zh_CN.properties| 2 ++
6 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
b/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
index 89ac51a424..831b5fbe5c 100644
--- a/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
+++ b/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
@@ -18,11 +18,12 @@ package org.apache.tomcat.util.security;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.tomcat.util.res.StringManager;
+
/**
* A thread safe wrapper around {@link MessageDigest} that does not make use
* of ThreadLocal and - broadly - only creates enough MessageDigest objects
@@ -30,10 +31,12 @@ import java.util.concurrent.ConcurrentLinkedQueue;
*/
public class ConcurrentMessageDigest {
+private static final StringManager sm =
StringManager.getManager(ConcurrentMessageDigest.class);
+
private static final String MD5 = "MD5";
private static final String SHA1 = "SHA-1";
-private static final Map> queues =
+private static final ConcurrentHashMap> queues
=
new ConcurrentHashMap<>();
@@ -47,7 +50,7 @@ public class ConcurrentMessageDigest {
init(MD5);
init(SHA1);
} catch (NoSuchAlgorithmException e) {
-throw new IllegalArgumentException(e);
+throw new
IllegalArgumentException(sm.getString("concurrentMessageDigest.noDigest"), e);
}
}
@@ -64,11 +67,11 @@ public class ConcurrentMessageDigest {
}
-public static byte[] digest(String algorithm, int rounds, byte[]... input)
{
+public static byte[] digest(String algorithm, int iterations, byte[]...
input) {
Queue queue = queues.get(algorithm);
if (queue == null) {
-throw new IllegalStateException("Must call init() first");
+throw new
IllegalStateException(sm.getString("concurrentMessageDigest.noDigest"));
}
MessageDigest md = queue.poll();
@@ -78,7 +81,7 @@ public class ConcurrentMessageDigest {
} catch (NoSuchAlgorithmException e) {
// Ignore. Impossible if init() has been successfully called
// first.
-throw new IllegalStateException("Must call init() first");
+throw new
IllegalStateException(sm.getString("concurrentMessageDigest.noDigest"), e);
}
}
@@ -89,8 +92,8 @@ public class ConcurrentMessageDigest {
byte[] result = md.digest();
// Subsequent rounds
-if (rounds > 1) {
-for (int i = 1; i < rounds; i++) {
+if (iterations > 1) {
+for (int i = 1; i < iterations; i++) {
md.update(result);
result = md.digest();
}
@@ -113,13 +116,11 @@ public class ConcurrentMessageDigest {
* JVM
*/
public static void init(String algorithm) throws NoSuchAlgorithmException {
-synchronized (queues) {
-if (!queues.containsKey(algorithm)) {
-MessageDigest md = MessageDigest.getInstance(algorithm);
-Queue queue = new ConcurrentLinkedQueue<>();
-queue.add(md);
-queues.put(algorithm, queue);
-}
+if (!queues.containsKey(algorithm)) {
+MessageDigest md = MessageDigest.getInstance(algorithm);
+Queue queue = new ConcurrentLinkedQueue<>();
+queue.add(md);
+queues.putIfAbsent(algorithm, queue);
}
}
}
diff --git a/java/org/apache/tomcat/util/security/LocalStrings.properties
b/java/org/apache/tomcat/util/security/LocalStrings.properties
index 9d8090a6ff..39e92df46d 100644
--- a/java/org/apache/tomcat/util/security/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/security/LocalStrings.properties
@@ -13,5 +13,7 @@
(tomcat) branch 8.5.x updated: Align with 9.0.x
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 eeac57b0ea Align with 9.0.x
eeac57b0ea is described below
commit eeac57b0ea1eb41d903167423e91832653aff684
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:21:52 2023 +
Align with 9.0.x
---
build.properties.default | 2 --
1 file changed, 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 8af9dbbeeb..0d06d422ff 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -308,8 +308,6 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - JSign, version 4.1 or later -
jsign.version=5.0
-
-# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update Derby to 10.17.1.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 34709c4ea6 Update Derby to 10.17.1.0
34709c4ea6 is described below
commit 34709c4ea61643af5d29bcdc451a82aa0d804d76
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:21:52 2023 +
Update Derby to 10.17.1.0
---
build.properties.default | 14 --
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c2cf07d033..f3de70d738 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -305,8 +305,6 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.3.0 or later -
# - provides OSGI metadata for JARs -
bnd.version=7.0.0
-
-# checksums for biz.aQute.bnd-6.4.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
bnd.checksum.value=654776477ed942fc53f581fec66e253a|9937f6b7528628964a4ab8e50ba6b964d0310bce
@@ -317,8 +315,6 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - JSign, version 4.1 or later -
jsign.version=5.0
-
-# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
@@ -328,18 +324,16 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-derby.version=10.16.1.1
-
-# checksums for Derby 10.16.1.1
+derby.version=10.17.1.0
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
+derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
+derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
+derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3e12fd3a9a..7e02870dd5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,9 @@
Update SpotBugs to 4.8.2. (markt)
+
+Update Derby to 10.17.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update Derby to 10.17.1.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 3a84531e59 Update Derby to 10.17.1.0
3a84531e59 is described below
commit 3a84531e596c5200c6aa5a80c59378a1957181fe
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:21:52 2023 +
Update Derby to 10.17.1.0
---
build.properties.default | 16
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ea448a360a..91590d94d6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -303,8 +303,6 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.3.0 or later -
# - provides OSGI metadata for JARs -
bnd.version=7.0.0
-
-# checksums for biz.aQute.bnd-6.4.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
bnd.checksum.value=654776477ed942fc53f581fec66e253a|9937f6b7528628964a4ab8e50ba6b964d0310bce
@@ -315,8 +313,6 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - Tomcat Migration Tool for Jakarta EE -
migration-lib.version=1.0.7
-
-# checksums for jakartaee-migration-1.0.7-shaded.jar
migration-lib.checksum.enabled=true
migration-lib.checksum.algorithm=MD5|SHA-1
migration-lib.checksum.value=378eeda7171284210688349f31e60e73|2baf7f729b409b47467c2ea998216441bf1c33cc
@@ -339,8 +335,6 @@
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17
# - JSign, version 4.1 or later -
jsign.version=5.0
-
-# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
@@ -350,18 +344,16 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-derby.version=10.16.1.1
-
-# checksums for Derby 10.16.1.1
+derby.version=10.17.1.0
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
+derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
+derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
+derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 995aa22505..17548be679 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,6 +150,9 @@
Update SpotBugs to 4.8.2. (markt)
+
+Update Derby to 10.17.1. (markt)
+
-
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: Update SpotBugs to 4.8.2
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 6d0d2eabc7 Update SpotBugs to 4.8.2
6d0d2eabc7 is described below
commit 6d0d2eabc7be145e6e05965f31ce0e37afae2e5c
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:19:37 2023 +
Update SpotBugs to 4.8.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f5e927e777..8af9dbbeeb 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -298,10 +298,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.0
+spotbugs.version=4.8.2
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=bec2c8179db0a1e28ac55ef66e130b74206fc82f840d356a4b0a302ebf285ce68d1e65347afa2e309a013c411f4151e4e2260d2a89e032a8ff66167475501ae6
+spotbugs.checksum.value=57d3e39ce381470dbf5c2c09ceed75946679c72c9b5f2123cd49d396e356154fdd874cdc606d05b1ce401cc92bee16f769789cfb6f3955c04ff48c494ef5dd2a
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5a7a6a8560..6a577ef1cd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,9 @@
Update Checkstyle to 10.12.5. (markt)
+
+Update SpotBugs to 4.8.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update SpotBugs to 4.8.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new bc00f3b143 Update SpotBugs to 4.8.2
bc00f3b143 is described below
commit bc00f3b143b387ce247ce9e7073c11fe0a1f5361
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:19:37 2023 +
Update SpotBugs to 4.8.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 367e890d98..ea448a360a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -292,10 +292,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.0
+spotbugs.version=4.8.2
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=bec2c8179db0a1e28ac55ef66e130b74206fc82f840d356a4b0a302ebf285ce68d1e65347afa2e309a013c411f4151e4e2260d2a89e032a8ff66167475501ae6
+spotbugs.checksum.value=57d3e39ce381470dbf5c2c09ceed75946679c72c9b5f2123cd49d396e356154fdd874cdc606d05b1ce401cc92bee16f769789cfb6f3955c04ff48c494ef5dd2a
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 89007982c0..995aa22505 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -147,6 +147,9 @@
Update Checkstyle to 10.12.5. (markt)
+
+Update SpotBugs to 4.8.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update checkstyle to 10.12.5
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 951d45bb61 Update checkstyle to 10.12.5
951d45bb61 is described below
commit 951d45bb61d793e8afa3fc4abbf5247788925926
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:17:59 2023 +
Update checkstyle to 10.12.5
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 6436945004..40d645b41e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.4
+checkstyle.version=10.12.5
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=260087a664b4fbef9c49684729c722397e83d79569875037689f75526caacdfce0fc1e7ac7c1dd7214f74bba96466da5b66c5a02849a7b256c14ec246ae7f12a
+checkstyle.checksum.value=1f307511ba9c84d395749500e1914b47fa9517641d2910335de83373754354d4af709d74d6e63cb823b982689838ff978a7e5dd975a498173dff86f0643daedd
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3425375622..03e5f8de7c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,9 @@
Update UnboundID to 6.0.11. (markt)
+
+Update Checkstyle to 10.12.5. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update SpotBugs to 4.8.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new f51bdb0ace Update SpotBugs to 4.8.2
f51bdb0ace is described below
commit f51bdb0acee53ced1635179ce364bf83030c6b16
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:19:37 2023 +
Update SpotBugs to 4.8.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 40d645b41e..c2cf07d033 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -294,10 +294,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.0
+spotbugs.version=4.8.2
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=bec2c8179db0a1e28ac55ef66e130b74206fc82f840d356a4b0a302ebf285ce68d1e65347afa2e309a013c411f4151e4e2260d2a89e032a8ff66167475501ae6
+spotbugs.checksum.value=57d3e39ce381470dbf5c2c09ceed75946679c72c9b5f2123cd49d396e356154fdd874cdc606d05b1ce401cc92bee16f769789cfb6f3955c04ff48c494ef5dd2a
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 03e5f8de7c..3e12fd3a9a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,9 @@
Update Checkstyle to 10.12.5. (markt)
+
+Update SpotBugs to 4.8.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Update UnboundID to 6.0.11
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 c23782a75e Update UnboundID to 6.0.11
c23782a75e is described below
commit c23782a75ea0483ee21dda83f73e17ef212ece27
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:16:20 2023 +
Update UnboundID to 6.0.11
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 9 -
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 959128ab6a..6436945004 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -267,10 +267,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.10
+unboundid.version=6.0.11
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
+unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ba40c2d759..3425375622 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,13 @@
+
+
+
+Update UnboundID to 6.0.11. (markt)
+
+
+
@@ -388,7 +395,7 @@
Tomcat JARs. (markt)
-Update UnboundID to 6.0.9. (markt)
+Update UnboundID to 6.0.10. (markt)
Update Checkstyle to 10.12.3. (markt)
-
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: Update checkstyle to 10.12.5
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 7d90a8ab67 Update checkstyle to 10.12.5
7d90a8ab67 is described below
commit 7d90a8ab67ec46e6dc66507256983692324ab3c7
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:17:59 2023 +
Update checkstyle to 10.12.5
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 686e3ea6db..f5e927e777 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.4
+checkstyle.version=10.12.5
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=260087a664b4fbef9c49684729c722397e83d79569875037689f75526caacdfce0fc1e7ac7c1dd7214f74bba96466da5b66c5a02849a7b256c14ec246ae7f12a
+checkstyle.checksum.value=1f307511ba9c84d395749500e1914b47fa9517641d2910335de83373754354d4af709d74d6e63cb823b982689838ff978a7e5dd975a498173dff86f0643daedd
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 29cbe2e71e..5a7a6a8560 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,9 @@
Update UnboundID to 6.0.11. (markt)
+
+Update Checkstyle to 10.12.5. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update checkstyle to 10.12.5
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 e9d9945c3c Update checkstyle to 10.12.5
e9d9945c3c is described below
commit e9d9945c3c21b4fcc044ae9582ae17018503844f
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:17:59 2023 +
Update checkstyle to 10.12.5
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f58965a3cf..367e890d98 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -274,10 +274,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.4
+checkstyle.version=10.12.5
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=260087a664b4fbef9c49684729c722397e83d79569875037689f75526caacdfce0fc1e7ac7c1dd7214f74bba96466da5b66c5a02849a7b256c14ec246ae7f12a
+checkstyle.checksum.value=1f307511ba9c84d395749500e1914b47fa9517641d2910335de83373754354d4af709d74d6e63cb823b982689838ff978a7e5dd975a498173dff86f0643daedd
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e8172f7bf4..89007982c0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,9 @@
Update UnboundID to 6.0.11. (markt)
+
+Update Checkstyle to 10.12.5. (markt)
+
-
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: Update UnboundID to 6.0.11
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 027d4b51a2 Update UnboundID to 6.0.11
027d4b51a2 is described below
commit 027d4b51a207fd9bfb3a8c19580e9dd2a8ad0e2b
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:16:20 2023 +
Update UnboundID to 6.0.11
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 9 -
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b8429bb0ce..686e3ea6db 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.10
+unboundid.version=6.0.11
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
+unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 12ee52195c..29cbe2e71e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,13 @@
+
+
+
+Update UnboundID to 6.0.11. (markt)
+
+
+
@@ -363,7 +370,7 @@
to tracking the 1.x branch. (markt)
-Update UnboundID to 6.0.9. (markt)
+Update UnboundID to 6.0.10. (markt)
Update Checkstyle to 10.12.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Update UnboundID to 6.0.11
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 f14bd973ad Update UnboundID to 6.0.11
f14bd973ad is described below
commit f14bd973adc8bd2898a3456b033620e936ef4c9f
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:16:20 2023 +
Update UnboundID to 6.0.11
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 890066f997..f58965a3cf 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -265,10 +265,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.10
+unboundid.version=6.0.11
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
+unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 314f1427a3..e8172f7bf4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,9 @@
68124: Migrate sample.war from javax to jakarta. (lihan)
+
+Update UnboundID to 6.0.11. (markt)
+
@@ -401,7 +404,7 @@
Tomcat JARs. (markt)
-Update UnboundID to 6.0.9. (markt)
+Update UnboundID to 6.0.10. (markt)
Update Checkstyle to 10.12.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (230dfbc0aa -> 5363aab361)
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 230dfbc0aa tabs -> spaces new 354397fe81 Update UnboundID to 6.0.11 new efbfad4bcd Update checkstyle to 10.12.5 new b63fa93793 Update SpotBugs to 4.8.2 new 5363aab361 Update Derby to 10.17.1.0 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.properties.default | 28 ++-- webapps/docs/changelog.xml | 14 +- 2 files changed, 23 insertions(+), 19 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/04: Update UnboundID to 6.0.11
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 354397fe81b7a74cf75a736ffe1b9aab3667b470
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:16:20 2023 +
Update UnboundID to 6.0.11
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 5 -
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 693f47e701..1bebe071f8 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -244,10 +244,10 @@
objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
# - UnboundID, used by unit tests, version 5.1.4 or later -
-unboundid.version=6.0.10
+unboundid.version=6.0.11
unboundid.checksum.enabled=true
unboundid.checksum.algorithm=SHA-512
-unboundid.checksum.value=a89df8aaf5d8612465f9be710bd98941f9e738cac6447a3b333a3f9e2fee6ce8120d3673d1cf0604744f4273d19a4fc5e964088109e8e6b6e4852e7528b1
+unboundid.checksum.value=4bb1dc4adef77fd124d1b184556c44b44945fc69f62662c62f46cff9a6792c24ed385c6a01854797ec069df42286ba51b3d1e3c7a6ee9ee4a3e69908850ffa36
unboundid.home=${base.path}/unboundid-${unboundid.version}
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d2f298faf8..fae7d54e8f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -163,6 +163,9 @@
68124: Migrate sample.war from javax to jakarta. (lihan)
+
+Update UnboundID to 6.0.11. (markt)
+
@@ -443,7 +446,7 @@
Update to the Eclipse JDT compiler 4.29. (markt)
-Update UnboundID to 6.0.9. (markt)
+Update UnboundID to 6.0.10. (markt)
Update Checkstyle to 10.12.3. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/04: Update SpotBugs to 4.8.2
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b63fa937931d581f1e31631f36e2e8b511616f5c
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:19:37 2023 +
Update SpotBugs to 4.8.2
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 605f6a5e02..9f236d6a7d 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -271,10 +271,10 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# - SpotBugs (originally FindBugs) -
-spotbugs.version=4.8.0
+spotbugs.version=4.8.2
spotbugs.checksum.enabled=true
spotbugs.checksum.algorithm=SHA-512
-spotbugs.checksum.value=bec2c8179db0a1e28ac55ef66e130b74206fc82f840d356a4b0a302ebf285ce68d1e65347afa2e309a013c411f4151e4e2260d2a89e032a8ff66167475501ae6
+spotbugs.checksum.value=57d3e39ce381470dbf5c2c09ceed75946679c72c9b5f2123cd49d396e356154fdd874cdc606d05b1ce401cc92bee16f769789cfb6f3955c04ff48c494ef5dd2a
spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b9e2e3081..64c866fe80 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -169,6 +169,9 @@
Update Checkstyle to 10.12.5. (markt)
+
+Update SpotBugs to 4.8.2. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 04/04: Update Derby to 10.17.1.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5363aab3613f4c2d5ac0b27f3ac3760ff0cc8e00
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:21:52 2023 +
Update Derby to 10.17.1.0
---
build.properties.default | 16
webapps/docs/changelog.xml | 3 +++
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 9f236d6a7d..608e2b0a7b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -282,8 +282,6 @@
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/
# - bnd, version 6.3.0 or later -
# - provides OSGI metadata for JARs -
bnd.version=7.0.0
-
-# checksums for biz.aQute.bnd-6.4.1.jar
bnd.checksum.enabled=true
bnd.checksum.algorithm=MD5|SHA-1
bnd.checksum.value=654776477ed942fc53f581fec66e253a|9937f6b7528628964a4ab8e50ba6b964d0310bce
@@ -294,8 +292,6 @@
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.b
# - Tomcat Migration Tool for Jakarta EE -
migration-lib.version=1.0.7
-
-# checksums for jakartaee-migration-1.0.7-shaded.jar
migration-lib.checksum.enabled=true
migration-lib.checksum.algorithm=MD5|SHA-1
migration-lib.checksum.value=378eeda7171284210688349f31e60e73|2baf7f729b409b47467c2ea998216441bf1c33cc
@@ -306,8 +302,6 @@
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migr
# - JSign, version 4.1 or later -
jsign.version=5.0
-
-# checksums for JSign 5.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
@@ -317,18 +311,16 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
# - Derby, used by unit tests -
-derby.version=10.16.1.1
-
-# checksums for Derby 10.16.1.1
+derby.version=10.17.1.0
derby.checksum.enabled=true
derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=d9c38ece80f4ec0756f54b06716a3dd6|f9ca2054b3e33ec3f3f19df4a7490352d82de54a
+derby.checksum.value=0665c8f3365fca01eb639e41f7685991|e90e61e8ee731614a9bafd3d81155e09fff5e80c
derby-shared.checksum.enabled=true
derby-shared.checksum.algorithm=MD5|SHA-1
-derby-shared.checksum.value=e423cba3150f195debaf7ff0d307ecf6|77a3ec6b9791c7c29c76148c5d56fc1f3f12d638
+derby-shared.checksum.value=ce2d7164d5cda8ac3a1ede81023814d4|e6eac60d1b80b3781dff97ccef88fa131043f2a5
derby-tools.checksum.enabled=true
derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=25b138905deb681ff167a5a04d29c3c6|32a5335f9087022cd8ca5c85f35f8c844b1360a9
+derby-tools.checksum.value=ea7b7cba09a4056219e888bcdc1a3bb7|6d1a4e5e0f5c26516abbba85ece081506b9ad2e1
derby.home=${base.path}/derby-${derby.version}
derby.jar=${derby.home}/derby-${derby.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 64c866fe80..5396795f2c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,9 @@
Update SpotBugs to 4.8.2. (markt)
+
+Update Derby to 10.17.1. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/04: Update checkstyle to 10.12.5
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 efbfad4bcd8d3a522e989332d5d11b7b6b1d8473
Author: Mark Thomas
AuthorDate: Wed Dec 6 10:17:59 2023 +
Update checkstyle to 10.12.5
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1bebe071f8..605f6a5e02 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -253,10 +253,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.4
+checkstyle.version=10.12.5
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=260087a664b4fbef9c49684729c722397e83d79569875037689f75526caacdfce0fc1e7ac7c1dd7214f74bba96466da5b66c5a02849a7b256c14ec246ae7f12a
+checkstyle.checksum.value=1f307511ba9c84d395749500e1914b47fa9517641d2910335de83373754354d4af709d74d6e63cb823b982689838ff978a7e5dd975a498173dff86f0643daedd
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fae7d54e8f..7b9e2e3081 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -166,6 +166,9 @@
Update UnboundID to 6.0.11. (markt)
+
+Update Checkstyle to 10.12.5. (markt)
+
-
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 failing test.
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 97ca59504d Fix failing test.
97ca59504d is described below
commit 97ca59504dc6747fbfbc7619c55069a9441308fa
Author: Mark Thomas
AuthorDate: Wed Dec 6 08:55:03 2023 +
Fix failing test.
NIO2 + Windows behaves slightly differently to NIO2 + Linux.
---
test/org/apache/catalina/connector/TestClientReadTimeout.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestClientReadTimeout.java
b/test/org/apache/catalina/connector/TestClientReadTimeout.java
index 66a3334487..9342249ab0 100644
--- a/test/org/apache/catalina/connector/TestClientReadTimeout.java
+++ b/test/org/apache/catalina/connector/TestClientReadTimeout.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
+import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import javax.servlet.ServletException;
@@ -65,7 +66,12 @@ public class TestClientReadTimeout extends TomcatBaseTest {
os.write(request.getBytes(StandardCharsets.UTF_8));
InputStream is = socket.getInputStream();
BufferedReader reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
-String opening = reader.readLine();
+String opening = null;
+try {
+opening = reader.readLine();
+} catch (SocketException e) {
+// Handled below. An exception here means opening will be null
+}
if
(tomcat.getConnector().getProtocolHandlerClassName().contains("Nio2")) {
Assert.assertNull("NIO2 unexpectedly returned a response",
opening);
} else {
-
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 failing test.
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 37bdca36c6 Fix failing test.
37bdca36c6 is described below
commit 37bdca36c6c4275d0c87eb0d9aa412a7ca1c13c8
Author: Mark Thomas
AuthorDate: Wed Dec 6 08:55:03 2023 +
Fix failing test.
NIO2 + Windows behaves slightly differently to NIO2 + Linux.
---
test/org/apache/catalina/connector/TestClientReadTimeout.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestClientReadTimeout.java
b/test/org/apache/catalina/connector/TestClientReadTimeout.java
index 66a3334487..9342249ab0 100644
--- a/test/org/apache/catalina/connector/TestClientReadTimeout.java
+++ b/test/org/apache/catalina/connector/TestClientReadTimeout.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
+import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import javax.servlet.ServletException;
@@ -65,7 +66,12 @@ public class TestClientReadTimeout extends TomcatBaseTest {
os.write(request.getBytes(StandardCharsets.UTF_8));
InputStream is = socket.getInputStream();
BufferedReader reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
-String opening = reader.readLine();
+String opening = null;
+try {
+opening = reader.readLine();
+} catch (SocketException e) {
+// Handled below. An exception here means opening will be null
+}
if
(tomcat.getConnector().getProtocolHandlerClassName().contains("Nio2")) {
Assert.assertNull("NIO2 unexpectedly returned a response",
opening);
} else {
-
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 failing test.
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 8858ce343f Fix failing test.
8858ce343f is described below
commit 8858ce343fa2174b82f606a63959d3bc68aade3d
Author: Mark Thomas
AuthorDate: Wed Dec 6 08:55:03 2023 +
Fix failing test.
NIO2 + Windows behaves slightly differently to NIO2 + Linux.
---
test/org/apache/catalina/connector/TestClientReadTimeout.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestClientReadTimeout.java
b/test/org/apache/catalina/connector/TestClientReadTimeout.java
index c2d00f521f..8c25542675 100644
--- a/test/org/apache/catalina/connector/TestClientReadTimeout.java
+++ b/test/org/apache/catalina/connector/TestClientReadTimeout.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
+import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import jakarta.servlet.ServletException;
@@ -65,7 +66,12 @@ public class TestClientReadTimeout extends TomcatBaseTest {
os.write(request.getBytes(StandardCharsets.UTF_8));
InputStream is = socket.getInputStream();
BufferedReader reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
-String opening = reader.readLine();
+String opening = null;
+try {
+opening = reader.readLine();
+} catch (SocketException e) {
+// Handled below. An exception here means opening will be null
+}
if
(tomcat.getConnector().getProtocolHandlerClassName().contains("Nio2")) {
Assert.assertNull("NIO2 unexpectedly returned a response",
opening);
} else {
-
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: Improve performance of HTTP/2 tests
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 c60cf86282 Improve performance of HTTP/2 tests
c60cf86282 is described below
commit c60cf862827033426583d67e34ece11e0b621a6b
Author: Mark Thomas
AuthorDate: Tue Dec 5 12:16:18 2023 +
Improve performance of HTTP/2 tests
---
test/org/apache/coyote/http2/Http2TestBase.java| 3 ++-
test/org/apache/coyote/http2/TestHttp2Section_4_2.java | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index 8daaa07294..e25130c1c3 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http2;
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -622,7 +623,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
s = socketFactory.createSocket("localhost", getPort());
s.setSoTimeout(3);
-os = s.getOutputStream();
+os = new BufferedOutputStream(s.getOutputStream());
InputStream is = s.getInputStream();
input = new TestInput(is);
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
index 3c158c724d..d73a2495a7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
@@ -51,6 +51,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
}
os.write(settings);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -73,6 +74,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -95,6 +97,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -118,6 +121,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(priority);
+os.flush();
// Read Stream reset frame
parser.readFrame();
-
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: Improve performance of HTTP/2 tests
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 1265e0199d Improve performance of HTTP/2 tests
1265e0199d is described below
commit 1265e0199d602ae3e3f90b1283e280dea4247eaf
Author: Mark Thomas
AuthorDate: Tue Dec 5 12:16:18 2023 +
Improve performance of HTTP/2 tests
---
test/org/apache/coyote/http2/Http2TestBase.java| 3 ++-
test/org/apache/coyote/http2/TestHttp2Section_4_2.java | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index 869881fac4..9341ea68b6 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http2;
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -642,7 +643,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
s = socketFactory.createSocket("localhost", getPort());
s.setSoTimeout(3);
-os = s.getOutputStream();
+os = new BufferedOutputStream(s.getOutputStream());
InputStream is = s.getInputStream();
input = new TestInput(is);
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
index 3c158c724d..d73a2495a7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
@@ -51,6 +51,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
}
os.write(settings);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -73,6 +74,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -95,6 +97,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -118,6 +121,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(priority);
+os.flush();
// Read Stream reset frame
parser.readFrame();
-
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: Improve performance of HTTP/2 tests
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 d23dd5c1d8 Improve performance of HTTP/2 tests
d23dd5c1d8 is described below
commit d23dd5c1d8cebfb8c697141b8b8a1cd5ab388452
Author: Mark Thomas
AuthorDate: Tue Dec 5 12:16:18 2023 +
Improve performance of HTTP/2 tests
---
test/org/apache/coyote/http2/Http2TestBase.java| 3 ++-
test/org/apache/coyote/http2/TestHttp2Section_4_2.java | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java
b/test/org/apache/coyote/http2/Http2TestBase.java
index 4eba6217b8..8a37bcdccf 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http2;
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -673,7 +674,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
s = socketFactory.createSocket("localhost", getPort());
s.setSoTimeout(3);
-os = s.getOutputStream();
+os = new BufferedOutputStream(s.getOutputStream());
InputStream is = s.getInputStream();
input = new TestInput(is);
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
index 3c158c724d..d73a2495a7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
@@ -51,6 +51,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
}
os.write(settings);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -73,6 +74,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -95,6 +97,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -118,6 +121,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(priority);
+os.flush();
// Read Stream reset frame
parser.readFrame();
-
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 IDE warning
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 ab591f30e1 Fix IDE warning
ab591f30e1 is described below
commit ab591f30e11d95a651600ec7075c22787ee1a2dd
Author: Mark Thomas
AuthorDate: Mon Dec 4 22:01:26 2023 +
Fix IDE warning
---
test/org/apache/catalina/core/TestStandardHostValve.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index e4f7fe87ba..e081a12173 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -112,9 +112,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
@Test(expected=IllegalArgumentException.class)
public void testInvalidErrorPage() throws Exception {
-// Set up a container
-Tomcat tomcat = getTomcatInstance();
-
// No file system docBase required
Context ctx = getProgrammaticRootContext();
-
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 IDE warning
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 bba3a06fd5 Fix IDE warning
bba3a06fd5 is described below
commit bba3a06fd5353becdf745e3517bf6b050ae38b77
Author: Mark Thomas
AuthorDate: Mon Dec 4 22:01:26 2023 +
Fix IDE warning
---
test/org/apache/catalina/core/TestStandardHostValve.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index e4f7fe87ba..e081a12173 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -112,9 +112,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
@Test(expected=IllegalArgumentException.class)
public void testInvalidErrorPage() throws Exception {
-// Set up a container
-Tomcat tomcat = getTomcatInstance();
-
// No file system docBase required
Context ctx = getProgrammaticRootContext();
-
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 IDE warning
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 2164fdc98f Fix IDE warning
2164fdc98f is described below
commit 2164fdc98f4597698c8c84f39fc27cd1b4600e95
Author: Mark Thomas
AuthorDate: Mon Dec 4 22:01:26 2023 +
Fix IDE warning
---
test/org/apache/catalina/core/TestStandardHostValve.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java
b/test/org/apache/catalina/core/TestStandardHostValve.java
index 6433d0e1e1..2f0799c7a8 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -112,9 +112,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
@Test(expected=IllegalArgumentException.class)
public void testInvalidErrorPage() throws Exception {
-// Set up a container
-Tomcat tomcat = getTomcatInstance();
-
// No file system docBase required
Context ctx = getProgrammaticRootContext();
-
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: Disable class path scanning generally for unit tests
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 90b1f0602e Disable class path scanning generally for unit tests 90b1f0602e is described below commit 90b1f0602e651da77d2e24d90528fa84615cd31b Author: Mark Thomas AuthorDate: Mon Dec 4 21:55:45 2023 + Disable class path scanning generally for unit tests --- .../servlet/annotation/TestServletSecurity.java| 2 +- test/javax/servlet/http/TestHttpServlet.java | 10 ++-- .../http/TestHttpServletResponseSendError.java | 2 +- .../TestDigestAuthenticatorAlgorithms.java | 2 +- .../catalina/connector/TestClientReadTimeout.java | 2 +- .../catalina/connector/TestCoyoteAdapter.java | 6 +-- .../org/apache/catalina/connector/TestRequest.java | 6 +-- .../apache/catalina/connector/TestResponse.java| 6 +-- .../catalina/core/TestApplicationContext.java | 2 +- .../catalina/core/TestApplicationFilterConfig.java | 2 +- .../catalina/core/TestApplicationHttpRequest.java | 4 +- .../apache/catalina/core/TestAsyncContextImpl.java | 58 ++--- .../core/TestAsyncContextImplDispatch.java | 2 +- .../TestAsyncContextImplListenerOnComplete.java| 2 +- .../core/TestAsyncContextStateChanges.java | 2 +- .../catalina/core/TestNamingContextListener.java | 4 +- .../core/TestPropertiesRoleMappingListener.java| 2 +- .../apache/catalina/core/TestStandardContext.java | 6 +-- .../catalina/core/TestStandardContextAliases.java | 2 +- .../catalina/core/TestStandardContextValve.java| 6 +-- .../catalina/core/TestStandardHostValve.java | 8 +-- .../apache/catalina/core/TestStandardWrapper.java | 6 +-- .../catalina/filters/TestAddCharSetFilter.java | 2 +- .../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +- .../loader/TestWebappClassLoaderMemoryLeak.java| 2 +- ...TestWebappClassLoaderThreadLocalMemoryLeak.java | 4 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 18 +++ .../session/TestPersistentManagerIntegration.java | 6 +-- .../session/TestStandardSessionIntegration.java| 2 +- test/org/apache/catalina/startup/TestListener.java | 4 +- test/org/apache/catalina/startup/TestTomcat.java | 10 ++-- .../catalina/startup/TestTomcatClassLoader.java| 4 +- .../apache/catalina/startup/TomcatBaseTest.java| 10 .../apache/catalina/valves/TestAccessLogValve.java | 2 +- .../catalina/valves/TestErrorReportValve.java | 10 ++-- .../catalina/valves/rewrite/TestRewriteValve.java | 2 +- test/org/apache/coyote/TestResponse.java | 4 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 16 +++--- .../coyote/http11/TestHttp11InputBuffer.java | 2 +- .../coyote/http11/TestHttp11OutputBuffer.java | 4 +- .../apache/coyote/http11/TestHttp11Processor.java | 60 +++--- .../http11/filters/TestChunkedInputFilter.java | 12 ++--- .../apache/coyote/http11/upgrade/TestUpgrade.java | 2 +- .../http11/upgrade/TestUpgradeInternalHandler.java | 2 +- test/org/apache/coyote/http2/Http2TestBase.java| 2 +- test/org/apache/coyote/http2/TestAsync.java| 2 +- test/org/apache/coyote/http2/TestAsyncError.java | 2 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/coyote/http2/TestAsyncTimeout.java | 2 +- .../apache/coyote/http2/TestCancelledUpload.java | 2 +- .../coyote/http2/TestHttp2UpgradeHandler.java | 6 +-- test/org/apache/coyote/http2/TestLargeUpload.java | 2 +- test/org/apache/coyote/http2/TestStream.java | 2 +- .../apache/coyote/http2/TestStreamProcessor.java | 6 +-- .../apache/coyote/http2/TestStreamQueryString.java | 2 +- test/org/apache/naming/TestNamingContext.java | 2 +- .../apache/naming/resources/TestNamingContext.java | 10 ++-- .../http/TestCookieProcessorGenerationHttp.java| 2 +- .../tomcat/util/net/TestSSLHostConfigCompat.java | 2 +- test/org/apache/tomcat/util/net/TestSsl.java | 2 +- .../tomcat/websocket/TestConnectionLimit.java | 2 +- .../tomcat/websocket/TestWebSocketFrameClient.java | 4 +- .../websocket/TestWebSocketFrameClientSSL.java | 4 +- .../tomcat/websocket/TestWsPingPongMessages.java | 2 +- .../tomcat/websocket/TestWsRemoteEndpoint.java | 4 +- .../websocket/TestWsSessionSuspendResume.java | 2 +- .../tomcat/websocket/TestWsSubprotocols.java | 2 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 18 +++ .../TestWsWebSocketContainerGetOpenSessions.java | 2 +- .../websocket/TestWsWebSocketContainerSSL.java | 2 +- ...WsWebSocketContainerSessionExpiryContainer.java | 2 +- ...stWsWebSocketContainerSessionExpirySession.java | 2 +- .../TestWsWebSocketContainerTimeoutClient.java | 2 +-
(tomcat) branch 9.0.x updated: Disable class path scanning generally for unit tests
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 f86d34430d Disable class path scanning generally for unit tests f86d34430d is described below commit f86d34430d943808008e6994e303c88128705744 Author: Mark Thomas AuthorDate: Mon Dec 4 21:55:45 2023 + Disable class path scanning generally for unit tests --- .../servlet/annotation/TestServletSecurity.java| 2 +- test/javax/servlet/http/TestHttpServlet.java | 10 ++-- .../http/TestHttpServletResponseSendError.java | 2 +- .../TestDigestAuthenticatorAlgorithms.java | 2 +- .../catalina/connector/TestClientReadTimeout.java | 2 +- .../catalina/connector/TestCoyoteAdapter.java | 6 +-- .../org/apache/catalina/connector/TestRequest.java | 6 +-- .../apache/catalina/connector/TestResponse.java| 6 +-- .../catalina/core/TestApplicationContext.java | 2 +- .../catalina/core/TestApplicationFilterConfig.java | 2 +- .../catalina/core/TestApplicationHttpRequest.java | 4 +- .../apache/catalina/core/TestAsyncContextImpl.java | 58 ++--- .../core/TestAsyncContextImplDispatch.java | 2 +- .../TestAsyncContextImplListenerOnComplete.java| 2 +- .../core/TestAsyncContextStateChanges.java | 2 +- .../catalina/core/TestNamingContextListener.java | 4 +- .../core/TestPropertiesRoleMappingListener.java| 2 +- .../apache/catalina/core/TestStandardContext.java | 6 +-- .../catalina/core/TestStandardContextAliases.java | 2 +- .../catalina/core/TestStandardContextValve.java| 6 +-- .../catalina/core/TestStandardHostValve.java | 8 +-- .../apache/catalina/core/TestStandardWrapper.java | 6 +-- .../catalina/filters/TestAddCharSetFilter.java | 2 +- .../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +- .../loader/TestWebappClassLoaderMemoryLeak.java| 2 +- ...TestWebappClassLoaderThreadLocalMemoryLeak.java | 4 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 18 +++ .../session/TestPersistentManagerIntegration.java | 6 +-- .../session/TestStandardSessionIntegration.java| 2 +- test/org/apache/catalina/startup/TestListener.java | 4 +- test/org/apache/catalina/startup/TestTomcat.java | 10 ++-- .../catalina/startup/TestTomcatClassLoader.java| 4 +- .../apache/catalina/startup/TomcatBaseTest.java| 10 .../apache/catalina/valves/TestAccessLogValve.java | 2 +- .../catalina/valves/TestErrorReportValve.java | 12 ++--- .../catalina/valves/rewrite/TestRewriteValve.java | 2 +- test/org/apache/coyote/TestResponse.java | 4 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 16 +++--- .../coyote/http11/TestHttp11InputBuffer.java | 2 +- .../coyote/http11/TestHttp11OutputBuffer.java | 4 +- .../apache/coyote/http11/TestHttp11Processor.java | 60 +++--- .../http11/filters/TestChunkedInputFilter.java | 12 ++--- .../apache/coyote/http11/upgrade/TestUpgrade.java | 2 +- .../http11/upgrade/TestUpgradeInternalHandler.java | 2 +- test/org/apache/coyote/http2/Http2TestBase.java| 2 +- test/org/apache/coyote/http2/TestAsync.java| 2 +- test/org/apache/coyote/http2/TestAsyncError.java | 2 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/coyote/http2/TestAsyncTimeout.java | 2 +- .../apache/coyote/http2/TestCancelledUpload.java | 2 +- .../coyote/http2/TestHttp2UpgradeHandler.java | 6 +-- test/org/apache/coyote/http2/TestLargeUpload.java | 2 +- test/org/apache/coyote/http2/TestStream.java | 4 +- .../apache/coyote/http2/TestStreamProcessor.java | 6 +-- .../apache/coyote/http2/TestStreamQueryString.java | 2 +- test/org/apache/naming/TestNamingContext.java | 2 +- .../apache/naming/resources/TestNamingContext.java | 10 ++-- .../http/TestCookieProcessorGenerationHttp.java| 2 +- .../tomcat/util/net/TestSSLHostConfigCompat.java | 2 +- test/org/apache/tomcat/util/net/TestSsl.java | 2 +- .../tomcat/websocket/TestConnectionLimit.java | 2 +- .../tomcat/websocket/TestWebSocketFrameClient.java | 4 +- .../websocket/TestWebSocketFrameClientSSL.java | 4 +- .../tomcat/websocket/TestWsPingPongMessages.java | 2 +- .../tomcat/websocket/TestWsRemoteEndpoint.java | 4 +- .../websocket/TestWsSessionSuspendResume.java | 2 +- .../tomcat/websocket/TestWsSubprotocols.java | 2 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 18 +++ .../TestWsWebSocketContainerGetOpenSessions.java | 2 +- .../websocket/TestWsWebSocketContainerSSL.java | 2 +- ...WsWebSocketContainerSessionExpiryContainer.java | 2 +- ...stWsWebSocketContainerSessionExpirySession.java | 2 +- .../TestWsWebSocketContainerTimeoutClient.java | 2 +-
(tomcat) branch main updated: tabs -> spaces
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 230dfbc0aa tabs -> spaces
230dfbc0aa is described below
commit 230dfbc0aa0439e75af32665f55a08a9fc95d75d
Author: Mark Thomas
AuthorDate: Wed Dec 6 09:43:58 2023 +
tabs -> spaces
---
test/org/apache/catalina/connector/TestClientReadTimeout.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/connector/TestClientReadTimeout.java
b/test/org/apache/catalina/connector/TestClientReadTimeout.java
index 65d4cef92b..8c25542675 100644
--- a/test/org/apache/catalina/connector/TestClientReadTimeout.java
+++ b/test/org/apache/catalina/connector/TestClientReadTimeout.java
@@ -68,9 +68,9 @@ public class TestClientReadTimeout extends TomcatBaseTest {
BufferedReader reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
String opening = null;
try {
- opening = reader.readLine();
+opening = reader.readLine();
} catch (SocketException e) {
- // Handled below. An exception here means opening will be null
+// Handled below. An exception here means opening will be null
}
if
(tomcat.getConnector().getProtocolHandlerClassName().contains("Nio2")) {
Assert.assertNull("NIO2 unexpectedly returned a response",
opening);
-
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: Disable class path scanning generally for unit tests
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 ee3afacc69 Disable class path scanning generally for unit tests ee3afacc69 is described below commit ee3afacc69a255a4a9e096d0983cf402b4e540dc Author: Mark Thomas AuthorDate: Mon Dec 4 21:55:45 2023 + Disable class path scanning generally for unit tests --- .../servlet/annotation/TestServletSecurity.java| 2 +- .../servlet/http/HttpServletDoHeadBaseTest.java| 2 +- test/jakarta/servlet/http/TestHttpServlet.java | 10 ++-- .../http/TestHttpServletResponseSendError.java | 2 +- .../TestDigestAuthenticatorAlgorithms.java | 2 +- .../catalina/connector/TestClientReadTimeout.java | 2 +- .../catalina/connector/TestCoyoteAdapter.java | 6 +-- .../org/apache/catalina/connector/TestRequest.java | 6 +-- .../apache/catalina/connector/TestResponse.java| 6 +-- .../catalina/core/TestApplicationContext.java | 2 +- .../catalina/core/TestApplicationFilterConfig.java | 2 +- .../catalina/core/TestApplicationHttpRequest.java | 4 +- .../apache/catalina/core/TestAsyncContextImpl.java | 58 ++--- .../core/TestAsyncContextImplDispatch.java | 2 +- .../TestAsyncContextImplListenerOnComplete.java| 2 +- .../core/TestAsyncContextStateChanges.java | 2 +- .../catalina/core/TestNamingContextListener.java | 4 +- .../core/TestPropertiesRoleMappingListener.java| 2 +- .../apache/catalina/core/TestStandardContext.java | 6 +-- .../catalina/core/TestStandardContextAliases.java | 2 +- .../catalina/core/TestStandardContextValve.java| 6 +-- .../catalina/core/TestStandardHostValve.java | 8 +-- .../apache/catalina/core/TestStandardWrapper.java | 6 +-- .../catalina/filters/TestAddCharSetFilter.java | 2 +- .../TestWebappClassLoaderExecutorMemoryLeak.java | 2 +- .../loader/TestWebappClassLoaderMemoryLeak.java| 2 +- ...TestWebappClassLoaderThreadLocalMemoryLeak.java | 4 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 18 +++ .../session/TestPersistentManagerIntegration.java | 6 +-- .../session/TestStandardSessionIntegration.java| 2 +- test/org/apache/catalina/startup/TestListener.java | 4 +- test/org/apache/catalina/startup/TestTomcat.java | 10 ++-- .../catalina/startup/TestTomcatClassLoader.java| 4 +- .../apache/catalina/startup/TomcatBaseTest.java| 10 .../apache/catalina/valves/TestAccessLogValve.java | 2 +- .../catalina/valves/TestErrorReportValve.java | 12 ++--- .../catalina/valves/rewrite/TestRewriteValve.java | 2 +- test/org/apache/coyote/TestResponse.java | 4 +- .../coyote/ajp/TestAbstractAjpProcessor.java | 16 +++--- .../coyote/http11/TestHttp11InputBuffer.java | 2 +- .../coyote/http11/TestHttp11OutputBuffer.java | 4 +- .../apache/coyote/http11/TestHttp11Processor.java | 60 +++--- .../http11/filters/TestChunkedInputFilter.java | 12 ++--- .../apache/coyote/http11/upgrade/TestUpgrade.java | 2 +- .../http11/upgrade/TestUpgradeInternalHandler.java | 2 +- test/org/apache/coyote/http2/Http2TestBase.java| 2 +- test/org/apache/coyote/http2/TestAsync.java| 2 +- test/org/apache/coyote/http2/TestAsyncError.java | 2 +- test/org/apache/coyote/http2/TestAsyncFlush.java | 2 +- test/org/apache/coyote/http2/TestAsyncTimeout.java | 2 +- .../apache/coyote/http2/TestCancelledUpload.java | 2 +- .../coyote/http2/TestHttp2UpgradeHandler.java | 6 +-- test/org/apache/coyote/http2/TestLargeUpload.java | 2 +- test/org/apache/coyote/http2/TestStream.java | 4 +- .../apache/coyote/http2/TestStreamProcessor.java | 6 +-- .../apache/coyote/http2/TestStreamQueryString.java | 2 +- test/org/apache/naming/TestNamingContext.java | 2 +- .../apache/naming/resources/TestNamingContext.java | 10 ++-- .../http/TestCookieProcessorGenerationHttp.java| 2 +- .../tomcat/util/net/TestSSLHostConfigCompat.java | 2 +- test/org/apache/tomcat/util/net/TestSsl.java | 2 +- .../tomcat/websocket/TestConnectionLimit.java | 2 +- .../tomcat/websocket/TestWebSocketFrameClient.java | 4 +- .../websocket/TestWebSocketFrameClientSSL.java | 4 +- .../tomcat/websocket/TestWsPingPongMessages.java | 2 +- .../tomcat/websocket/TestWsRemoteEndpoint.java | 4 +- .../websocket/TestWsSessionSuspendResume.java | 2 +- .../tomcat/websocket/TestWsSubprotocols.java | 2 +- .../tomcat/websocket/TestWsWebSocketContainer.java | 18 +++ .../TestWsWebSocketContainerGetOpenSessions.java | 2 +- .../websocket/TestWsWebSocketContainerSSL.java | 2 +- ...WsWebSocketContainerSessionExpiryContainer.java | 2 +- ...stWsWebSocketContainerSessionExpirySession.java | 2 +-
(tomcat) branch 8.5.x updated: Use better context path
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 77dc152dd3 Use better context path
77dc152dd3 is described below
commit 77dc152dd3a9aeff6902bb5a065117fd350372b3
Author: Mark Thomas
AuthorDate: Mon Dec 4 21:12:18 2023 +
Use better context path
---
test/org/apache/catalina/servlets/ServletOptionsBaseTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
index 496511ac3e..3605b4d9d7 100644
--- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
@@ -79,7 +79,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
// app dir is relative to server home
org.apache.catalina.Context ctx =
-tomcat.addWebapp(null, "/servlet", docBase.getAbsolutePath());
+tomcat.addWebapp(null, "/webdav", docBase.getAbsolutePath());
Wrapper w = Tomcat.addServlet(ctx, "servlet", createServlet());
w.addInitParameter("listings", Boolean.toString(listings));
@@ -95,7 +95,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
OptionsHttpClient client = new OptionsHttpClient();
client.setPort(getPort());
client.setRequest(new String[] {
-"OPTIONS /servlet/" + url + " HTTP/1.1" + CRLF +
+"OPTIONS /webdav/" + url + " HTTP/1.1" + CRLF +
"Host: localhost:" + getPort() + CRLF +
"Connection: close" + CRLF +
CRLF });
@@ -110,7 +110,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
client.reset();
client.setRequest(new String[] {
-method + " /servlet/" + url + " HTTP/1.1" + CRLF +
+method + " /webdav/" + url + " HTTP/1.1" + CRLF +
"Host: localhost:" + getPort() + CRLF +
"Connection: close" + CRLF +
CRLF });
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Use better context path
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 2b345a65e3 Use better context path
2b345a65e3 is described below
commit 2b345a65e32cb98b4c63b3cac43fce19c37f0e4b
Author: Mark Thomas
AuthorDate: Mon Dec 4 21:12:18 2023 +
Use better context path
---
test/org/apache/catalina/servlets/ServletOptionsBaseTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
index 0320270b59..d23bbb80ef 100644
--- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
@@ -79,7 +79,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
// app dir is relative to server home
org.apache.catalina.Context ctx =
-tomcat.addWebapp(null, "/servlet", docBase.getAbsolutePath());
+tomcat.addWebapp(null, "/webdav", docBase.getAbsolutePath());
Wrapper w = Tomcat.addServlet(ctx, "servlet", createServlet());
w.addInitParameter("listings", Boolean.toString(listings));
@@ -95,7 +95,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
OptionsHttpClient client = new OptionsHttpClient();
client.setPort(getPort());
client.setRequest(new String[] {
-"OPTIONS /servlet/" + url + " HTTP/1.1" + CRLF +
+"OPTIONS /webdav/" + url + " HTTP/1.1" + CRLF +
"Host: localhost:" + getPort() + CRLF +
"Connection: close" + CRLF +
CRLF });
@@ -110,7 +110,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
client.reset();
client.setRequest(new String[] {
-method + " /servlet/" + url + " HTTP/1.1" + CRLF +
+method + " /webdav/" + url + " HTTP/1.1" + CRLF +
"Host: localhost:" + getPort() + CRLF +
"Connection: close" + CRLF +
CRLF });
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Use better context path
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 b64db96701 Use better context path
b64db96701 is described below
commit b64db96701690cd88c3fd87ea326d12cfe2bfa4c
Author: Mark Thomas
AuthorDate: Mon Dec 4 21:12:18 2023 +
Use better context path
---
test/org/apache/catalina/servlets/ServletOptionsBaseTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
index 496511ac3e..3605b4d9d7 100644
--- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
@@ -79,7 +79,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
// app dir is relative to server home
org.apache.catalina.Context ctx =
-tomcat.addWebapp(null, "/servlet", docBase.getAbsolutePath());
+tomcat.addWebapp(null, "/webdav", docBase.getAbsolutePath());
Wrapper w = Tomcat.addServlet(ctx, "servlet", createServlet());
w.addInitParameter("listings", Boolean.toString(listings));
@@ -95,7 +95,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
OptionsHttpClient client = new OptionsHttpClient();
client.setPort(getPort());
client.setRequest(new String[] {
-"OPTIONS /servlet/" + url + " HTTP/1.1" + CRLF +
+"OPTIONS /webdav/" + url + " HTTP/1.1" + CRLF +
"Host: localhost:" + getPort() + CRLF +
"Connection: close" + CRLF +
CRLF });
@@ -110,7 +110,7 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
client.reset();
client.setRequest(new String[] {
-method + " /servlet/" + url + " HTTP/1.1" + CRLF +
+method + " /webdav/" + url + " HTTP/1.1" + CRLF +
"Host: localhost:" + getPort() + CRLF +
"Connection: close" + CRLF +
CRLF });
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Improve test performance
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 f0642213e0 Improve test performance
f0642213e0 is described below
commit f0642213e0651b7f15fb29f24c58b2ba18214932
Author: Mark Thomas
AuthorDate: Mon Dec 4 21:11:37 2023 +
Improve test performance
---
test/org/apache/catalina/servlets/ServletOptionsBaseTest.java | 4
1 file changed, 4 insertions(+)
diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
index 2deb72799e..496511ac3e 100644
--- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.scan.StandardJarScanner;
public abstract class ServletOptionsBaseTest extends TomcatBaseTest {
@@ -86,6 +87,9 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
ctx.addServletMappingDecoded("/*", "servlet");
+// Disable class path scanning - it slows the tests down by almost an
order of magnitude
+((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false);
+
tomcat.start();
OptionsHttpClient client = new OptionsHttpClient();
-
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: Improve test performance
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 f4bdc8454c Improve test performance
f4bdc8454c is described below
commit f4bdc8454c1faea0d1caa34b7ff3462546f07bea
Author: Mark Thomas
AuthorDate: Mon Dec 4 21:11:37 2023 +
Improve test performance
---
test/org/apache/catalina/servlets/ServletOptionsBaseTest.java | 4
1 file changed, 4 insertions(+)
diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
index 2deb72799e..496511ac3e 100644
--- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.scan.StandardJarScanner;
public abstract class ServletOptionsBaseTest extends TomcatBaseTest {
@@ -86,6 +87,9 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
ctx.addServletMappingDecoded("/*", "servlet");
+// Disable class path scanning - it slows the tests down by almost an
order of magnitude
+((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false);
+
tomcat.start();
OptionsHttpClient client = new OptionsHttpClient();
-
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: Improve test performance
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 9e003a0a7e Improve test performance
9e003a0a7e is described below
commit 9e003a0a7e545e7ba8d708635a630adea021b2ff
Author: Mark Thomas
AuthorDate: Mon Dec 4 21:11:37 2023 +
Improve test performance
---
test/org/apache/catalina/servlets/ServletOptionsBaseTest.java | 4
1 file changed, 4 insertions(+)
diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
index f35c42616b..0320270b59 100644
--- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java
@@ -33,6 +33,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.startup.SimpleHttpClient;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.scan.StandardJarScanner;
public abstract class ServletOptionsBaseTest extends TomcatBaseTest {
@@ -86,6 +87,9 @@ public abstract class ServletOptionsBaseTest extends
TomcatBaseTest {
ctx.addServletMappingDecoded("/*", "servlet");
+// Disable class path scanning - it slows the tests down by almost an
order of magnitude
+((StandardJarScanner) ctx.getJarScanner()).setScanClassPath(false);
+
tomcat.start();
OptionsHttpClient client = new OptionsHttpClient();
-
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: Split test into three - helps when test machines have many cores
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 f031c56dd3 Split test into three - helps when test machines have many
cores
f031c56dd3 is described below
commit f031c56dd32d2fdda7ce23276483e2ddb14b7951
Author: Mark Thomas
AuthorDate: Mon Dec 4 15:22:19 2023 +
Split test into three - helps when test machines have many cores
---
...henticator.java => TestFormAuthenticatorA.java} | 80 +-
...henticator.java => TestFormAuthenticatorB.java} | 281 +
...henticator.java => TestFormAuthenticatorC.java} | 275 +---
3 files changed, 11 insertions(+), 625 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
similarity index 91%
copy from test/org/apache/catalina/authenticator/TestFormAuthenticator.java
copy to test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
index 521e469c95..56c78b199a 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
@@ -72,7 +72,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
* but it makes no claims to generality).
*
*/
-public class TestFormAuthenticator extends TomcatBaseTest {
+public class TestFormAuthenticatorA extends TomcatBaseTest {
// these should really be singletons to be type-safe,
// we are in a unit test and don't need to paranoid.
@@ -107,31 +107,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueWithCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-@Test
-public void testPostWithContinueAndCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
- CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-// Bug 49779
-@Test
-public void testPostNoContinuePostRedirectWithCookies() throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// Bug 49779
-@Test
-public void testPostWithContinuePostRedirectWithCookies() throws Exception
{
-doTest("POST", "POST", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
// next, a set of tests where the server Context is configured to never
@@ -144,33 +120,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_NO_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueNoServerCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-@Test
-public void testPostWithContinueNoServerCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostNoContinuePostRedirectNoServerCookies()
-throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostWithContinuePostRedirectNoServerCookies()
-throws Exception {
-doTest("POST", "POST", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
// next, a set of tests where the server Context uses cookies,
@@ -183,34 +133,6 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueNoClientCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-@Test
-public void testPostWithContinueNoClientCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostNoContinuePostRedirectNoClientCookies()
-throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-//
(tomcat) branch 9.0.x updated: Split test into three - helps when test machines have many cores
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 6f0688a4e1 Split test into three - helps when test machines have many
cores
6f0688a4e1 is described below
commit 6f0688a4e12ec565c0e5fcbd018e59baaa4d0eb9
Author: Mark Thomas
AuthorDate: Mon Dec 4 15:22:19 2023 +
Split test into three - helps when test machines have many cores
---
...henticator.java => TestFormAuthenticatorA.java} | 80 +-
...henticator.java => TestFormAuthenticatorB.java} | 275 +
...henticator.java => TestFormAuthenticatorC.java} | 269 +---
3 files changed, 5 insertions(+), 619 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
similarity index 91%
copy from test/org/apache/catalina/authenticator/TestFormAuthenticator.java
copy to test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
index 4ba585eef5..baf3bed5c9 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
@@ -72,7 +72,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
* but it makes no claims to generality).
*
*/
-public class TestFormAuthenticator extends TomcatBaseTest {
+public class TestFormAuthenticatorA extends TomcatBaseTest {
// these should really be singletons to be type-safe,
// we are in a unit test and don't need to paranoid.
@@ -107,31 +107,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueWithCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-@Test
-public void testPostWithContinueAndCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
- CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-// Bug 49779
-@Test
-public void testPostNoContinuePostRedirectWithCookies() throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// Bug 49779
-@Test
-public void testPostWithContinuePostRedirectWithCookies() throws Exception
{
-doTest("POST", "POST", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
// next, a set of tests where the server Context is configured to never
@@ -144,33 +120,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_NO_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueNoServerCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-@Test
-public void testPostWithContinueNoServerCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostNoContinuePostRedirectNoServerCookies()
-throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostWithContinuePostRedirectNoServerCookies()
-throws Exception {
-doTest("POST", "POST", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
// next, a set of tests where the server Context uses cookies,
@@ -183,34 +133,6 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueNoClientCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-@Test
-public void testPostWithContinueNoClientCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostNoContinuePostRedirectNoClientCookies()
-throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-//
(tomcat) branch 10.1.x updated: Split test into three - helps when test machines have many cores
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 5a500818cb Split test into three - helps when test machines have many
cores
5a500818cb is described below
commit 5a500818cba2fc6b531e1c344d94a38a2854488e
Author: Mark Thomas
AuthorDate: Mon Dec 4 15:22:19 2023 +
Split test into three - helps when test machines have many cores
---
...henticator.java => TestFormAuthenticatorA.java} | 80 +-
...henticator.java => TestFormAuthenticatorB.java} | 275 +
...henticator.java => TestFormAuthenticatorC.java} | 269 +---
3 files changed, 5 insertions(+), 619 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
similarity index 91%
copy from test/org/apache/catalina/authenticator/TestFormAuthenticator.java
copy to test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
index 8d094a7ed8..2671b3e1cb 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
@@ -72,7 +72,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
* but it makes no claims to generality).
*
*/
-public class TestFormAuthenticator extends TomcatBaseTest {
+public class TestFormAuthenticatorA extends TomcatBaseTest {
// these should really be singletons to be type-safe,
// we are in a unit test and don't need to paranoid.
@@ -107,31 +107,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueWithCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-@Test
-public void testPostWithContinueAndCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
- CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-// Bug 49779
-@Test
-public void testPostNoContinuePostRedirectWithCookies() throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// Bug 49779
-@Test
-public void testPostWithContinuePostRedirectWithCookies() throws Exception
{
-doTest("POST", "POST", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
// next, a set of tests where the server Context is configured to never
@@ -144,33 +120,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_NO_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueNoServerCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-@Test
-public void testPostWithContinueNoServerCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostNoContinuePostRedirectNoServerCookies()
-throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostWithContinuePostRedirectNoServerCookies()
-throws Exception {
-doTest("POST", "POST", USE_100_CONTINUE,
-CLIENT_USE_COOKIES, SERVER_NO_COOKIES, SERVER_CHANGE_SESSID);
-}
// next, a set of tests where the server Context uses cookies,
@@ -183,34 +133,6 @@ public class TestFormAuthenticator extends TomcatBaseTest {
CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
}
-@Test
-public void testPostNoContinueNoClientCookies() throws Exception {
-doTest("POST", "GET", NO_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-@Test
-public void testPostWithContinueNoClientCookies() throws Exception {
-doTest("POST", "GET", USE_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-// variant of Bug 49779
-@Test
-public void testPostNoContinuePostRedirectNoClientCookies()
-throws Exception {
-doTest("POST", "POST", NO_100_CONTINUE,
-CLIENT_NO_COOKIES, SERVER_USE_COOKIES, SERVER_CHANGE_SESSID);
-}
-
-//
(tomcat) branch 10.1.x updated: Use standard naming convention for test method
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 048616d579 Use standard naming convention for test method
048616d579 is described below
commit 048616d57997193e47c8aa1a00fee95b311b4732
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:26:47 2023 +
Use standard naming convention for test method
---
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index ed2a2fe4c4..8d094a7ed8 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -259,7 +259,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
@Test
-public void doTestSelectedMethods() throws Exception {
+public void testSelectedMethods() throws Exception {
FormAuthClientSelectedMethods client =
new FormAuthClientSelectedMethods(true, true, true, true);
-
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: Use standard naming convention for test method
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 69013cd3d9 Use standard naming convention for test method
69013cd3d9 is described below
commit 69013cd3d9e0f5fd9d9e6bbea87084f620b71835
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:26:47 2023 +
Use standard naming convention for test method
---
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 9b9dc7ef5b..521e469c95 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -259,7 +259,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
@Test
-public void doTestSelectedMethods() throws Exception {
+public void testSelectedMethods() throws Exception {
FormAuthClientSelectedMethods client =
new FormAuthClientSelectedMethods(true, true, true, true);
-
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: Use standard naming convention for test method
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 553036ad44 Use standard naming convention for test method
553036ad44 is described below
commit 553036ad444154eb59aabd8d39baf08849b7f910
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:26:47 2023 +
Use standard naming convention for test method
---
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index a53c01682c..4ba585eef5 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -259,7 +259,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
@Test
-public void doTestSelectedMethods() throws Exception {
+public void testSelectedMethods() throws Exception {
FormAuthClientSelectedMethods client =
new FormAuthClientSelectedMethods(true, true, true, true);
-
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: Split test into three - helps when test machines have many cores
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 8b734ee182 Split test into three - helps when test machines have many
cores
8b734ee182 is described below
commit 8b734ee182d2a8eee66c16594438c326370b322c
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:14:32 2023 +
Split test into three - helps when test machines have many cores
---
.../TestHostConfigAutomaticDeploymentA.java| 482
.../TestHostConfigAutomaticDeploymentB.java| 687 +
...ava => TestHostConfigAutomaticDeploymentC.java} | 820 +
3 files changed, 1170 insertions(+), 819 deletions(-)
diff --git
a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
new file mode 100644
index 00..60f9dd78f5
--- /dev/null
+++ b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
@@ -0,0 +1,482 @@
+/*
+ * 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.catalina.startup;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.util.ContextName;
+
+/**
+ * The purpose of this class is to test the automatic deployment features of
the
+ * {@link HostConfig} implementation.
+ */
+public class TestHostConfigAutomaticDeploymentA extends TomcatBaseTest {
+
+private static final ContextName APP_NAME = new ContextName("myapp",
false);
+private static final File XML_SOURCE =
+new File("test/deployment/context.xml");
+private static final File WAR_XML_SOURCE =
+new File("test/deployment/context.war");
+private static final File DIR_XML_SOURCE =
+new File("test/deployment/dirContext");
+private static final File DIR_SOURCE =
+new File("test/deployment/dirNoContext");
+
+private static final int XML = 1;
+private static final int EXT = 2;
+private static final int WAR = 3;
+private static final int DIR = 4;
+
+private static final String XML_COOKIE_NAME = "XML_CONTEXT";
+private static final String WAR_COOKIE_NAME = "WAR_CONTEXT";
+private static final String DIR_COOKIE_NAME = "DIR_CONTEXT";
+// private static final String DEFAULT_COOKIE_NAME = "JSESSIONID";
+
+private File external;
+
+@Override
+public void setUp() throws Exception {
+super.setUp();
+
+Tomcat tomcat = getTomcatInstance();
+
+external = new File(getTemporaryDirectory(), "external");
+if (!external.exists() && !external.mkdir()) {
+Assert.fail("Unable to create external for test");
+}
+
+// Disable background thread
+tomcat.getEngine().setBackgroundProcessorDelay(-1);
+
+// Enable deployer
+tomcat.getHost().addLifecycleListener(new HostConfig());
+
+// Disable deployment on start up
+tomcat.getHost().setDeployOnStartup(false);
+
+// Clean-up after test
+addDeleteOnTearDown(new File(tomcat.basedir, "/conf"));
+addDeleteOnTearDown(external);
+}
+
+
+/*
+ * Expected behaviour for the deletion of files.
+ *
+ * Artifacts present Artifact Artifacts remaining
+ * XML WAR EXT DIRRemoved XML WAR EXT DIRNotes
+ * NNNY DIR--- N
+ * NYNN WAR-N- -
+ * NYNY DIR-Y- R 1
+ * NYNY WAR-N- N
+ * YNNN XMLN-- -
+ * YNNY DIRN-- N
+ * YNN
(tomcat) branch 8.5.x updated: Split test into three - helps when test machines have many cores
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 179b30b9ac Split test into three - helps when test machines have many
cores
179b30b9ac is described below
commit 179b30b9ac32a9c6084d204ab87aa4dedcef3ba9
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:14:32 2023 +
Split test into three - helps when test machines have many cores
---
.../TestHostConfigAutomaticDeploymentA.java| 482
.../TestHostConfigAutomaticDeploymentB.java| 687 +
...ava => TestHostConfigAutomaticDeploymentC.java} | 820 +
3 files changed, 1170 insertions(+), 819 deletions(-)
diff --git
a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
new file mode 100644
index 00..60f9dd78f5
--- /dev/null
+++ b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
@@ -0,0 +1,482 @@
+/*
+ * 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.catalina.startup;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.util.ContextName;
+
+/**
+ * The purpose of this class is to test the automatic deployment features of
the
+ * {@link HostConfig} implementation.
+ */
+public class TestHostConfigAutomaticDeploymentA extends TomcatBaseTest {
+
+private static final ContextName APP_NAME = new ContextName("myapp",
false);
+private static final File XML_SOURCE =
+new File("test/deployment/context.xml");
+private static final File WAR_XML_SOURCE =
+new File("test/deployment/context.war");
+private static final File DIR_XML_SOURCE =
+new File("test/deployment/dirContext");
+private static final File DIR_SOURCE =
+new File("test/deployment/dirNoContext");
+
+private static final int XML = 1;
+private static final int EXT = 2;
+private static final int WAR = 3;
+private static final int DIR = 4;
+
+private static final String XML_COOKIE_NAME = "XML_CONTEXT";
+private static final String WAR_COOKIE_NAME = "WAR_CONTEXT";
+private static final String DIR_COOKIE_NAME = "DIR_CONTEXT";
+// private static final String DEFAULT_COOKIE_NAME = "JSESSIONID";
+
+private File external;
+
+@Override
+public void setUp() throws Exception {
+super.setUp();
+
+Tomcat tomcat = getTomcatInstance();
+
+external = new File(getTemporaryDirectory(), "external");
+if (!external.exists() && !external.mkdir()) {
+Assert.fail("Unable to create external for test");
+}
+
+// Disable background thread
+tomcat.getEngine().setBackgroundProcessorDelay(-1);
+
+// Enable deployer
+tomcat.getHost().addLifecycleListener(new HostConfig());
+
+// Disable deployment on start up
+tomcat.getHost().setDeployOnStartup(false);
+
+// Clean-up after test
+addDeleteOnTearDown(new File(tomcat.basedir, "/conf"));
+addDeleteOnTearDown(external);
+}
+
+
+/*
+ * Expected behaviour for the deletion of files.
+ *
+ * Artifacts present Artifact Artifacts remaining
+ * XML WAR EXT DIRRemoved XML WAR EXT DIRNotes
+ * NNNY DIR--- N
+ * NYNN WAR-N- -
+ * NYNY DIR-Y- R 1
+ * NYNY WAR-N- N
+ * YNNN XMLN-- -
+ * YNNY DIRN-- N
+ * YNN
(tomcat) branch 10.1.x updated: Split test into three - helps when test machines have many cores
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 6b5dfbfff4 Split test into three - helps when test machines have many
cores
6b5dfbfff4 is described below
commit 6b5dfbfff42e9cb90227232a9d8345abfff26ac5
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:14:32 2023 +
Split test into three - helps when test machines have many cores
---
.../TestHostConfigAutomaticDeploymentA.java| 482
.../TestHostConfigAutomaticDeploymentB.java| 687 +
...ava => TestHostConfigAutomaticDeploymentC.java} | 820 +
3 files changed, 1170 insertions(+), 819 deletions(-)
diff --git
a/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
new file mode 100644
index 00..60f9dd78f5
--- /dev/null
+++ b/test/org/apache/catalina/startup/TestHostConfigAutomaticDeploymentA.java
@@ -0,0 +1,482 @@
+/*
+ * 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.catalina.startup;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.Host;
+import org.apache.catalina.LifecycleState;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.util.ContextName;
+
+/**
+ * The purpose of this class is to test the automatic deployment features of
the
+ * {@link HostConfig} implementation.
+ */
+public class TestHostConfigAutomaticDeploymentA extends TomcatBaseTest {
+
+private static final ContextName APP_NAME = new ContextName("myapp",
false);
+private static final File XML_SOURCE =
+new File("test/deployment/context.xml");
+private static final File WAR_XML_SOURCE =
+new File("test/deployment/context.war");
+private static final File DIR_XML_SOURCE =
+new File("test/deployment/dirContext");
+private static final File DIR_SOURCE =
+new File("test/deployment/dirNoContext");
+
+private static final int XML = 1;
+private static final int EXT = 2;
+private static final int WAR = 3;
+private static final int DIR = 4;
+
+private static final String XML_COOKIE_NAME = "XML_CONTEXT";
+private static final String WAR_COOKIE_NAME = "WAR_CONTEXT";
+private static final String DIR_COOKIE_NAME = "DIR_CONTEXT";
+// private static final String DEFAULT_COOKIE_NAME = "JSESSIONID";
+
+private File external;
+
+@Override
+public void setUp() throws Exception {
+super.setUp();
+
+Tomcat tomcat = getTomcatInstance();
+
+external = new File(getTemporaryDirectory(), "external");
+if (!external.exists() && !external.mkdir()) {
+Assert.fail("Unable to create external for test");
+}
+
+// Disable background thread
+tomcat.getEngine().setBackgroundProcessorDelay(-1);
+
+// Enable deployer
+tomcat.getHost().addLifecycleListener(new HostConfig());
+
+// Disable deployment on start up
+tomcat.getHost().setDeployOnStartup(false);
+
+// Clean-up after test
+addDeleteOnTearDown(new File(tomcat.basedir, "/conf"));
+addDeleteOnTearDown(external);
+}
+
+
+/*
+ * Expected behaviour for the deletion of files.
+ *
+ * Artifacts present Artifact Artifacts remaining
+ * XML WAR EXT DIRRemoved XML WAR EXT DIRNotes
+ * NNNY DIR--- N
+ * NYNN WAR-N- -
+ * NYNY DIR-Y- R 1
+ * NYNY WAR-N- N
+ * YNNN XMLN-- -
+ * YNNY DIRN-- N
+ * YN
(tomcat) branch 8.5.x updated: Differences are clear which allows a much shorter test
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 a5b6add781 Differences are clear which allows a much shorter test
a5b6add781 is described below
commit a5b6add781ff0a6ea9a954e7b247386918c87f72
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:01:29 2023 +
Differences are clear which allows a much shorter test
---
test/webapp/bug6/bug64872b-timeunit.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp
b/test/webapp/bug6/bug64872b-timeunit.jsp
index 679925f836..84256713b1 100644
--- a/test/webapp/bug6/bug64872b-timeunit.jsp
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -19,7 +19,7 @@
Bug 64872b TimeUnit test case
<%
- for (int i=0; i < 10; i++) {
+ for (int i=0; i < 5000; i++) {
%>
01 The value of foo is []
<%
-
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: Differences are clear which allows a much shorter test
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 f75984e1b8 Differences are clear which allows a much shorter test
f75984e1b8 is described below
commit f75984e1b8016c7d89a29b60a6a982b3319c51af
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:01:29 2023 +
Differences are clear which allows a much shorter test
---
test/webapp/bug6/bug64872b-timeunit.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp
b/test/webapp/bug6/bug64872b-timeunit.jsp
index 679925f836..84256713b1 100644
--- a/test/webapp/bug6/bug64872b-timeunit.jsp
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -19,7 +19,7 @@
Bug 64872b TimeUnit test case
<%
- for (int i=0; i < 10; i++) {
+ for (int i=0; i < 5000; i++) {
%>
01 The value of foo is []
<%
-
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: Differences are clear which allows a much shorter test
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 17b168f77c Differences are clear which allows a much shorter test
17b168f77c is described below
commit 17b168f77c4a01e43f0eec31c434c632ccc558bb
Author: Mark Thomas
AuthorDate: Mon Dec 4 14:01:29 2023 +
Differences are clear which allows a much shorter test
---
test/webapp/bug6/bug64872b-timeunit.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/webapp/bug6/bug64872b-timeunit.jsp
b/test/webapp/bug6/bug64872b-timeunit.jsp
index 679925f836..84256713b1 100644
--- a/test/webapp/bug6/bug64872b-timeunit.jsp
+++ b/test/webapp/bug6/bug64872b-timeunit.jsp
@@ -19,7 +19,7 @@
Bug 64872b TimeUnit test case
<%
- for (int i=0; i < 10; i++) {
+ for (int i=0; i < 5000; i++) {
%>
01 The value of foo is []
<%
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix failing test.
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 440d02f224 Fix failing test.
440d02f224 is described below
commit 440d02f22469e28398a51a2237dbe237aa7a64f8
Author: Mark Thomas
AuthorDate: Wed Dec 6 08:55:03 2023 +
Fix failing test.
NIO2 + Windows behaves slightly differently to NIO2 + Linux.
---
test/org/apache/catalina/connector/TestClientReadTimeout.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/catalina/connector/TestClientReadTimeout.java
b/test/org/apache/catalina/connector/TestClientReadTimeout.java
index c2d00f521f..65d4cef92b 100644
--- a/test/org/apache/catalina/connector/TestClientReadTimeout.java
+++ b/test/org/apache/catalina/connector/TestClientReadTimeout.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.Socket;
+import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import jakarta.servlet.ServletException;
@@ -65,7 +66,12 @@ public class TestClientReadTimeout extends TomcatBaseTest {
os.write(request.getBytes(StandardCharsets.UTF_8));
InputStream is = socket.getInputStream();
BufferedReader reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
-String opening = reader.readLine();
+String opening = null;
+try {
+ opening = reader.readLine();
+} catch (SocketException e) {
+ // Handled below. An exception here means opening will be null
+}
if
(tomcat.getConnector().getProtocolHandlerClassName().contains("Nio2")) {
Assert.assertNull("NIO2 unexpectedly returned a response",
opening);
} else {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
