(tomcat) branch 8.5.x updated: Should fix CI running TestSSLHostConfigCompat
This is an automated email from the ASF dual-hosted git repository. remm 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 517e0966eb Should fix CI running TestSSLHostConfigCompat 517e0966eb is described below commit 517e0966eb438cd3e2cd41e178c17933fbb855ab Author: remm AuthorDate: Fri Feb 9 14:16:31 2024 +0100 Should fix CI running TestSSLHostConfigCompat --- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 6aafe6ac97..e8fb34cb83 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -413,7 +413,7 @@ public class AprEndpoint extends AbstractEndpoint implements SNICallB sslContext.addCertificate(certificate); } -certificate.setSslContext(sslContext); +certificate.setSslContextGenerated(sslContext); logCertificate(certificate); } - 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: Should fix CI running TestSSLHostConfigCompat
This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new 4cc023ff17 Should fix CI running TestSSLHostConfigCompat 4cc023ff17 is described below commit 4cc023ff17f874ac653d6731106dd4b062686d15 Author: remm AuthorDate: Fri Feb 9 14:16:31 2024 +0100 Should fix CI running TestSSLHostConfigCompat --- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 7f85783590..b7fcad831d 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -479,7 +479,7 @@ public class AprEndpoint extends AbstractEndpoint implements SNICallB sslContext.addCertificate(certificate); } -certificate.setSslContext(sslContext); +certificate.setSslContextGenerated(sslContext); logCertificate(certificate); } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Fix BND warning spotting in CI system
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3d0ce84c40ba48d27e46436b6c12dad2b5a23a3a
Author: Mark Thomas
AuthorDate: Tue Oct 24 21:58:01 2023 +0100
Fix BND warning spotting in CI system
---
res/bnd/websocket-api.jar.tmp.bnd| 2 +-
res/bnd/websocket-client-api.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 8
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index 9f2b0606a5..0184c99bc5 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -35,7 +35,7 @@ Require-Capability: \
osgi.ee;\
filter:="(&(osgi.ee=JavaSE)(version=1.8))"
--namesection: jakarta/websocket*/;\
+-namesection: jakarta/websocket/server*/;\
Specification-Title=Jakarta WebSocket;\
Specification-Version=${websocket.spec.version}${websocket.revision};\
Specification-Vendor=Eclipse Foundation;\
diff --git a/res/bnd/websocket-client-api.jar.tmp.bnd
b/res/bnd/websocket-client-api.jar.tmp.bnd
index 500d14be57..492e495a18 100644
--- a/res/bnd/websocket-client-api.jar.tmp.bnd
+++ b/res/bnd/websocket-client-api.jar.tmp.bnd
@@ -29,7 +29,7 @@ Require-Capability: \
osgi.ee;\
filter:="(&(osgi.ee=JavaSE)(version=1.8))"
--namesection: jakarta/websocket/client*/;\
+-namesection: jakarta/websocket*/;\
Specification-Title=Jakarta WebSocket Client;\
Specification-Version=${websocket.spec.version}${websocket.revision};\
Specification-Vendor=Eclipse Foundation;\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5100bd9a16..3362b7536a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -136,6 +136,14 @@
+
+
+
+Correct missing metadata int he MANIFEST of the for WebSocket client
API
+JAR file. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix BND warning spotting in CI system
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 d7e6c58c444c93742bf53f7228181179ec663645
Author: Mark Thomas
AuthorDate: Tue Oct 24 21:58:01 2023 +0100
Fix BND warning spotting in CI system
---
res/bnd/websocket-api.jar.tmp.bnd| 2 +-
res/bnd/websocket-client-api.jar.tmp.bnd | 2 +-
webapps/docs/changelog.xml | 8
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/res/bnd/websocket-api.jar.tmp.bnd
b/res/bnd/websocket-api.jar.tmp.bnd
index 9f2b0606a5..0184c99bc5 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -35,7 +35,7 @@ Require-Capability: \
osgi.ee;\
filter:="(&(osgi.ee=JavaSE)(version=1.8))"
--namesection: jakarta/websocket*/;\
+-namesection: jakarta/websocket/server*/;\
Specification-Title=Jakarta WebSocket;\
Specification-Version=${websocket.spec.version}${websocket.revision};\
Specification-Vendor=Eclipse Foundation;\
diff --git a/res/bnd/websocket-client-api.jar.tmp.bnd
b/res/bnd/websocket-client-api.jar.tmp.bnd
index 500d14be57..492e495a18 100644
--- a/res/bnd/websocket-client-api.jar.tmp.bnd
+++ b/res/bnd/websocket-client-api.jar.tmp.bnd
@@ -29,7 +29,7 @@ Require-Capability: \
osgi.ee;\
filter:="(&(osgi.ee=JavaSE)(version=1.8))"
--namesection: jakarta/websocket/client*/;\
+-namesection: jakarta/websocket*/;\
Specification-Title=Jakarta WebSocket Client;\
Specification-Version=${websocket.spec.version}${websocket.revision};\
Specification-Vendor=Eclipse Foundation;\
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1407c192ca..462ca4e17e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,14 @@
+
+
+
+Correct missing metadata int he MANIFEST of the for WebSocket client
API
+JAR file. (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 race condition that was causing intermittent CI failures
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 5e5d14e772 Fix race condition that was causing intermittent CI failures
5e5d14e772 is described below
commit 5e5d14e7729fdea7dc5faa439b48fc18740370e1
Author: Mark Thomas
AuthorDate: Mon Aug 7 17:13:55 2023 +0100
Fix race condition that was causing intermittent CI failures
Ensure that, if there is no request body, the stream is notified that
end-of-stream has been received before passing processing of the request
to a container thread.
---
java/org/apache/coyote/http2/Http2Parser.java | 5 +--
.../apache/coyote/http2/Http2UpgradeHandler.java | 50 +++---
test/org/apache/coyote/http2/Http2TestBase.java| 19
webapps/docs/changelog.xml | 4 ++
4 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 2962c0699e..d8a3ce1b6c 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -581,10 +581,9 @@ class Http2Parser {
// going to be thrown.
hpackDecoder.getHeaderEmitter().validateHeaders();
-output.headersEnd(streamId);
+output.headersEnd(streamId, headersEndStream);
if (headersEndStream) {
-output.receivedEndOfStream(streamId);
headersEndStream = false;
}
@@ -720,7 +719,7 @@ class Http2Parser {
void headersContinue(int payloadSize, boolean endOfHeaders);
-void headersEnd(int streamId) throws Http2Exception;
+void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception;
// Reset frames
void reset(int streamId, long errorCode) throws Http2Exception;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 925e43e0d7..b5e5d5ce08 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1652,20 +1652,6 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-@Override
-public void receivedEndOfStream(int streamId) throws ConnectionException {
-AbstractNonZeroStream abstractNonZeroStream =
-getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
-if (abstractNonZeroStream instanceof Stream) {
-Stream stream = (Stream) abstractNonZeroStream;
-stream.receivedEndOfStream();
-if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
-}
-}
-}
-
-
@Override
public void onSwallowedDataFramePayload(int streamId, int
swallowedDataBytesCount) throws IOException {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId);
@@ -1753,10 +1739,11 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
-public void headersEnd(int streamId) throws Http2Exception {
+public void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
+boolean processStream = false;
setMaxProcessedStream(streamId);
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
@@ -1774,9 +1761,40 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// Valid new stream reduces the overhead count
reduceOverheadCount(FrameType.HEADERS);
-processStreamOnContainerThread(stream);
+processStream = true;
}
}
+/*
+ * Need to process end of stream before calling
processStreamOnContainerThread to avoid a race condition
+ * where the container thread finishes before end of stream is
processed, thinks the request hasn't been
+ * fully read so issues a RST with error code 0 (NO_ERROR) to
tell the client not to send the request body,
+ * if any. This breaks tests and generates unnecessary RST
messages for standard clients.
+ */
+if (endOfStream) {
+receivedEndOfStream(stream);
+}
+if (processStream) {
+processStreamOnContainerThread(stream);
+}
+}
+}
+
+
+@Override
[tomcat] branch 9.0.x updated: Fix race condition that was causing intermittent CI failures
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 c7fb31ccb0 Fix race condition that was causing intermittent CI failures
c7fb31ccb0 is described below
commit c7fb31ccb0a1154ac7ad2d7e4696e2b1cf226796
Author: Mark Thomas
AuthorDate: Mon Aug 7 17:13:55 2023 +0100
Fix race condition that was causing intermittent CI failures
Ensure that, if there is no request body, the stream is notified that
end-of-stream has been received before passing processing of the request
to a container thread.
---
java/org/apache/coyote/http2/Http2Parser.java | 5 +--
.../apache/coyote/http2/Http2UpgradeHandler.java | 50 +++---
test/org/apache/coyote/http2/Http2TestBase.java| 19
webapps/docs/changelog.xml | 4 ++
4 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index da61589c93..ee84cc17c8 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -643,10 +643,9 @@ class Http2Parser {
hpackDecoder.getHeaderEmitter().validateHeaders();
synchronized (output) {
-output.headersEnd(streamId);
+output.headersEnd(streamId, headersEndStream);
if (headersEndStream) {
-output.receivedEndOfStream(streamId);
headersEndStream = false;
}
}
@@ -794,7 +793,7 @@ class Http2Parser {
void headersContinue(int payloadSize, boolean endOfHeaders);
-void headersEnd(int streamId) throws Http2Exception;
+void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception;
// Reset frames
void reset(int streamId, long errorCode) throws Http2Exception;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index d8e04d04da..22472e87d5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1541,20 +1541,6 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-@Override
-public void receivedEndOfStream(int streamId) throws ConnectionException {
-AbstractNonZeroStream abstractNonZeroStream =
-getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
-if (abstractNonZeroStream instanceof Stream) {
-Stream stream = (Stream) abstractNonZeroStream;
-stream.receivedEndOfStream();
-if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
-}
-}
-}
-
-
@Override
public void onSwallowedDataFramePayload(int streamId, int
swallowedDataBytesCount) throws IOException {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId);
@@ -1642,10 +1628,11 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
-public void headersEnd(int streamId) throws Http2Exception {
+public void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
+boolean processStream = false;
setMaxProcessedStream(streamId);
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
@@ -1663,9 +1650,40 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// Valid new stream reduces the overhead count
reduceOverheadCount(FrameType.HEADERS);
-processStreamOnContainerThread(stream);
+processStream = true;
}
}
+/*
+ * Need to process end of stream before calling
processStreamOnContainerThread to avoid a race condition
+ * where the container thread finishes before end of stream is
processed, thinks the request hasn't been
+ * fully read so issues a RST with error code 0 (NO_ERROR) to
tell the client not to send the request body,
+ * if any. This breaks tests and generates unnecessary RST
messages for standard clients.
+ */
+if (endOfStream) {
+receivedEndOfStream(stream);
+}
+if (processStream) {
+processStreamOnContainerThread(stream
[tomcat] branch 10.1.x updated: Fix race condition that was causing intermittent CI failures
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 b2e1f5b0bb Fix race condition that was causing intermittent CI failures
b2e1f5b0bb is described below
commit b2e1f5b0bb0b6646efaf875cd45b9eb65a103a28
Author: Mark Thomas
AuthorDate: Mon Aug 7 17:13:55 2023 +0100
Fix race condition that was causing intermittent CI failures
Ensure that, if there is no request body, the stream is notified that
end-of-stream has been received before passing processing of the request
to a container thread.
---
java/org/apache/coyote/http2/Http2Parser.java | 5 +--
.../apache/coyote/http2/Http2UpgradeHandler.java | 50 +++---
test/org/apache/coyote/http2/Http2TestBase.java| 19
webapps/docs/changelog.xml | 4 ++
4 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 0c9cea062e..384a5baf00 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -643,10 +643,9 @@ class Http2Parser {
hpackDecoder.getHeaderEmitter().validateHeaders();
synchronized (output) {
-output.headersEnd(streamId);
+output.headersEnd(streamId, headersEndStream);
if (headersEndStream) {
-output.receivedEndOfStream(streamId);
headersEndStream = false;
}
}
@@ -794,7 +793,7 @@ class Http2Parser {
void headersContinue(int payloadSize, boolean endOfHeaders);
-void headersEnd(int streamId) throws Http2Exception;
+void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception;
// Reset frames
void reset(int streamId, long errorCode) throws Http2Exception;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 137d009fd6..53b75b5457 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1547,20 +1547,6 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-@Override
-public void receivedEndOfStream(int streamId) throws ConnectionException {
-AbstractNonZeroStream abstractNonZeroStream =
-getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
-if (abstractNonZeroStream instanceof Stream) {
-Stream stream = (Stream) abstractNonZeroStream;
-stream.receivedEndOfStream();
-if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
-}
-}
-}
-
-
@Override
public void onSwallowedDataFramePayload(int streamId, int
swallowedDataBytesCount) throws IOException {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId);
@@ -1648,10 +1634,11 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
-public void headersEnd(int streamId) throws Http2Exception {
+public void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
+boolean processStream = false;
setMaxProcessedStream(streamId);
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
@@ -1669,9 +1656,40 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// Valid new stream reduces the overhead count
reduceOverheadCount(FrameType.HEADERS);
-processStreamOnContainerThread(stream);
+processStream = true;
}
}
+/*
+ * Need to process end of stream before calling
processStreamOnContainerThread to avoid a race condition
+ * where the container thread finishes before end of stream is
processed, thinks the request hasn't been
+ * fully read so issues a RST with error code 0 (NO_ERROR) to
tell the client not to send the request body,
+ * if any. This breaks tests and generates unnecessary RST
messages for standard clients.
+ */
+if (endOfStream) {
+receivedEndOfStream(stream);
+}
+if (processStream) {
+processStreamOnContainerThread(stream
[tomcat] branch main updated: Fix race condition that was causing intermittent CI failures
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 d3f3359d2b Fix race condition that was causing intermittent CI failures
d3f3359d2b is described below
commit d3f3359d2ba3abdd8b9719ab9e3c45c51610305d
Author: Mark Thomas
AuthorDate: Mon Aug 7 17:13:55 2023 +0100
Fix race condition that was causing intermittent CI failures
Ensure that, if there is no request body, the stream is notified that
end-of-stream has been received before passing processing of the request
to a container thread.
---
java/org/apache/coyote/http2/Http2Parser.java | 5 +--
.../apache/coyote/http2/Http2UpgradeHandler.java | 50 +++---
test/org/apache/coyote/http2/Http2TestBase.java| 19
webapps/docs/changelog.xml | 4 ++
4 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2Parser.java
b/java/org/apache/coyote/http2/Http2Parser.java
index 1eb0def3f6..c5f7f16ad5 100644
--- a/java/org/apache/coyote/http2/Http2Parser.java
+++ b/java/org/apache/coyote/http2/Http2Parser.java
@@ -626,10 +626,9 @@ class Http2Parser {
hpackDecoder.getHeaderEmitter().validateHeaders();
synchronized (output) {
-output.headersEnd(streamId);
+output.headersEnd(streamId, headersEndStream);
if (headersEndStream) {
-output.receivedEndOfStream(streamId);
headersEndStream = false;
}
}
@@ -777,7 +776,7 @@ class Http2Parser {
void headersContinue(int payloadSize, boolean endOfHeaders);
-void headersEnd(int streamId) throws Http2Exception;
+void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception;
// Reset frames
void reset(int streamId, long errorCode) throws Http2Exception;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 8b6c53bad5..389c2273a5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1547,20 +1547,6 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
}
-@Override
-public void receivedEndOfStream(int streamId) throws ConnectionException {
-AbstractNonZeroStream abstractNonZeroStream =
-getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
-if (abstractNonZeroStream instanceof Stream) {
-Stream stream = (Stream) abstractNonZeroStream;
-stream.receivedEndOfStream();
-if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
-}
-}
-}
-
-
@Override
public void onSwallowedDataFramePayload(int streamId, int
swallowedDataBytesCount) throws IOException {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId);
@@ -1631,10 +1617,11 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
-public void headersEnd(int streamId) throws Http2Exception {
+public void headersEnd(int streamId, boolean endOfStream) throws
Http2Exception {
AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
+boolean processStream = false;
setMaxProcessedStream(streamId);
Stream stream = (Stream) abstractNonZeroStream;
if (stream.isActive()) {
@@ -1652,9 +1639,40 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
// Valid new stream reduces the overhead count
reduceOverheadCount(FrameType.HEADERS);
-processStreamOnContainerThread(stream);
+processStream = true;
}
}
+/*
+ * Need to process end of stream before calling
processStreamOnContainerThread to avoid a race condition
+ * where the container thread finishes before end of stream is
processed, thinks the request hasn't been
+ * fully read so issues a RST with error code 0 (NO_ERROR) to
tell the client not to send the request body,
+ * if any. This breaks tests and generates unnecessary RST
messages for standard clients.
+ */
+if (endOfStream) {
+receivedEndOfStream(stream);
+}
+if (processStream) {
+processStreamOnContainerThread(stream
[tomcat] branch 9.0.x updated: Additional debug logging after CI test failure
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 72125872fa Additional debug logging after CI test failure
72125872fa is described below
commit 72125872facd907d90b38f587b9804aa6e781952
Author: Mark Thomas
AuthorDate: Thu Jul 27 20:55:48 2023 +0100
Additional debug logging after CI test failure
Log the full trace before clearing it so the logs have the full picture
of what was received.
---
test/org/apache/coyote/http2/TestRfc9218.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestRfc9218.java
b/test/org/apache/coyote/http2/TestRfc9218.java
index c42fd6ed7b..6cfd557022 100644
--- a/test/org/apache/coyote/http2/TestRfc9218.java
+++ b/test/org/apache/coyote/http2/TestRfc9218.java
@@ -43,6 +43,10 @@ public class TestRfc9218 extends Http2TestBase {
readSimpleGetResponse();
}
+String trace = output.getTrace();
+System.out.println(trace);
+output.clearTrace();
+
// At this point the connection window should be 1k
// Process a request on stream 17. This should consume the connection
window.
@@ -50,6 +54,8 @@ public class TestRfc9218 extends Http2TestBase {
// 17-headers, 17-1k-body
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// Send additional requests. Connection window is empty so only
headers will be returned.
@@ -59,6 +65,8 @@ public class TestRfc9218 extends Http2TestBase {
// 19-headers, 21-headers
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// At this point 17, 19 and 21 are all blocked because the connection
window is zero.
@@ -102,7 +110,7 @@ public class TestRfc9218 extends Http2TestBase {
parser.readFrame();
parser.readFrame();
-String trace = output.getTrace();
+trace = output.getTrace();
Assert.assertTrue(trace.contains("17-Body-877\n"));
trace = trace.replace("17-Body-877\n", "");
Assert.assertTrue(trace.contains("19-Body-1170\n"));
-
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: Additional debug logging after CI test failure
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 50b61fd467 Additional debug logging after CI test failure
50b61fd467 is described below
commit 50b61fd467a48aa748d572cfe8725f6cb0137b50
Author: Mark Thomas
AuthorDate: Thu Jul 27 20:55:48 2023 +0100
Additional debug logging after CI test failure
Log the full trace before clearing it so the logs have the full picture
of what was received.
---
test/org/apache/coyote/http2/TestRfc9218.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestRfc9218.java
b/test/org/apache/coyote/http2/TestRfc9218.java
index c42fd6ed7b..6cfd557022 100644
--- a/test/org/apache/coyote/http2/TestRfc9218.java
+++ b/test/org/apache/coyote/http2/TestRfc9218.java
@@ -43,6 +43,10 @@ public class TestRfc9218 extends Http2TestBase {
readSimpleGetResponse();
}
+String trace = output.getTrace();
+System.out.println(trace);
+output.clearTrace();
+
// At this point the connection window should be 1k
// Process a request on stream 17. This should consume the connection
window.
@@ -50,6 +54,8 @@ public class TestRfc9218 extends Http2TestBase {
// 17-headers, 17-1k-body
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// Send additional requests. Connection window is empty so only
headers will be returned.
@@ -59,6 +65,8 @@ public class TestRfc9218 extends Http2TestBase {
// 19-headers, 21-headers
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// At this point 17, 19 and 21 are all blocked because the connection
window is zero.
@@ -102,7 +110,7 @@ public class TestRfc9218 extends Http2TestBase {
parser.readFrame();
parser.readFrame();
-String trace = output.getTrace();
+trace = output.getTrace();
Assert.assertTrue(trace.contains("17-Body-877\n"));
trace = trace.replace("17-Body-877\n", "");
Assert.assertTrue(trace.contains("19-Body-1170\n"));
-
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: Additional debug logging after CI test failure
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 97ce7f957f Additional debug logging after CI test failure
97ce7f957f is described below
commit 97ce7f957f0a893aa4f1429ada6ef9788874b81b
Author: Mark Thomas
AuthorDate: Thu Jul 27 20:55:48 2023 +0100
Additional debug logging after CI test failure
Log the full trace before clearing it so the logs have the full picture
of what was received.
---
test/org/apache/coyote/http2/TestRfc9218.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestRfc9218.java
b/test/org/apache/coyote/http2/TestRfc9218.java
index c42fd6ed7b..6cfd557022 100644
--- a/test/org/apache/coyote/http2/TestRfc9218.java
+++ b/test/org/apache/coyote/http2/TestRfc9218.java
@@ -43,6 +43,10 @@ public class TestRfc9218 extends Http2TestBase {
readSimpleGetResponse();
}
+String trace = output.getTrace();
+System.out.println(trace);
+output.clearTrace();
+
// At this point the connection window should be 1k
// Process a request on stream 17. This should consume the connection
window.
@@ -50,6 +54,8 @@ public class TestRfc9218 extends Http2TestBase {
// 17-headers, 17-1k-body
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// Send additional requests. Connection window is empty so only
headers will be returned.
@@ -59,6 +65,8 @@ public class TestRfc9218 extends Http2TestBase {
// 19-headers, 21-headers
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// At this point 17, 19 and 21 are all blocked because the connection
window is zero.
@@ -102,7 +110,7 @@ public class TestRfc9218 extends Http2TestBase {
parser.readFrame();
parser.readFrame();
-String trace = output.getTrace();
+trace = output.getTrace();
Assert.assertTrue(trace.contains("17-Body-877\n"));
trace = trace.replace("17-Body-877\n", "");
Assert.assertTrue(trace.contains("19-Body-1170\n"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Additional debug logging after CI test failure
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 5cd6da7dca Additional debug logging after CI test failure
5cd6da7dca is described below
commit 5cd6da7dca87ddd92ac6be3ee2c0779696f198ab
Author: Mark Thomas
AuthorDate: Thu Jul 27 20:55:48 2023 +0100
Additional debug logging after CI test failure
Log the full trace before clearing it so the logs have the full picture
of what was received.
---
test/org/apache/coyote/http2/TestRfc9218.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/TestRfc9218.java
b/test/org/apache/coyote/http2/TestRfc9218.java
index c42fd6ed7b..6cfd557022 100644
--- a/test/org/apache/coyote/http2/TestRfc9218.java
+++ b/test/org/apache/coyote/http2/TestRfc9218.java
@@ -43,6 +43,10 @@ public class TestRfc9218 extends Http2TestBase {
readSimpleGetResponse();
}
+String trace = output.getTrace();
+System.out.println(trace);
+output.clearTrace();
+
// At this point the connection window should be 1k
// Process a request on stream 17. This should consume the connection
window.
@@ -50,6 +54,8 @@ public class TestRfc9218 extends Http2TestBase {
// 17-headers, 17-1k-body
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// Send additional requests. Connection window is empty so only
headers will be returned.
@@ -59,6 +65,8 @@ public class TestRfc9218 extends Http2TestBase {
// 19-headers, 21-headers
parser.readFrame();
parser.readFrame();
+trace = output.getTrace();
+System.out.println(trace);
output.clearTrace();
// At this point 17, 19 and 21 are all blocked because the connection
window is zero.
@@ -102,7 +110,7 @@ public class TestRfc9218 extends Http2TestBase {
parser.readFrame();
parser.readFrame();
-String trace = output.getTrace();
+trace = output.getTrace();
Assert.assertTrue(trace.contains("17-Body-877\n"));
trace = trace.replace("17-Body-877\n", "");
Assert.assertTrue(trace.contains("19-Body-1170\n"));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Revert "Refactor AmbiguousBean test after seeing failures in CI"
Mark,
On 3/30/23 19:10, ma...@apache.org wrote:
+public static class AmbiguousBean {
+public void setValue(@SuppressWarnings("unused") TypeA value) {
+}
+
+public void setValue(@SuppressWarnings("unused") String value) {
+}
+}
Best. Class. Name. Ever.
;)
-chris
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Address CI failures for potentially ambiguous bean methods.
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 7690caf7dc Address CI failures for potentially ambiguous bean methods.
7690caf7dc is described below
commit 7690caf7dcc5a4c4e9306f38c3d181aa0880f416
Author: Mark Thomas
AuthorDate: Fri Mar 31 00:36:06 2023 +0100
Address CI failures for potentially ambiguous bean methods.
---
java/jakarta/el/BeanSupportStandalone.java | 22 ++
test/jakarta/el/TestBeanSupport.java | 23 +--
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/java/jakarta/el/BeanSupportStandalone.java
b/java/jakarta/el/BeanSupportStandalone.java
index a2531451d2..0414261359 100644
--- a/java/jakarta/el/BeanSupportStandalone.java
+++ b/java/jakarta/el/BeanSupportStandalone.java
@@ -19,6 +19,7 @@ package jakarta.el;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,6 +33,15 @@ import jakarta.el.BeanELResolver.BeanProperty;
*/
class BeanSupportStandalone extends BeanSupport {
+/*
+ * The full JavaBeans implementation has a much more detailed definition
of method order that applies to an entire
+ * class. When ordering write methods for a single property, a much
simpler comparator can be used because it is
+ * known that the method names are the same, the return parameters are
both void and the methods only have a single
+ * parameter.
+ */
+private static final Comparator WRITE_METHOD_COMPARATOR =
+Comparator.comparing(m -> m.getParameterTypes()[0].getName());
+
@Override
BeanProperties getBeanProperties(Class type) {
return new BeanPropertiesStandalone(type);
@@ -133,6 +143,9 @@ class BeanSupportStandalone extends BeanSupport {
if (readMethod != null) {
type = readMethod.getReturnType();
} else {
+if (writeMethods.size() > 1) {
+writeMethods.sort(WRITE_METHOD_COMPARATOR);
+}
type = writeMethods.get(0).getParameterTypes()[0];
}
for (Method candidate : writeMethods) {
@@ -214,4 +227,13 @@ class BeanSupportStandalone extends BeanSupport {
return writeMethod;
}
}
+
+
+static final class WriteMethodComparator implements Comparator {
+
+@Override
+public int compare(Method m1, Method m2) {
+return 0;
+}
+}
}
diff --git a/test/jakarta/el/TestBeanSupport.java
b/test/jakarta/el/TestBeanSupport.java
index 0807a90dce..e5185a530f 100644
--- a/test/jakarta/el/TestBeanSupport.java
+++ b/test/jakarta/el/TestBeanSupport.java
@@ -74,12 +74,14 @@ public class TestBeanSupport extends ELBaseTest {
doTest(MismatchBean.class, "value", TypeA.class, TypeA.class, null);
}
-/*
- * The first setter found "wins".
- */
@Test
-public void testAmbiguousBean() {
-doTest(AmbiguousBean.class, "value", TypeA.class, null, TypeA.class);
+public void testAmbiguousBean01() {
+doTest(AmbiguousBean01.class, "value", TypeA.class, null, TypeA.class);
+}
+
+@Test
+public void testAmbiguousBean02() {
+doTest(AmbiguousBean02.class, "value", TypeA.class, null, TypeA.class);
}
@@ -222,7 +224,7 @@ public class TestBeanSupport extends ELBaseTest {
}
-public static class AmbiguousBean {
+public static class AmbiguousBean01 {
public void setValue(@SuppressWarnings("unused") TypeA value) {
}
@@ -231,6 +233,15 @@ public class TestBeanSupport extends ELBaseTest {
}
+public static class AmbiguousBean02 {
+public void setValue(@SuppressWarnings("unused") String value) {
+}
+
+public void setValue(@SuppressWarnings("unused") TypeA value) {
+}
+}
+
+
public static class TypeA {
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Revert "Refactor AmbiguousBean test after seeing failures in CI"
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 2cd3c6b620 Revert "Refactor AmbiguousBean test after seeing failures
in CI"
2cd3c6b620 is described below
commit 2cd3c6b620e9485694ed42e66896fa7f07885602
Author: Mark Thomas
AuthorDate: Fri Mar 31 00:09:16 2023 +0100
Revert "Refactor AmbiguousBean test after seeing failures in CI"
This reverts commit ffb5ef2de0f161b2d4c1ca92452e478ef4fcc13b.
JavaBeans has a fixed algorithm when mehtods appear to be
ambiguous. This needs to be replicated in the standalone support
---
test/jakarta/el/TestBeanSupport.java | 18 +++
test/jakarta/el/TestBeanSupportAmbiguous.java | 77 ---
2 files changed, 18 insertions(+), 77 deletions(-)
diff --git a/test/jakarta/el/TestBeanSupport.java
b/test/jakarta/el/TestBeanSupport.java
index 1f87d37bec..0807a90dce 100644
--- a/test/jakarta/el/TestBeanSupport.java
+++ b/test/jakarta/el/TestBeanSupport.java
@@ -74,6 +74,15 @@ public class TestBeanSupport extends ELBaseTest {
doTest(MismatchBean.class, "value", TypeA.class, TypeA.class, null);
}
+/*
+ * The first setter found "wins".
+ */
+@Test
+public void testAmbiguousBean() {
+doTest(AmbiguousBean.class, "value", TypeA.class, null, TypeA.class);
+}
+
+
private void doTest(Class clazz, String propertyName, Class type,
Class typeGet, Class typeSet) {
BeanProperties beanProperties =
BeanSupport.getInstance().getBeanProperties(clazz);
BeanProperty beanProperty =
beanProperties.properties.get(propertyName);
@@ -213,6 +222,15 @@ public class TestBeanSupport extends ELBaseTest {
}
+public static class AmbiguousBean {
+public void setValue(@SuppressWarnings("unused") TypeA value) {
+}
+
+public void setValue(@SuppressWarnings("unused") String value) {
+}
+}
+
+
public static class TypeA {
}
diff --git a/test/jakarta/el/TestBeanSupportAmbiguous.java
b/test/jakarta/el/TestBeanSupportAmbiguous.java
deleted file mode 100644
index 2f19020063..00
--- a/test/jakarta/el/TestBeanSupportAmbiguous.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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 jakarta.el;
-
-import jakarta.el.BeanELResolver.BeanProperties;
-import jakarta.el.BeanELResolver.BeanProperty;
-import jakarta.el.TestBeanSupport.TypeA;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestBeanSupportAmbiguous {
-
-/*
- * Different JREs appear to call different methods on AmbiguousBean. This
test ensures that the behaviour is
- * consistent across BeanSupport implementations within any single JRE,
- */
-@Test
-public void testAmbiguousBean() {
-// Disable caching so we can switch implementations within a JVM
instance.
-System.setProperty("jakarta.el.BeanSupport.doNotCacheInstance",
"true");
-
-// First test the stand-alone type
-System.setProperty("jakarta.el.BeanSupport.useStandalone",
Boolean.TRUE.toString());
-Class standaloneType = doTest();
-
-// Then test the full JavaBeans implementation
-System.setProperty("jakarta.el.BeanSupport.useStandalone",
Boolean.FALSE.toString());
-Class javaBeansType = doTest();
-
-Assert.assertEquals(standaloneType, javaBeansType);
-}
-
-
-private Class doTest() {
-BeanProperties beanProperties =
BeanSupport.getInstance().getBeanProperties(AmbiguousBean.class);
-BeanProperty beanProperty = beanProperties.properties.get("value");
-
-// Property type
-Assert.assertNotNull(beanProperty);
-Class propertyType = beanProperty.getPropertyType();
-Assert.assertNotNull(propertyType);
-
-// There is no getter
-Assert.assertNull(beanProperty.getReadMethod());
-
-// Check setter
-A
Re: CI, Java 17 and Javadoc
On Thu, Jan 12, 2023 at 3:03 PM Mark Thomas wrote: > > On 12/01/2023 13:41, Rémy Maucherat wrote: > > On Thu, Jan 12, 2023 at 1:19 PM Mark Thomas wrote: > >> > >> I tried switching the CI over to use Java 17 last night. This exposed an > >> unexpected Javadoc behaviour that is currently breaking the 9.0.x and > >> 8.5.x builds. > >> > >> Ant is configured to run Javadoc with failonwarning="true" > >> > >> When running the Javadoc task with Java 17: > >> > >> - if source="11" (Tomcat 10.1.x and 11.0.x) no warnings are generated > >> regarding SecurityManager use > >> > >> - if source="8" (Tomcat 9.0.x) warnings are generated for > >> SecurityManager use > >> > >> - if source="7" (Tomcat 8.5.x) warnings are generated for > >> SecurityManager use > >> > >> I don't understand why the warning generation is only generated for > >> older source values. It would make more sense to me if it were only > >> generated for newer values. > > > > Yes, ok, that looks very odd ... > > > >> Possible options: > >> - only use Java 17 for 11.0.x builds > >> - use failonwarning="false" > > > > Yes please. If you remember, I sent an update earlier on Javadoc 18+. > > There will now be some warnings that will make it counterproductive > > for us (in particular, having to have an empty constructor on > > everything just so that it can be javadoc-ed). We should keep the > > setting around however to see how these things evolve, maybe it would > > be improved/fixed eventually ... > > Ah yes. I remember that now. I'll parameterise the setting and default > it to false. Early indications are that the CheckStyle checks are more > useful anyway. They have already uncovered a bunch of issues. Some are > cosmetic but others are more significant such as whole sets of constants > having the wrong descriptions. Actually this javadoc validation through checkstyle looks better indeed. It's nice you were able to find these options, I had no idea it existed. Rémy > Mark > > > > > Rémy > > > >> - something else > >> > >> I'll switch the CI system back to Java 11 while we discuss options. I > >> also plan to look at CheckStyle options for Javadoc validation to see if > >> they could be an alternative approach if we use failonwarning="false" > >> > >> Thoughts? > > > > > > > >> Mark > >> > >> - > >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > >> For additional commands, e-mail: dev-h...@tomcat.apache.org > >> > > > > - > > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: CI, Java 17 and Javadoc
Mark, On 1/12/23 07:19, Mark Thomas wrote: I tried switching the CI over to use Java 17 last night. This exposed an unexpected Javadoc behaviour that is currently breaking the 9.0.x and 8.5.x builds. Ant is configured to run Javadoc with failonwarning="true" When running the Javadoc task with Java 17: - if source="11" (Tomcat 10.1.x and 11.0.x) no warnings are generated regarding SecurityManager use - if source="8" (Tomcat 9.0.x) warnings are generated for SecurityManager use - if source="7" (Tomcat 8.5.x) warnings are generated for SecurityManager use I don't understand why the warning generation is only generated for older source values. It would make more sense to me if it were only generated for newer values. Possible options: - only use Java 17 for 11.0.x builds - use failonwarning="false" - something else > I'll switch the CI system back to Java 11 while we discuss options. I also plan to look at CheckStyle options for Javadoc validation to see if they could be an alternative approach if we use failonwarning="false" Thoughts? I'm +1 for only moving-forward with Tomcat 11 for the time being. It makes sense to ratchet things forward at least there. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: CI, Java 17 and Javadoc
On 12/01/2023 13:41, Rémy Maucherat wrote: On Thu, Jan 12, 2023 at 1:19 PM Mark Thomas wrote: I tried switching the CI over to use Java 17 last night. This exposed an unexpected Javadoc behaviour that is currently breaking the 9.0.x and 8.5.x builds. Ant is configured to run Javadoc with failonwarning="true" When running the Javadoc task with Java 17: - if source="11" (Tomcat 10.1.x and 11.0.x) no warnings are generated regarding SecurityManager use - if source="8" (Tomcat 9.0.x) warnings are generated for SecurityManager use - if source="7" (Tomcat 8.5.x) warnings are generated for SecurityManager use I don't understand why the warning generation is only generated for older source values. It would make more sense to me if it were only generated for newer values. Yes, ok, that looks very odd ... Possible options: - only use Java 17 for 11.0.x builds - use failonwarning="false" Yes please. If you remember, I sent an update earlier on Javadoc 18+. There will now be some warnings that will make it counterproductive for us (in particular, having to have an empty constructor on everything just so that it can be javadoc-ed). We should keep the setting around however to see how these things evolve, maybe it would be improved/fixed eventually ... Ah yes. I remember that now. I'll parameterise the setting and default it to false. Early indications are that the CheckStyle checks are more useful anyway. They have already uncovered a bunch of issues. Some are cosmetic but others are more significant such as whole sets of constants having the wrong descriptions. Mark Rémy - something else I'll switch the CI system back to Java 11 while we discuss options. I also plan to look at CheckStyle options for Javadoc validation to see if they could be an alternative approach if we use failonwarning="false" Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: CI, Java 17 and Javadoc
On Thu, Jan 12, 2023 at 1:19 PM Mark Thomas wrote: > > I tried switching the CI over to use Java 17 last night. This exposed an > unexpected Javadoc behaviour that is currently breaking the 9.0.x and > 8.5.x builds. > > Ant is configured to run Javadoc with failonwarning="true" > > When running the Javadoc task with Java 17: > > - if source="11" (Tomcat 10.1.x and 11.0.x) no warnings are generated >regarding SecurityManager use > > - if source="8" (Tomcat 9.0.x) warnings are generated for >SecurityManager use > > - if source="7" (Tomcat 8.5.x) warnings are generated for >SecurityManager use > > I don't understand why the warning generation is only generated for > older source values. It would make more sense to me if it were only > generated for newer values. Yes, ok, that looks very odd ... > Possible options: > - only use Java 17 for 11.0.x builds > - use failonwarning="false" Yes please. If you remember, I sent an update earlier on Javadoc 18+. There will now be some warnings that will make it counterproductive for us (in particular, having to have an empty constructor on everything just so that it can be javadoc-ed). We should keep the setting around however to see how these things evolve, maybe it would be improved/fixed eventually ... Rémy > - something else > > I'll switch the CI system back to Java 11 while we discuss options. I > also plan to look at CheckStyle options for Javadoc validation to see if > they could be an alternative approach if we use failonwarning="false" > > Thoughts? > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
CI, Java 17 and Javadoc
I tried switching the CI over to use Java 17 last night. This exposed an unexpected Javadoc behaviour that is currently breaking the 9.0.x and 8.5.x builds. Ant is configured to run Javadoc with failonwarning="true" When running the Javadoc task with Java 17: - if source="11" (Tomcat 10.1.x and 11.0.x) no warnings are generated regarding SecurityManager use - if source="8" (Tomcat 9.0.x) warnings are generated for SecurityManager use - if source="7" (Tomcat 8.5.x) warnings are generated for SecurityManager use I don't understand why the warning generation is only generated for older source values. It would make more sense to me if it were only generated for newer values. Possible options: - only use Java 17 for 11.0.x builds - use failonwarning="false" - something else I'll switch the CI system back to Java 11 while we discuss options. I also plan to look at CheckStyle options for Javadoc validation to see if they could be an alternative approach if we use failonwarning="false" Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-connectors] branch main updated: Drop Travis CI support as per direction from infra
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-connectors.git The following commit(s) were added to refs/heads/main by this push: new 38d154a3a Drop Travis CI support as per direction from infra 38d154a3a is described below commit 38d154a3a6415220cdbaaa26c2ce0871e07a7bc4 Author: Mark Thomas AuthorDate: Tue Jan 10 17:26:46 2023 + Drop Travis CI support as per direction from infra --- .travis.yml | 72 - 1 file changed, 72 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fc159101f..0 --- a/.travis.yml +++ /dev/null @@ -1,72 +0,0 @@ -# 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. - -dist: bionic -compiler: gcc -arch: arm64 - -addons: -apt: - packages: -- build-essential -- automake -- autoconf -- tar -- libssl-dev -- subversion -- git -- libtool-bin - -before_script: -- rm -rf $HOME/tmp -- mkdir $HOME/tmp -- export CURR_PWD=`pwd` -- echo "Going to build APR" -- svn co -q https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x/ $HOME/tmp/apr -- cd $HOME/tmp/apr -- ./buildconf -- ./configure --prefix=$HOME/tmp/apr-build -- make -- make install -- echo "Going to build APR Util" -- svn co -q https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x $HOME/tmp/apr-util -- cd $HOME/tmp/apr-util -- ./buildconf --with-apr=$HOME/tmp/apr -- ./configure --with-apr=$HOME/tmp/apr-build/bin/apr-1-config --prefix=$HOME/tmp/apr-util-build -- make -- make install -- echo "Going to build HTTPD" -- svn co -q http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x $HOME/tmp/httpd -- cd $HOME/tmp/httpd -- ./buildconf --with-apr=$HOME/tmp/apr --with-apr-util=$HOME/tmp/apr-util -- ./configure --prefix=$HOME/tmp/httpd-build --with-apr=$HOME/tmp/apr-build/bin/apr-1-config --with-apr-util=$HOME/tmp/apr-util-build/bin/apu-1-config -- make -- make install - -script: -- echo "Going to build Tomcat Connectors" -- cd $CURR_PWD -- cd native -- ./buildconf.sh -- ./configure --with-apxs=$HOME/tmp/httpd-build/bin/apxs --prefix=$HOME/tmp/tc-connectors-build -- make -- make install - -after_failure: -- ls -la $HOME/tmp - -notifications: -email: -- dev@tomcat.apache.org \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add current branches to GitHub actions CI
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 c5290d08f0 Add current branches to GitHub actions CI c5290d08f0 is described below commit c5290d08f0ed6abd679038aa48a4d997763b5087 Author: Mark Thomas AuthorDate: Fri Oct 28 10:29:38 2022 +0100 Add current branches to GitHub actions CI --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 405d36fa79..91150ba20f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,9 @@ on: push: branches: - main + - 10.1.x + - 9.0.x + - 8.5.x pull_request: branches: - main - 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: Drop Travis CI
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 8eeffd8934 Drop Travis CI 8eeffd8934 is described below commit 8eeffd8934ba0eacce221553deca7e549775 Author: Mark Thomas AuthorDate: Fri Oct 28 10:20:57 2022 +0100 Drop Travis CI --- .travis.yml| 84 -- .travis/antTest.sh | 34 -- 2 files changed, 118 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dc0ab522a2..00 --- a/.travis.yml +++ /dev/null @@ -1,84 +0,0 @@ -# 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. - -dist: bionic -language: java -jdk: oraclejdk11 -arch: arm64 - -addons: -apt: - packages: -- ant -- build-essential -- automake -- autoconf -- tar -- libssl-dev -- subversion -- git -- libtool-bin - -install: -- ARCH=`uname -p` -- echo $ARCH -- JDK_X64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ARM64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz; -- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else JDK_URL=$JDK_X64; fi -- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz -- mv jdk-11* jdk -- export JAVA_HOME=`pwd`/jdk -- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.12-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.12 -- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" -- java -version -- ant -version -- rm -rf $HOME/tmp -- export CURR_PWD=`pwd` -- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $HOME/tmp/apr -- cd $HOME/tmp/apr -- ./buildconf -- ./configure --prefix=$HOME/tmp/apr-build -- make -- make install -- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" -- git clone -q -b 1.2.x --single-branch https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native -- cd $HOME/tmp/tomcat-native/native -- sh buildconf --with-apr=$HOME/tmp/apr -- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build -- make -- make install -- cd $CURR_PWD -- yes | cp build.properties.default build.properties -- echo >> build.properties -- echo "test.threads=4" >> build.properties -- echo "test.relaxTiming=true" >> build.properties -- echo "test.excludePerformance=true" >> build.properties -- echo "test.openssl.path=/dev/null/openssl" >> build.properties -- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties - - -script: -- ant -q clean -- travis_wait 120 "./.travis/antTest.sh" - -after_failure: -- tail -n 5000 ant-test.log -- tail -n 5000 test-failures.log -- ls -laR $HOME/tomcat-build-libs - -notifications: -email: - - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh deleted file mode 100755 index 0e266e67ef..00 --- a/.travis/antTest.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# 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 unde
[tomcat] branch 9.0.x updated: Drop Travis CI
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 b1d7671b24 Drop Travis CI b1d7671b24 is described below commit b1d7671b240c2e88b4a9f49da3155798dc312a68 Author: Mark Thomas AuthorDate: Fri Oct 28 10:20:57 2022 +0100 Drop Travis CI --- .travis.yml| 84 -- .travis/antTest.sh | 34 -- 2 files changed, 118 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dc0ab522a2..00 --- a/.travis.yml +++ /dev/null @@ -1,84 +0,0 @@ -# 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. - -dist: bionic -language: java -jdk: oraclejdk11 -arch: arm64 - -addons: -apt: - packages: -- ant -- build-essential -- automake -- autoconf -- tar -- libssl-dev -- subversion -- git -- libtool-bin - -install: -- ARCH=`uname -p` -- echo $ARCH -- JDK_X64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ARM64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz; -- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else JDK_URL=$JDK_X64; fi -- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz -- mv jdk-11* jdk -- export JAVA_HOME=`pwd`/jdk -- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.12-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.12 -- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" -- java -version -- ant -version -- rm -rf $HOME/tmp -- export CURR_PWD=`pwd` -- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $HOME/tmp/apr -- cd $HOME/tmp/apr -- ./buildconf -- ./configure --prefix=$HOME/tmp/apr-build -- make -- make install -- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" -- git clone -q -b 1.2.x --single-branch https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native -- cd $HOME/tmp/tomcat-native/native -- sh buildconf --with-apr=$HOME/tmp/apr -- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build -- make -- make install -- cd $CURR_PWD -- yes | cp build.properties.default build.properties -- echo >> build.properties -- echo "test.threads=4" >> build.properties -- echo "test.relaxTiming=true" >> build.properties -- echo "test.excludePerformance=true" >> build.properties -- echo "test.openssl.path=/dev/null/openssl" >> build.properties -- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties - - -script: -- ant -q clean -- travis_wait 120 "./.travis/antTest.sh" - -after_failure: -- tail -n 5000 ant-test.log -- tail -n 5000 test-failures.log -- ls -laR $HOME/tomcat-build-libs - -notifications: -email: - - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh deleted file mode 100755 index 0e266e67ef..00 --- a/.travis/antTest.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# 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 unde
[tomcat] branch 10.0.x updated: Drop Travis CI
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/10.0.x by this push: new b4484fee2e Drop Travis CI b4484fee2e is described below commit b4484fee2e939cf90529805339567e754a9d64f7 Author: Mark Thomas AuthorDate: Fri Oct 28 10:20:57 2022 +0100 Drop Travis CI --- .travis.yml| 92 -- .travis/antTest.sh | 34 2 files changed, 126 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c4f9074176..00 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ -# 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. - -dist: bionic -language: java -jobs: -include: - - arch: s390x -jdk: openjdk11 - - arch: arm64 -jdk: oraclejdk11 - - arch: ppc64le -jdk: oraclejdk11 - -addons: -apt: - packages: -- ant -- build-essential -- automake -- autoconf -- tar -- libssl-dev -- subversion -- git -- libtool-bin - -install: -- ARCH=`uname -p` -- echo $ARCH -- JDK_X64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ARM64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_s390x="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ppc64le="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz; -- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi -- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz -- mv jdk-11* jdk -- export JAVA_HOME=`pwd`/jdk -- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.12-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.12 -- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" -- java -version -- ant -version -- rm -rf $HOME/tmp -- export CURR_PWD=`pwd` -- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $HOME/tmp/apr -- cd $HOME/tmp/apr -- ./buildconf -- ./configure --prefix=$HOME/tmp/apr-build -- make -- make install -- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" -- git clone -q -b 1.2.x --single-branch https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native -- cd $HOME/tmp/tomcat-native/native -- sh buildconf --with-apr=$HOME/tmp/apr -- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build -- make -- make install -- cd $CURR_PWD -- yes | cp build.properties.default build.properties -- echo >> build.properties -- echo "test.threads=4" >> build.properties -- echo "test.relaxTiming=true" >> build.properties -- echo "test.excludePerformance=true" >> build.properties -- echo "test.openssl.path=/dev/null/openssl" >> build.properties -- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties - - -script: -- ant -q clean -- travis_wait 120 "./.travis/antTest.sh" - -after_failure: -- tail -n 5000 ant-test.log -- tail -n 5000 test-failures.log -- ls -laR $HOME/tomcat-build-libs - -notifications: -email: - - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh deleted file mode 100755 index 0e266e67ef..00 --- a/.travis/antTest.sh +++ /dev/null @@ -1,34 +
[tomcat] branch 10.1.x updated: Drop Travis CI
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 ab04c4429f Drop Travis CI ab04c4429f is described below commit ab04c4429fa74985582de1bda63aec30d9eefd13 Author: Mark Thomas AuthorDate: Fri Oct 28 10:20:57 2022 +0100 Drop Travis CI --- .travis.yml| 92 -- .travis/antTest.sh | 34 2 files changed, 126 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c4f9074176..00 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ -# 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. - -dist: bionic -language: java -jobs: -include: - - arch: s390x -jdk: openjdk11 - - arch: arm64 -jdk: oraclejdk11 - - arch: ppc64le -jdk: oraclejdk11 - -addons: -apt: - packages: -- ant -- build-essential -- automake -- autoconf -- tar -- libssl-dev -- subversion -- git -- libtool-bin - -install: -- ARCH=`uname -p` -- echo $ARCH -- JDK_X64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ARM64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_s390x="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ppc64le="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz; -- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi -- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz -- mv jdk-11* jdk -- export JAVA_HOME=`pwd`/jdk -- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.12-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.12 -- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" -- java -version -- ant -version -- rm -rf $HOME/tmp -- export CURR_PWD=`pwd` -- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $HOME/tmp/apr -- cd $HOME/tmp/apr -- ./buildconf -- ./configure --prefix=$HOME/tmp/apr-build -- make -- make install -- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" -- git clone -q -b 1.2.x --single-branch https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native -- cd $HOME/tmp/tomcat-native/native -- sh buildconf --with-apr=$HOME/tmp/apr -- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build -- make -- make install -- cd $CURR_PWD -- yes | cp build.properties.default build.properties -- echo >> build.properties -- echo "test.threads=4" >> build.properties -- echo "test.relaxTiming=true" >> build.properties -- echo "test.excludePerformance=true" >> build.properties -- echo "test.openssl.path=/dev/null/openssl" >> build.properties -- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties - - -script: -- ant -q clean -- travis_wait 120 "./.travis/antTest.sh" - -after_failure: -- tail -n 5000 ant-test.log -- tail -n 5000 test-failures.log -- ls -laR $HOME/tomcat-build-libs - -notifications: -email: - - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh deleted file mode 100755 index 0e266e67ef..00 --- a/.travis/antTest.sh +++ /dev/null @@ -1,34 +
[tomcat] branch main updated: Drop Travis CI
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 2375e1cf0f Drop Travis CI 2375e1cf0f is described below commit 2375e1cf0f77f5722e967a02a52c942fa9c69c8b Author: Mark Thomas AuthorDate: Fri Oct 28 10:20:57 2022 +0100 Drop Travis CI --- .travis.yml| 92 -- .travis/antTest.sh | 34 2 files changed, 126 deletions(-) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c4f9074176..00 --- a/.travis.yml +++ /dev/null @@ -1,92 +0,0 @@ -# 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. - -dist: bionic -language: java -jobs: -include: - - arch: s390x -jdk: openjdk11 - - arch: arm64 -jdk: oraclejdk11 - - arch: ppc64le -jdk: oraclejdk11 - -addons: -apt: - packages: -- ant -- build-essential -- automake -- autoconf -- tar -- libssl-dev -- subversion -- git -- libtool-bin - -install: -- ARCH=`uname -p` -- echo $ARCH -- JDK_X64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ARM64="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz; -- JDK_s390x="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.15_10.tar.gz; -- JDK_ppc64le="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.15_10.tar.gz; -- if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "ppc64le"; then JDK_URL=$JDK_ppc64le; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi -- wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz -- mv jdk-11* jdk -- export JAVA_HOME=`pwd`/jdk -- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.12-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.12 -- export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" -- java -version -- ant -version -- rm -rf $HOME/tmp -- export CURR_PWD=`pwd` -- git clone -q -b 1.6.x --single-branch https://github.com/apache/apr.git $HOME/tmp/apr -- cd $HOME/tmp/apr -- ./buildconf -- ./configure --prefix=$HOME/tmp/apr-build -- make -- make install -- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/tmp/apr-build/lib" -- git clone -q -b 1.2.x --single-branch https://github.com/apache/tomcat-native.git $HOME/tmp/tomcat-native -- cd $HOME/tmp/tomcat-native/native -- sh buildconf --with-apr=$HOME/tmp/apr -- ./configure --with-apr=$HOME/tmp/apr --with-java-home=$JAVA_HOME --with-ssl=yes --prefix=$HOME/tmp/tomcat-native-build -- make -- make install -- cd $CURR_PWD -- yes | cp build.properties.default build.properties -- echo >> build.properties -- echo "test.threads=4" >> build.properties -- echo "test.relaxTiming=true" >> build.properties -- echo "test.excludePerformance=true" >> build.properties -- echo "test.openssl.path=/dev/null/openssl" >> build.properties -- echo "test.apr.loc=$HOME/tmp/tomcat-native-build/lib" >> build.properties - - -script: -- ant -q clean -- travis_wait 120 "./.travis/antTest.sh" - -after_failure: -- tail -n 5000 ant-test.log -- tail -n 5000 test-failures.log -- ls -laR $HOME/tomcat-build-libs - -notifications: -email: - - dev@tomcat.apache.org diff --git a/.travis/antTest.sh b/.travis/antTest.sh deleted file mode 100755 index 0e266e67ef..00 --- a/.travis/antTest.sh +++ /dev/null @@ -1,34 +
Re: Migrating away from Travis CI
On Tue, Oct 25, 2022 at 10:01 AM Mark Thomas wrote: > > Hi all, > > Infra have notified us that we need to migrate off Travis CI. The > recommended replacement is GitHub actions. > > We are already using GitHub actions as a smoke test and we also have > BuiltBot and Gump providing CI. > > Travis provides access to ARM64, s390x and ppc64le which do not appear > to be available in any of our current CI systems. > > The ASF Jenkins service does appear to have a ppc64le node. There also > appears to be an ARM64 node but it is currently unavailable. > > We need to remove the configuration for the Travis builds. That is easy > to do. The question is do we want to replace the builds for these > additional platforms? > > I don't recall any instances of platform specific issues detected by > these CI systems. Travis has been so unreliable at times, I have > contemplated removing the Travis builds entirely irrespective of this > migration request from the infrastructure team. I am therefore leaning > towards the simple solution of not replacing the Travis builds. Should > we have a platform specific bug reported then we can, as we have done in > the past, figure out a way to get access to a suitable test environment. > > Thoughts? Given history, we should be fine with only GH actions and the main Apache CI. Sure having more platforms is always a good bonus, but if it is no longer easy to have it's likely not worth the effort. Rémy > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Migrating away from Travis CI
Hi all, Infra have notified us that we need to migrate off Travis CI. The recommended replacement is GitHub actions. We are already using GitHub actions as a smoke test and we also have BuiltBot and Gump providing CI. Travis provides access to ARM64, s390x and ppc64le which do not appear to be available in any of our current CI systems. The ASF Jenkins service does appear to have a ppc64le node. There also appears to be an ARM64 node but it is currently unavailable. We need to remove the configuration for the Travis builds. That is easy to do. The question is do we want to replace the builds for these additional platforms? I don't recall any instances of platform specific issues detected by these CI systems. Travis has been so unreliable at times, I have contemplated removing the Travis builds entirely irrespective of this migration request from the infrastructure team. I am therefore leaning towards the simple solution of not replacing the Travis builds. Should we have a platform specific bug reported then we can, as we have done in the past, figure out a way to get access to a suitable test environment. Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #554: ci: add minimum GitHub token permissions for workflow
markt-asf closed pull request #554: ci: add minimum GitHub token permissions for workflow URL: https://github.com/apache/tomcat/pull/554 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #554: ci: add minimum GitHub token permissions for workflow
markt-asf commented on PR #554: URL: https://github.com/apache/tomcat/pull/554#issuecomment-1265360483 Unnecessary. Handled by org level permissions. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] boahc077 opened a new pull request, #554: ci: add minimum GitHub token permissions for workflow
boahc077 opened a new pull request, #554: URL: https://github.com/apache/tomcat/pull/554 ### Description This PR adds minimum token permissions for the GITHUB_TOKEN in GitHub Actions workflows using [secure-workflows](https://github.com/step-security/secure-workflows). The GitHub Actions workflow has a GITHUB_TOKEN with write access to multiple scopes. Here is an example of the permissions in one of the workflow runs: https://github.com/apache/tomcat/actions/runs/3161137642/jobs/5146391221#step:1:19 After this change, the scopes will be reduced to the minimum needed for the following workflow: - ci.yml ### Motivation and Context - This is a security best practice, so if the GITHUB_TOKEN is compromised due to a vulnerability or compromised Action, the damage will be reduced. - [GitHub recommends](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token) defining minimum GITHUB_TOKEN permissions. - The Open Source Security Foundation (OpenSSF) [Scorecards](https://github.com/ossf/scorecard) also treats not setting token permissions as a high-risk issue. This change will help increase the Scorecard score for this repository. Signed-off-by: Ashish Kurmi -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Make test more robust (CI failure observed for 8.5.x)
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 94aa3fca0c Make test more robust (CI failure observed for 8.5.x)
94aa3fca0c is described below
commit 94aa3fca0cb21010dc3a24bfc7df98401c2ade0a
Author: Mark Thomas
AuthorDate: Mon Sep 5 13:52:37 2022 +0100
Make test more robust (CI failure observed for 8.5.x)
---
test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 48874b457b..a7d2435a3f 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -105,8 +105,16 @@ public class TestAsyncFileHandlerOverflow {
@Override
public void rejectedExecution(Runnable r, ThreadPoolExecutor
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
}
});
this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX,
SUFFIX, Integer.valueOf(1), loggerService);
-
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: Make test more robust (CI failure observed for 8.5.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 4d6f883fa4 Make test more robust (CI failure observed for 8.5.x)
4d6f883fa4 is described below
commit 4d6f883fa47f32397686551c99e936a75536904a
Author: Mark Thomas
AuthorDate: Mon Sep 5 13:52:37 2022 +0100
Make test more robust (CI failure observed for 8.5.x)
---
test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 73bc7c65dd..f646a90c13 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -107,8 +107,16 @@ public class TestAsyncFileHandlerOverflow {
@Override
public void rejectedExecution(Runnable r, ThreadPoolExecutor
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
}
});
this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX,
SUFFIX, 1, loggerService);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Make test more robust (CI failure observed for 8.5.x)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 3c0e408684 Make test more robust (CI failure observed for 8.5.x)
3c0e408684 is described below
commit 3c0e40868461e87b9b153241a1df2d41010c4aa4
Author: Mark Thomas
AuthorDate: Mon Sep 5 13:52:37 2022 +0100
Make test more robust (CI failure observed for 8.5.x)
---
test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 48874b457b..a7d2435a3f 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -105,8 +105,16 @@ public class TestAsyncFileHandlerOverflow {
@Override
public void rejectedExecution(Runnable r, ThreadPoolExecutor
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
}
});
this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX,
SUFFIX, Integer.valueOf(1), loggerService);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Make test more robust (CI failure observed for 8.5.x)
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 0e099db5df Make test more robust (CI failure observed for 8.5.x)
0e099db5df is described below
commit 0e099db5df2f08e1e214c4203bc379a03cf3f88a
Author: Mark Thomas
AuthorDate: Mon Sep 5 13:52:37 2022 +0100
Make test more robust (CI failure observed for 8.5.x)
---
test/org/apache/juli/TestAsyncFileHandlerOverflow.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
index 48874b457b..a7d2435a3f 100644
--- a/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
+++ b/test/org/apache/juli/TestAsyncFileHandlerOverflow.java
@@ -105,8 +105,16 @@ public class TestAsyncFileHandlerOverflow {
@Override
public void rejectedExecution(Runnable r, ThreadPoolExecutor
executor) {
-latch.countDown();
+// Generally, the latch needs to be released after the
+// RejectedExecutionHandler has completed but for the flush
case
+// the latch needs to be released first (else the test loops)
+if (overflowDropType == AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
rejectionHandler.rejectedExecution(r, executor);
+if (overflowDropType != AsyncFileHandler.OVERFLOW_DROP_FLUSH) {
+latch.countDown();
+}
}
});
this.handler = new AsyncFileHandler(logsDir.toString(), PREFIX,
SUFFIX, Integer.valueOf(1), loggerService);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat-jakartaee-migration] branch main updated: First attempt to configure CI at GitHub
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-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new 2f936cd First attempt to configure CI at GitHub
2f936cd is described below
commit 2f936cdc3708a57cd213e0b8946d6dae9d491ac2
Author: Mark Thomas
AuthorDate: Fri Sep 2 18:00:05 2022 +0100
First attempt to configure CI at GitHub
---
.github/workflows/ci.yml | 55
1 file changed, 55 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000..963e963
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,55 @@
+#Licensed 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.
+
+name: CI
+
+on:
+ push:
+branches:
+ - main
+ pull_request:
+branches:
+ - main
+
+env:
+ LC_ALL: en_US.UTF-8
+
+jobs:
+ JDKxx_Matrix:
+strategy:
+ fail-fast: false
+ matrix:
+java: [ 11, 17, 18, 19-ea ]
+os: [ ubuntu-latest ]
+include:
+- os: windows-latest
+ java: 11
+name: JDK${{ matrix.java }} ${{ matrix.os }}
+runs-on: ${{ matrix.os }}
+steps:
+- name: Git Checkout
+ uses: actions/checkout@v2
+- name: Set up Java
+ uses: actions/setup-java@v1
+ with:
+java-version: ${{ matrix.java }}
+- name: Build
+ run: |
+mvn test
+ continue-on-error:
+true
+- name: Upload logs
+ uses: actions/upload-artifact@v2
+ with:
+name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
+path: output/build/logs/TEST*.txt
+retention-days: 7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: git push ERROR wrt. CI
Am 21.04.2022 um 09:56 schrieb Mark Thomas: On 20/04/2022 22:52, Rainer Jung wrote: I currently see ERROR messages when doing git push. The push itself seems to work and triggers eg. travis, but the error seems related with CI. Example: Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 349 bytes | 43.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: To github:apache/tomcat.git remote: 7c0dd42ac4..9c8c76378e 9c8c76378ed0d48ecdcb586d9a0a2cd83820da78 -> main remote: Syncing refs/heads/main... remote: Sending notification emails to: ['"dev@tomcat.apache.org" '] and then the error: remote: git_buildbot: ERROR: Could not connect to ci2.apache.org:9989: Unicode-objects must be encoded before hashing To https://gitbox.apache.org/repos/asf/tomcat 7c0dd42ac4..9c8c76378e main -> main It happened for all branches. Does anyone know whether that's a problem and what needs to be done? It looks like we haven't had any CI builds triggered by commits for several weeks. I suspect the error you see above is the cause. My recommendation is that you open an INFRA ticket to report the issue. Thanks Mark, done: https://issues.apache.org/jira/browse/INFRA-23180 Best regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: git push ERROR wrt. CI
On 20/04/2022 22:52, Rainer Jung wrote: I currently see ERROR messages when doing git push. The push itself seems to work and triggers eg. travis, but the error seems related with CI. Example: Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 349 bytes | 43.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: To github:apache/tomcat.git remote: 7c0dd42ac4..9c8c76378e 9c8c76378ed0d48ecdcb586d9a0a2cd83820da78 -> main remote: Syncing refs/heads/main... remote: Sending notification emails to: ['"dev@tomcat.apache.org" '] and then the error: remote: git_buildbot: ERROR: Could not connect to ci2.apache.org:9989: Unicode-objects must be encoded before hashing To https://gitbox.apache.org/repos/asf/tomcat 7c0dd42ac4..9c8c76378e main -> main It happened for all branches. Does anyone know whether that's a problem and what needs to be done? It looks like we haven't had any CI builds triggered by commits for several weeks. I suspect the error you see above is the cause. My recommendation is that you open an INFRA ticket to report the issue. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
git push ERROR wrt. CI
I currently see ERROR messages when doing git push. The push itself seems to work and triggers eg. travis, but the error seems related with CI. Example: Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 349 bytes | 43.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: To github:apache/tomcat.git remote:7c0dd42ac4..9c8c76378e 9c8c76378ed0d48ecdcb586d9a0a2cd83820da78 -> main remote: Syncing refs/heads/main... remote: Sending notification emails to: ['"dev@tomcat.apache.org" '] and then the error: remote: git_buildbot: ERROR: Could not connect to ci2.apache.org:9989: Unicode-objects must be encoded before hashing To https://gitbox.apache.org/repos/asf/tomcat 7c0dd42ac4..9c8c76378e main -> main It happened for all branches. Does anyone know whether that's a problem and what needs to be done? Best regards, Rainer - 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: Increase timeout for CI
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 f2d0400 Increase timeout for CI
f2d0400 is described below
commit f2d0400c92b1abb4d8c6c4eaacbc322d22ae38b3
Author: Mark Thomas
AuthorDate: Thu Nov 25 07:36:16 2021 +
Increase timeout for CI
---
test/org/apache/jasper/servlet/TestJspServlet.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index 8f71da1..ecc0bf8 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -58,8 +58,9 @@ public class TestJspServlet extends TomcatBaseTest {
tomcat.start();
+// When using JaCoCo, the CI system seems to need a longer timeout
int rc = methodUrl("http://localhost:; + getPort() + "/test/bug56568",
-new ByteChunk(), 1, null, null, "PUT");
+new ByteChunk(), 3, null, null, "PUT");
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
-
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: Increase timeout for CI
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 22314d7 Increase timeout for CI
22314d7 is described below
commit 22314d74361532917a0f1e1b790a7c10d98c9a7b
Author: Mark Thomas
AuthorDate: Thu Nov 25 07:36:16 2021 +
Increase timeout for CI
---
test/org/apache/jasper/servlet/TestJspServlet.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index 8f71da1..ecc0bf8 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -58,8 +58,9 @@ public class TestJspServlet extends TomcatBaseTest {
tomcat.start();
+// When using JaCoCo, the CI system seems to need a longer timeout
int rc = methodUrl("http://localhost:; + getPort() + "/test/bug56568",
-new ByteChunk(), 1, null, null, "PUT");
+new ByteChunk(), 3, null, null, "PUT");
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
-
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: Another test where the CI system seems to need longer
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 7f68668 Another test where the CI system seems to need longer
7f68668 is described below
commit 7f686681959e34e028f1f6fc536dddb34f5425c2
Author: Mark Thomas
AuthorDate: Wed Nov 24 14:12:34 2021 +
Another test where the CI system seems to need longer
---
test/org/apache/catalina/core/TestStandardContextValve.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardContextValve.java
b/test/org/apache/catalina/core/TestStandardContextValve.java
index 8974d58..fd26472 100644
--- a/test/org/apache/catalina/core/TestStandardContextValve.java
+++ b/test/org/apache/catalina/core/TestStandardContextValve.java
@@ -74,7 +74,7 @@ public class TestStandardContextValve extends TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
@@ -125,7 +125,7 @@ public class TestStandardContextValve extends
TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
-
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: Another test where the CI system seems to need longer
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 072fe5a Another test where the CI system seems to need longer
072fe5a is described below
commit 072fe5a97c148bbf67c054dcb9f141b1a8984a2e
Author: Mark Thomas
AuthorDate: Wed Nov 24 14:12:34 2021 +
Another test where the CI system seems to need longer
---
test/org/apache/catalina/core/TestStandardContextValve.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardContextValve.java
b/test/org/apache/catalina/core/TestStandardContextValve.java
index 8974d58..fd26472 100644
--- a/test/org/apache/catalina/core/TestStandardContextValve.java
+++ b/test/org/apache/catalina/core/TestStandardContextValve.java
@@ -74,7 +74,7 @@ public class TestStandardContextValve extends TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
@@ -125,7 +125,7 @@ public class TestStandardContextValve extends
TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Another test where the CI system seems to need longer
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 46e9270 Another test where the CI system seems to need longer
46e9270 is described below
commit 46e9270912ebb45471abdbf22b262c49faa63b3b
Author: Mark Thomas
AuthorDate: Wed Nov 24 14:12:34 2021 +
Another test where the CI system seems to need longer
---
test/org/apache/catalina/core/TestStandardContextValve.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardContextValve.java
b/test/org/apache/catalina/core/TestStandardContextValve.java
index 12879e1..1805137 100644
--- a/test/org/apache/catalina/core/TestStandardContextValve.java
+++ b/test/org/apache/catalina/core/TestStandardContextValve.java
@@ -74,7 +74,7 @@ public class TestStandardContextValve extends TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
@@ -125,7 +125,7 @@ public class TestStandardContextValve extends
TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Another test where the CI system seems to need longer
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 49df1a2 Another test where the CI system seems to need longer
49df1a2 is described below
commit 49df1a2e8d7c92981ed679d1afc10cba231c61c2
Author: Mark Thomas
AuthorDate: Wed Nov 24 14:12:34 2021 +
Another test where the CI system seems to need longer
---
test/org/apache/catalina/core/TestStandardContextValve.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardContextValve.java
b/test/org/apache/catalina/core/TestStandardContextValve.java
index 12879e1..1805137 100644
--- a/test/org/apache/catalina/core/TestStandardContextValve.java
+++ b/test/org/apache/catalina/core/TestStandardContextValve.java
@@ -74,7 +74,7 @@ public class TestStandardContextValve extends TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
@@ -125,7 +125,7 @@ public class TestStandardContextValve extends
TomcatBaseTest {
// Need to allow time (but not too long in case the test fails) for
// ServletRequestListener to complete
-int i = 20;
+int i = 40;
while (i > 0) {
if (trace.toString().endsWith("Destroy")) {
break;
-
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: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
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 5b9729b Prompted by CI failures, run unit tests with TLSv1.2 as a
minimum
5b9729b is described below
commit 5b9729beefdba83f6ca62a8a21cc010f58a33c4f
Author: Mark Thomas
AuthorDate: Thu Nov 11 20:45:49 2021 +
Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index ae5a7d2..2f13295 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -199,9 +199,9 @@ public final class TesterSupport {
try {
SSLContext sc;
if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
} else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
}
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
-
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: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
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 49c6af0 Prompted by CI failures, run unit tests with TLSv1.2 as a
minimum
49c6af0 is described below
commit 49c6af06457aa3eea2e8677acfa0a9d3686adc7a
Author: Mark Thomas
AuthorDate: Thu Nov 11 20:45:49 2021 +
Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index a259f86..b4f7cc3 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -201,9 +201,9 @@ public final class TesterSupport {
try {
SSLContext sc;
if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
} else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
}
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
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 19dbd09 Prompted by CI failures, run unit tests with TLSv1.2 as a
minimum
19dbd09 is described below
commit 19dbd09652ee8b380cdbe02a6be25f0a062f61c2
Author: Mark Thomas
AuthorDate: Thu Nov 11 20:45:49 2021 +
Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index c797ea2..707ead9 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -195,9 +195,9 @@ public final class TesterSupport {
try {
SSLContext sc;
if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
} else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
}
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new ccfc05c Prompted by CI failures, run unit tests with TLSv1.2 as a
minimum
ccfc05c is described below
commit ccfc05c95cfa25bcc907ff9bfd8c6055be97f42d
Author: Mark Thomas
AuthorDate: Thu Nov 11 20:45:49 2021 +
Prompted by CI failures, run unit tests with TLSv1.2 as a minimum
---
test/org/apache/tomcat/util/net/TesterSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java
b/test/org/apache/tomcat/util/net/TesterSupport.java
index b1fca54..093c430 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -202,9 +202,9 @@ public final class TesterSupport {
try {
SSLContext sc;
if (TesterSupport.TLSV13_AVAILABLE) {
- sc = SSLContext.getInstance("TLSv1.3");
+ sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_3);
} else {
-sc = SSLContext.getInstance(Constants.SSL_PROTO_TLS);
+sc = SSLContext.getInstance(Constants.SSL_PROTO_TLSv1_2);
}
sc.init(TesterSupport.getUser1KeyManagers(),
TesterSupport.getTrustManagers(),
-
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 NPE observed investigating current CI failuers
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 af9d7d4 Fix NPE observed investigating current CI failuers
af9d7d4 is described below
commit af9d7d4f233e004d201404e05071996d04266836
Author: Mark Thomas
AuthorDate: Thu Nov 11 10:11:49 2021 +
Fix NPE observed investigating current CI failuers
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 0413434..3583a2d 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2343,7 +2343,10 @@ public class AprEndpoint extends AbstractEndpoint
implements SNICallBack {
if (sslOutputBuffer != null) {
ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
}
-((AprEndpoint)
getEndpoint()).getPoller().close(getSocket().longValue());
+Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+if (poller != null) {
+poller.close(getSocket().longValue());
+}
}
}
-
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 NPE observed investigating current CI failuers
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 6d29ec5 Fix NPE observed investigating current CI failuers
6d29ec5 is described below
commit 6d29ec5e1fe4ba92bcf0dc03a06d054338123df7
Author: Mark Thomas
AuthorDate: Thu Nov 11 10:11:49 2021 +
Fix NPE observed investigating current CI failuers
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 3a3aa0b..7599670 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2339,7 +2339,10 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
if (sslOutputBuffer != null) {
ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
}
-((AprEndpoint)
getEndpoint()).getPoller().close(getSocket().longValue());
+Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+if (poller != null) {
+poller.close(getSocket().longValue());
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix NPE observed investigating current CI failuers
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 0e44119 Fix NPE observed investigating current CI failuers
0e44119 is described below
commit 0e44119742ff742cf2c0fadf81d742ecad749bce
Author: Mark Thomas
AuthorDate: Thu Nov 11 10:11:49 2021 +
Fix NPE observed investigating current CI failuers
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index b3fbf22..9dda480 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2343,7 +2343,10 @@ public class AprEndpoint extends
AbstractEndpoint implements SNICallB
if (sslOutputBuffer != null) {
ByteBufferUtils.cleanDirectBuffer(sslOutputBuffer);
}
-((AprEndpoint)
getEndpoint()).getPoller().close(getSocket().longValue());
+Poller poller = ((AprEndpoint) getEndpoint()).getPoller();
+if (poller != null) {
+poller.close(getSocket().longValue());
+}
}
-
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: Attempt to avoid CI test failures
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 df6e3ff Attempt to avoid CI test failures
df6e3ff is described below
commit df6e3ff9a6787076a48e320757ed7c78d08d2563
Author: Mark Thomas
AuthorDate: Sun Nov 7 08:44:01 2021 +
Attempt to avoid CI test failures
---
test/org/apache/jasper/servlet/TestJspServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index 6abe6bf..72964e2 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -59,7 +59,7 @@ public class TestJspServlet extends TomcatBaseTest {
tomcat.start();
int rc = methodUrl("http://localhost:; + getPort() + "/test/bug56568",
-new ByteChunk(), 5000, null, null, "PUT");
+new ByteChunk(), 1, null, null, "PUT");
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
-
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: Attempt to avoid CI test failures
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 16657d2 Attempt to avoid CI test failures
16657d2 is described below
commit 16657d22f35a0b19b1c8721f1b4cb12c99879be7
Author: Mark Thomas
AuthorDate: Sun Nov 7 08:44:01 2021 +
Attempt to avoid CI test failures
---
test/org/apache/jasper/servlet/TestJspServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index 6abe6bf..72964e2 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -59,7 +59,7 @@ public class TestJspServlet extends TomcatBaseTest {
tomcat.start();
int rc = methodUrl("http://localhost:; + getPort() + "/test/bug56568",
-new ByteChunk(), 5000, null, null, "PUT");
+new ByteChunk(), 1, null, null, "PUT");
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Attempt to avoid CI test failures
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 9cb13a3 Attempt to avoid CI test failures
9cb13a3 is described below
commit 9cb13a3a92106020cce87de11785d26ab1f1cd69
Author: Mark Thomas
AuthorDate: Sun Nov 7 08:44:01 2021 +
Attempt to avoid CI test failures
---
test/org/apache/jasper/servlet/TestJspServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index 5b24e82..f151214 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -59,7 +59,7 @@ public class TestJspServlet extends TomcatBaseTest {
tomcat.start();
int rc = methodUrl("http://localhost:; + getPort() + "/test/bug56568",
-new ByteChunk(), 5000, null, null, "PUT");
+new ByteChunk(), 1, null, null, "PUT");
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Attempt to avoid CI test failures
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 0cd1299 Attempt to avoid CI test failures
0cd1299 is described below
commit 0cd1299a5cd326a7ca636686df00b2de0a74eb72
Author: Mark Thomas
AuthorDate: Sun Nov 7 08:44:01 2021 +
Attempt to avoid CI test failures
---
test/org/apache/jasper/servlet/TestJspServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index 5b24e82..f151214 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -59,7 +59,7 @@ public class TestJspServlet extends TomcatBaseTest {
tomcat.start();
int rc = methodUrl("http://localhost:; + getPort() + "/test/bug56568",
-new ByteChunk(), 5000, null, null, "PUT");
+new ByteChunk(), 1, null, null, "PUT");
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update RAT excludes for new CI system
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 commit c5065b1a8e5eed98b650e7473d74534c8648fdf6 Author: Mark Thomas AuthorDate: Sat Nov 6 08:56:36 2021 + Update RAT excludes for new CI system --- res/rat/rat-excludes.txt | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index a6ed2b1..38af1c6 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -30,7 +30,7 @@ - package-list and script.js files in API documentation (javadoc) are generated - - other test files, such as trivial textual files containing only "OK' string, + - test files, such as trivial textual files containing only "OK' string, files in unusual encodings or compressed files are also excluded. - JSON files (RFC7159) are data and cannot contain comments @@ -53,9 +53,9 @@ - Markdown files for display in their GitHub UI - - Temporary cache files used by Checkstle + - Temporary cache files used by Checkstyle - - Configuration files for third party Continuous Integration systems like Travis CI + - Temporary files used by buildbot output/build/logs/* @@ -187,3 +187,5 @@ output/dist/temp/safeToDelete.tmp output/res/checkstyle/* +tomcat-9.0.x/** + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update RAT excludes for new CI system
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b6324baf17b2c733a8c87a0debf34464002a05f3 Author: Mark Thomas AuthorDate: Sat Nov 6 08:56:36 2021 + Update RAT excludes for new CI system --- res/rat/rat-excludes.txt | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index a6ed2b1..38af1c6 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -30,7 +30,7 @@ - package-list and script.js files in API documentation (javadoc) are generated - - other test files, such as trivial textual files containing only "OK' string, + - test files, such as trivial textual files containing only "OK' string, files in unusual encodings or compressed files are also excluded. - JSON files (RFC7159) are data and cannot contain comments @@ -53,9 +53,9 @@ - Markdown files for display in their GitHub UI - - Temporary cache files used by Checkstle + - Temporary cache files used by Checkstyle - - Configuration files for third party Continuous Integration systems like Travis CI + - Temporary files used by buildbot output/build/logs/* @@ -187,3 +187,5 @@ output/dist/temp/safeToDelete.tmp output/res/checkstyle/* +tomcat-9.0.x/** + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Update RAT excludes for new CI system
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit d2ae5d63cda4d9e5af24ea0249c266a9322754d3 Author: Mark Thomas AuthorDate: Sat Nov 6 08:56:36 2021 + Update RAT excludes for new CI system --- res/rat/rat-excludes.txt | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/res/rat/rat-excludes.txt b/res/rat/rat-excludes.txt index 8d23f0f..450484e 100644 --- a/res/rat/rat-excludes.txt +++ b/res/rat/rat-excludes.txt @@ -30,7 +30,7 @@ - package-list and script.js files in API documentation (javadoc) are generated - - other test files, such as trivial textual files containing only "OK' string, + - test files, such as trivial textual files containing only "OK' string, files in unusual encodings or compressed files are also excluded. - JSON files (RFC7159) are data and cannot contain comments @@ -53,9 +53,9 @@ - Markdown files for display in their GitHub UI - - Temporary cache files used by Checkstle + - Temporary cache files used by Checkstyle - - Configuration files for third party Continuous Integration systems like Travis CI + - Temporary files used by buildbot output/build/logs/* @@ -212,3 +212,5 @@ output/dist/temp/safeToDelete.tmp output/res/checkstyle/* +tomcat-10.0.x/** + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Add some debug logging as there are still some unexplained CI failures
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 afa370c Add some debug logging as there are still some unexplained CI
failures
afa370c is described below
commit afa370c47dd0642ea41151e7499e2195fcf111c9
Author: Mark Thomas
AuthorDate: Wed Oct 13 09:32:04 2021 +0100
Add some debug logging as there are still some unexplained CI failures
---
.../servlet/http/TestHttpServletDoHead.java| 84 --
1 file changed, 47 insertions(+), 37 deletions(-)
diff --git a/test/jakarta/servlet/http/TestHttpServletDoHead.java
b/test/jakarta/servlet/http/TestHttpServletDoHead.java
index 811ee8e..90fc2cf 100644
--- a/test/jakarta/servlet/http/TestHttpServletDoHead.java
+++ b/test/jakarta/servlet/http/TestHttpServletDoHead.java
@@ -135,50 +135,60 @@ public class TestHttpServletDoHead extends Http2TestBase {
@Test
public void testDoHeadHttp2() throws Exception {
-http2Connect();
+StringBuilder debug = new StringBuilder();
+try {
+http2Connect();
-// Get request
-byte[] frameHeaderGet = new byte[9];
-ByteBuffer headersPayloadGet = ByteBuffer.allocate(128);
-buildGetRequest(frameHeaderGet, headersPayloadGet, null, 3, "/test");
-writeFrame(frameHeaderGet, headersPayloadGet);
+// Get request
+byte[] frameHeaderGet = new byte[9];
+ByteBuffer headersPayloadGet = ByteBuffer.allocate(128);
+buildGetRequest(frameHeaderGet, headersPayloadGet, null, 3,
"/test");
+writeFrame(frameHeaderGet, headersPayloadGet);
-// Want the headers frame for stream 3
-parser.readFrame(true);
-while (!output.getTrace().startsWith("3-HeadersStart\n")) {
-output.clearTrace();
+// Want the headers frame for stream 3
parser.readFrame(true);
-}
-String traceGet = output.getTrace();
-output.clearTrace();
-
-// Head request
-byte[] frameHeaderHead = new byte[9];
-ByteBuffer headersPayloadHead = ByteBuffer.allocate(128);
-buildHeadRequest(frameHeaderHead, headersPayloadHead, 5, "/test");
-writeFrame(frameHeaderHead, headersPayloadHead);
-
-// Want the headers frame for stream 5
-parser.readFrame(true);
-while (!output.getTrace().startsWith("5-HeadersStart\n")) {
+while (!output.getTrace().startsWith("3-HeadersStart\n")) {
+debug.append(output.getTrace());
+output.clearTrace();
+parser.readFrame(true);
+}
+String traceGet = output.getTrace();
+debug.append(output.getTrace());
output.clearTrace();
-parser.readFrame(true);
-}
-String traceHead = output.getTrace();
-String[] getHeaders = traceGet.split("\n");
-String[] headHeaders = traceHead.split("\n");
+// Head request
+byte[] frameHeaderHead = new byte[9];
+ByteBuffer headersPayloadHead = ByteBuffer.allocate(128);
+buildHeadRequest(frameHeaderHead, headersPayloadHead, 5, "/test");
+writeFrame(frameHeaderHead, headersPayloadHead);
-int i = 0;
-for (; i < getHeaders.length; i++) {
-// Headers should be the same, ignoring the first character which
is the steam ID
-Assert.assertEquals(getHeaders[i] + "\n" + traceGet + traceHead,
'3', getHeaders[i].charAt(0));
-Assert.assertEquals(headHeaders[i] + "\n" + traceGet + traceHead,
'5', headHeaders[i].charAt(0));
-Assert.assertEquals(traceGet + traceHead,
getHeaders[i].substring(1), headHeaders[i].substring(1));
-}
+// Want the headers frame for stream 5
+parser.readFrame(true);
+while (!output.getTrace().startsWith("5-HeadersStart\n")) {
+debug.append(output.getTrace());
+output.clearTrace();
+parser.readFrame(true);
+}
+String traceHead = output.getTrace();
+debug.append(output.getTrace());
+
+String[] getHeaders = traceGet.split("\n");
+String[] headHeaders = traceHead.split("\n");
+
+int i = 0;
+for (; i < getHeaders.length; i++) {
+// Headers should be the same, ignoring the first character
which is the steam ID
+Assert.assertEquals(getHeaders[i] + "\n" + traceGet +
traceHead, '3', getHeaders[i].charAt(0));
+Assert.assertEquals(headHeaders[i] + "\n" + tra
[GitHub] [tomcat] markt-asf commented on pull request #445: Improve Travis CI build Performance
markt-asf commented on pull request #445: URL: https://github.com/apache/tomcat/pull/445#issuecomment-900129327 It doesn't. It won't. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #445: Improve Travis CI build Performance
markt-asf closed pull request #445: URL: https://github.com/apache/tomcat/pull/445 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690180710 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: Or maybe the ones in https://github.com/apache/tomcat/blob/main/modules/ ? I am not sure whether Ant executes those. So the cache might be useful after all. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690178459 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: Where is it ? Did you confuse it with `build.xml` (Ant) ? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690177540 ## File path: .travis.yml ## @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 120 "./.travis/antTest.sh" +- "./.travis/antTest.sh" Review comment: I cannot say how long it might take. It depends on how loaded the Travis VM is. Sometimes jobs take twenty something minutes, sometimes fifty something minutes... According to https://docs.travis-ci.com/user/customizing-the-build/#sts=Build%20Timeouts the max timeout for a job should be 50 mins, but it seems `travis_wait` may extend it. I cannot find any reference in their docs for its maximum. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] YunLemon commented on a change in pull request #445: Improve Travis CI build Performance
YunLemon commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690172550 ## File path: .travis.yml ## @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 120 "./.travis/antTest.sh" +- "./.travis/antTest.sh" Review comment: This command will not exceed 60 mins? [https://app.travis-ci.com/github/apache/tomcat/jobs/529778525](https://app.travis-ci.com/github/apache/tomcat/jobs/529778525) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] YunLemon commented on a change in pull request #445: Improve Travis CI build Performance
YunLemon commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690167527 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: I add this because I see this repo contains pom.xml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] martin-g commented on a change in pull request #445: Improve Travis CI build Performance
martin-g commented on a change in pull request #445: URL: https://github.com/apache/tomcat/pull/445#discussion_r690160756 ## File path: .travis.yml ## @@ -90,3 +90,6 @@ after_failure: notifications: email: - dev@tomcat.apache.org +cache: + directories: + - $HOME/.m2 Review comment: Tomcat does not use Maven so I see no reason to cache this folder. ## File path: .travis.yml ## @@ -80,7 +80,7 @@ install: script: - ant -q clean -- travis_wait 120 "./.travis/antTest.sh" +- "./.travis/antTest.sh" Review comment: https://app.travis-ci.com/github/apache/tomcat/jobs/531899762 (the build for this PR) fails with `No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.`. So yes, `travis_wait` is needed! Maybe the duration should be reduced though. AFAIK Travis jobs could run for at most 50 mins but I see some which succeeded even after that... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #445: Improve Travis CI build Performance
markt-asf commented on pull request #445: URL: https://github.com/apache/tomcat/pull/445#issuecomment-900037585 The use of `travis_wait` is required. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] YunLemon opened a new pull request #445: Improve Travis CI build Performance
YunLemon opened a new pull request #445: URL: https://github.com/apache/tomcat/pull/445 According to [Build times out because no output was received](https://docs.travis-ci.com/user/common-build-problems/#build-times-out-because-no-output-was-received), we should carefully use travis_wait, as it may make the build unstable and extend the build time. [Caching Dependencies and Directories](https://docs.travis-ci.com/user/caching/) Travis CI can cache content that does not often change, to speed up the build process. = If there are any inappropriate modifications in this PR, please give me a reply and I will change them. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Fix Javadoc (and CI build)
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 701fa02 Fix Javadoc (and CI build)
701fa02 is described below
commit 701fa02053e997e7c799946a18991c4631d360dc
Author: Mark Thomas
AuthorDate: Wed Jun 23 15:51:59 2021 +0100
Fix Javadoc (and CI build)
---
java/org/apache/catalina/realm/UserDatabaseRealm.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index ed8e69e..2cc28d5 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -308,6 +308,8 @@ public class UserDatabaseRealm extends RealmBase {
/**
* Magic method from {@link java.io.Serializable}.
*
+ * @return The object to serialize instead of this object
+ *
* @throws ObjectStreamException Not thrown by this implementation
*/
private Object writeReplace() throws ObjectStreamException {
-
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 Javadoc (and CI build)
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 17c3c21 Fix Javadoc (and CI build)
17c3c21 is described below
commit 17c3c21a18a0e7009aaecb214796ffcc36bbd8db
Author: Mark Thomas
AuthorDate: Wed Jun 23 15:51:59 2021 +0100
Fix Javadoc (and CI build)
---
java/org/apache/catalina/realm/UserDatabaseRealm.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index 27e8b6a..e76adbd 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -292,6 +292,8 @@ public class UserDatabaseRealm extends RealmBase {
/**
* Magic method from {@link java.io.Serializable}.
*
+ * @return The object to serialize instead of this object
+ *
* @throws ObjectStreamException Not thrown by this implementation
*/
private Object writeReplace() throws ObjectStreamException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Fix Javadoc (and CI build)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 9f2c041 Fix Javadoc (and CI build)
9f2c041 is described below
commit 9f2c041fbd96cd3102c79abd68b7bb3a434c6bbe
Author: Mark Thomas
AuthorDate: Wed Jun 23 15:51:59 2021 +0100
Fix Javadoc (and CI build)
---
java/org/apache/catalina/realm/UserDatabaseRealm.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index c783ea5..c13b706 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -292,6 +292,8 @@ public class UserDatabaseRealm extends RealmBase {
/**
* Magic method from {@link java.io.Serializable}.
*
+ * @return The object to serialize instead of this object
+ *
* @throws ObjectStreamException Not thrown by this implementation
*/
private Object writeReplace() throws ObjectStreamException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Fix Javadoc (and CI build)
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 0ec9b4b Fix Javadoc (and CI build)
0ec9b4b is described below
commit 0ec9b4b51325ff51bad5aaa375cec2af919711a9
Author: Mark Thomas
AuthorDate: Wed Jun 23 15:51:59 2021 +0100
Fix Javadoc (and CI build)
---
java/org/apache/catalina/realm/UserDatabaseRealm.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java
b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index c783ea5..c13b706 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -292,6 +292,8 @@ public class UserDatabaseRealm extends RealmBase {
/**
* Magic method from {@link java.io.Serializable}.
*
+ * @return The object to serialize instead of this object
+ *
* @throws ObjectStreamException Not thrown by this implementation
*/
private Object writeReplace() throws ObjectStreamException {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Add Javadoc. Align with 8.5.x. Trivial commit to trigger CI.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new d651c3e Add Javadoc. Align with 8.5.x. Trivial commit to trigger CI.
d651c3e is described below
commit d651c3eab8a05fc1fd4a661fed8e63971ffcc1a7
Author: Mark Thomas
AuthorDate: Thu May 27 14:56:43 2021 +0100
Add Javadoc. Align with 8.5.x. Trivial commit to trigger CI.
---
java/javax/annotation/security/DeclareRoles.java | 4
java/javax/annotation/security/RolesAllowed.java | 4
java/javax/annotation/security/RunAs.java| 4
3 files changed, 12 insertions(+)
diff --git a/java/javax/annotation/security/DeclareRoles.java
b/java/javax/annotation/security/DeclareRoles.java
index d50e30d..7bf21e5 100644
--- a/java/javax/annotation/security/DeclareRoles.java
+++ b/java/javax/annotation/security/DeclareRoles.java
@@ -29,5 +29,9 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface DeclareRoles {
+
+/**
+ * @return a String[] with the roles
+ */
public String[] value();
}
diff --git a/java/javax/annotation/security/RolesAllowed.java
b/java/javax/annotation/security/RolesAllowed.java
index f916b6d..202b184 100644
--- a/java/javax/annotation/security/RolesAllowed.java
+++ b/java/javax/annotation/security/RolesAllowed.java
@@ -29,5 +29,9 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface RolesAllowed {
+
+/**
+ * @return a String[] of the allowed roles
+ */
public String[] value();
}
diff --git a/java/javax/annotation/security/RunAs.java
b/java/javax/annotation/security/RunAs.java
index 8a366e2..1484fee 100644
--- a/java/javax/annotation/security/RunAs.java
+++ b/java/javax/annotation/security/RunAs.java
@@ -29,5 +29,9 @@ import java.lang.annotation.Target;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface RunAs {
+
+/**
+ * @return a String with the value for RunAs
+ */
public String value();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: GitHub CI failures
On 21/04/2021 08:52, Mark Thomas wrote: Hi all, You may have noticed that the CI tests have started to failed for Java 8 on Windows at GitHub. This appears to have started when GitHub updated the JDK from Zulu 8.0.282 to 8.0.292. I have confirmed with local testing that I can recreate the failure with Zulu 8.0.292 on Windows and that switching to Zulu 8.0.282 allows the tests to complete. Initial indications are, therefore, that this is a Zuku JDK issue. I have opened an issue with Azul and I'll keep the list update with progress. The root cause was starting Java with a zero length string as a command line argument. As of 8u29x, Java on Windows rejects this to align with other platforms. Fixed in https://github.com/apache/tomcat/commit/46febe04 (and back-ported) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: More CI issues
On 21/04/2021 19:53, Mark Thomas wrote: Both GitHUb CI and Travis CI have started to report failures due to hash mismatches for downloaded resources. I'm not sure what is going on at this point. It doesn't seem to be related to a faulty mirror or an incorrect download hash in build.properties. Still looking (although I might not make much more progress today) It looks like this has resolved itself overnight. It might be related to this: https://issues.apache.org/jira/browse/INFRA-21767 Mark - 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: Code clean-up. No functional change. Primarily to trigger a CI build.
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 d3a0122 Code clean-up. No functional change. Primarily to trigger a
CI build.
d3a0122 is described below
commit d3a012279f099706f9d746a3161d639a6f79456a
Author: Mark Thomas
AuthorDate: Thu Apr 22 07:58:22 2021 +0100
Code clean-up. No functional change. Primarily to trigger a CI build.
---
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 29 +++---
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index dbc4d80..50a220d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -102,8 +102,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
* @param qry The query
* @return null (no error message to report other than exception)
*/
-protected String jmxQuery(MBeanServerConnection jmxServerConnection,
-String qry) {
+protected String jmxQuery(MBeanServerConnection jmxServerConnection,
String qry) {
String isError = null;
Set names = null;
String resultproperty = getResultproperty();
@@ -113,8 +112,9 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
setProperty(resultproperty +
".Length",Integer.toString(names.size()));
}
} catch (Exception e) {
-if (isEcho())
+if (isEcho()) {
handleErrorOutput(e.getMessage());
+}
return "Can't query mbeans " + qry;
}
@@ -142,28 +142,29 @@ public class JMXAccessorQueryTask extends JMXAccessorTask
{
Object value = null;
for (MBeanAttributeInfo attr : attrs) {
-if (!attr.isReadable())
+if (!attr.isReadable()) {
continue;
+}
String attName = attr.getName();
-if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0
-|| attName.indexOf(' ') >= 0) {
+if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0 ||
attName.indexOf(' ') >= 0) {
continue;
}
try {
-value = jmxServerConnection
-.getAttribute(oname, attName);
+value = jmxServerConnection.getAttribute(oname, attName);
} catch (Exception e) {
-if (isEcho())
-handleErrorOutput("Error getting attribute "
-+ oname + " " + pname + attName + " "
-+ e.toString());
+if (isEcho()) {
+handleErrorOutput(
+"Error getting attribute " + oname + " " +
pname + attName + " " + e.toString());
+}
continue;
}
-if (value == null)
+if (value == null) {
continue;
-if ("modelerType".equals(attName))
+}
+if ("modelerType".equals(attName)) {
continue;
+}
createProperty(pname + attName, value);
}
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Code clean-up. No functional change. Primarily to trigger a CI build.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new e663ab0 Code clean-up. No functional change. Primarily to trigger a
CI build.
e663ab0 is described below
commit e663ab075f73876adcb5172ebb332e79f6d0ee22
Author: Mark Thomas
AuthorDate: Thu Apr 22 07:57:22 2021 +0100
Code clean-up. No functional change. Primarily to trigger a CI build.
---
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 29 +++---
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index dbc4d80..50a220d 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -102,8 +102,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
* @param qry The query
* @return null (no error message to report other than exception)
*/
-protected String jmxQuery(MBeanServerConnection jmxServerConnection,
-String qry) {
+protected String jmxQuery(MBeanServerConnection jmxServerConnection,
String qry) {
String isError = null;
Set names = null;
String resultproperty = getResultproperty();
@@ -113,8 +112,9 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
setProperty(resultproperty +
".Length",Integer.toString(names.size()));
}
} catch (Exception e) {
-if (isEcho())
+if (isEcho()) {
handleErrorOutput(e.getMessage());
+}
return "Can't query mbeans " + qry;
}
@@ -142,28 +142,29 @@ public class JMXAccessorQueryTask extends JMXAccessorTask
{
Object value = null;
for (MBeanAttributeInfo attr : attrs) {
-if (!attr.isReadable())
+if (!attr.isReadable()) {
continue;
+}
String attName = attr.getName();
-if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0
-|| attName.indexOf(' ') >= 0) {
+if (attName.indexOf('=') >= 0 || attName.indexOf(':') >= 0 ||
attName.indexOf(' ') >= 0) {
continue;
}
try {
-value = jmxServerConnection
-.getAttribute(oname, attName);
+value = jmxServerConnection.getAttribute(oname, attName);
} catch (Exception e) {
-if (isEcho())
-handleErrorOutput("Error getting attribute "
-+ oname + " " + pname + attName + " "
-+ e.toString());
+if (isEcho()) {
+handleErrorOutput(
+"Error getting attribute " + oname + " " +
pname + attName + " " + e.toString());
+}
continue;
}
-if (value == null)
+if (value == null) {
continue;
-if ("modelerType".equals(attName))
+}
+if ("modelerType".equals(attName)) {
continue;
+}
createProperty(pname + attName, value);
}
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
More CI issues
Both GitHUb CI and Travis CI have started to report failures due to hash mismatches for downloaded resources. I'm not sure what is going on at this point. It doesn't seem to be related to a faulty mirror or an incorrect download hash in build.properties. Still looking (although I might not make much more progress today) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
GitHub CI failures
Hi all, You may have noticed that the CI tests have started to failed for Java 8 on Windows at GitHub. This appears to have started when GitHub updated the JDK from Zulu 8.0.282 to 8.0.292. I have confirmed with local testing that I can recreate the failure with Zulu 8.0.292 on Windows and that switching to Zulu 8.0.282 allows the tests to complete. Initial indications are, therefore, that this is a Zuku JDK issue. I have opened an issue with Azul and I'll keep the list update with progress. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Trivial clean-up commit to trigger CI build
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
commit dd8ce6df813217ad26f39b48ca26b3d6f5510a75
Author: Mark Thomas
AuthorDate: Thu Apr 8 09:17:04 2021 +0100
Trivial clean-up commit to trigger CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index 5f1bc83..41a67b4 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -113,8 +113,9 @@ public class JMXAccessorGetTask extends JMXAccessorTask {
if (result != null) {
echoResult(attribute,result);
createProperty(result);
-} else
+} else {
error = "Attribute " + attribute + " is empty";
+}
return error;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/03: Trivial clean-up commit to trigger CI build
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fc535a34e3e1893abb540472ba53824e74e9b7d0
Author: Mark Thomas
AuthorDate: Thu Apr 8 09:15:33 2021 +0100
Trivial clean-up commit to trigger CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index 5f1bc83..41a67b4 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -113,8 +113,9 @@ public class JMXAccessorGetTask extends JMXAccessorTask {
if (result != null) {
echoResult(attribute,result);
createProperty(result);
-} else
+} else {
error = "Attribute " + attribute + " is empty";
+}
return error;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Trivial clean-up commit to trigger CI build
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new f2bbf04 Trivial clean-up commit to trigger CI build
f2bbf04 is described below
commit f2bbf049bda65bea9db38babbf456015bf7d3568
Author: Mark Thomas
AuthorDate: Thu Apr 8 09:15:04 2021 +0100
Trivial clean-up commit to trigger CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
index 5f1bc83..41a67b4 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java
@@ -113,8 +113,9 @@ public class JMXAccessorGetTask extends JMXAccessorTask {
if (result != null) {
echoResult(attribute,result);
createProperty(result);
-} else
+} else {
error = "Attribute " + attribute + " is empty";
+}
return error;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update Java versions used by GitHub CI
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new d42777a Update Java versions used by GitHub CI d42777a is described below commit d42777a3c6fda15f0d5fb6c47528e37e21c254e4 Author: Mark Thomas AuthorDate: Wed Apr 7 17:25:19 2021 +0100 Update Java versions used by GitHub CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9f217a..e9c246e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: -java: [ 8, 11, 14, 15-ea ] +java: [ 8, 11, 16, 17-ea ] os: [ ubuntu-latest ] include: - os: windows-latest @@ -46,4 +46,4 @@ jobs: run: | ant -noinput echoproperties deploy embed test-nio test-status env: -ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true -Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap [...] \ No newline at end of file +ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true -Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap [...] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Switch test to use localhost as possible fix for CI instability
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 63a9470 Switch test to use localhost as possible fix for CI
instability
63a9470 is described below
commit 63a947041c9ae5a620a15a396c044ace908d4f87
Author: Mark Thomas
AuthorDate: Wed Apr 7 17:17:38 2021 +0100
Switch test to use localhost as possible fix for CI instability
---
.../org/apache/catalina/session/TestStandardSessionIntegration.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
index 553cc48..a69c993 100644
--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
@@ -32,6 +32,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.ha.tcp.SimpleTcpCluster;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestStandardSessionIntegration extends TomcatBaseTest {
@@ -60,7 +62,9 @@ public class TestStandardSessionIntegration extends
TomcatBaseTest {
ctx.addServletMappingDecoded("/bug56578", "bug56578");
if (useClustering) {
-tomcat.getEngine().setCluster(new SimpleTcpCluster());
+SimpleTcpCluster cluster = new SimpleTcpCluster();
+((ReceiverBase) ((GroupChannel)
cluster.getChannel()).getChannelReceiver()).setHost("localhost");
+tomcat.getEngine().setCluster(cluster);
ctx.setDistributable(true);
ctx.setManager(ctx.getCluster().createManager(""));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Switch test to use localhost as possible fix for CI instability
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 af4562d Switch test to use localhost as possible fix for CI
instability
af4562d is described below
commit af4562d1362cfd2ed822e766f9b7121caa682f6e
Author: Mark Thomas
AuthorDate: Wed Apr 7 17:17:38 2021 +0100
Switch test to use localhost as possible fix for CI instability
---
.../org/apache/catalina/session/TestStandardSessionIntegration.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
index 553cc48..a69c993 100644
--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
@@ -32,6 +32,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.ha.tcp.SimpleTcpCluster;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestStandardSessionIntegration extends TomcatBaseTest {
@@ -60,7 +62,9 @@ public class TestStandardSessionIntegration extends
TomcatBaseTest {
ctx.addServletMappingDecoded("/bug56578", "bug56578");
if (useClustering) {
-tomcat.getEngine().setCluster(new SimpleTcpCluster());
+SimpleTcpCluster cluster = new SimpleTcpCluster();
+((ReceiverBase) ((GroupChannel)
cluster.getChannel()).getChannelReceiver()).setHost("localhost");
+tomcat.getEngine().setCluster(cluster);
ctx.setDistributable(true);
ctx.setManager(ctx.getCluster().createManager(""));
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Switch test to use localhost as possible fix for CI instability
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 9242148 Switch test to use localhost as possible fix for CI
instability
9242148 is described below
commit 9242148372d6059cfacc2f4ffa81c886c3ed095e
Author: Mark Thomas
AuthorDate: Wed Apr 7 17:17:38 2021 +0100
Switch test to use localhost as possible fix for CI instability
---
.../org/apache/catalina/session/TestStandardSessionIntegration.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
index a4c8eec..81d5f56 100644
--- a/test/org/apache/catalina/session/TestStandardSessionIntegration.java
+++ b/test/org/apache/catalina/session/TestStandardSessionIntegration.java
@@ -32,6 +32,8 @@ import org.apache.catalina.Context;
import org.apache.catalina.ha.tcp.SimpleTcpCluster;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.tribes.group.GroupChannel;
+import org.apache.catalina.tribes.transport.ReceiverBase;
import org.apache.tomcat.util.buf.ByteChunk;
public class TestStandardSessionIntegration extends TomcatBaseTest {
@@ -60,7 +62,9 @@ public class TestStandardSessionIntegration extends
TomcatBaseTest {
ctx.addServletMappingDecoded("/bug56578", "bug56578");
if (useClustering) {
-tomcat.getEngine().setCluster(new SimpleTcpCluster());
+SimpleTcpCluster cluster = new SimpleTcpCluster();
+((ReceiverBase) ((GroupChannel)
cluster.getChannel()).getChannelReceiver()).setHost("localhost");
+tomcat.getEngine().setCluster(cluster);
ctx.setDistributable(true);
ctx.setManager(ctx.getCluster().createManager(""));
}
-
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: Trivial reformat to trigger a CI build
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 dfc4bbd Trivial reformat to trigger a CI build
dfc4bbd is described below
commit dfc4bbd5a0d49bb7919b20f238a1902989d443f3
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:01:17 2021 +0100
Trivial reformat to trigger a CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index a13fe90..27e30e6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -170,8 +170,9 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
try {
Object result = getJMXConnection().getAttribute(
new ObjectName(name), attribute);
-if(result != null)
+if (result != null) {
return result.toString();
+}
} catch (Exception e) {
// ignore access or connection open errors
}
-
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: Trivial reformat to trigger a CI build
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 b68b7c0 Trivial reformat to trigger a CI build
b68b7c0 is described below
commit b68b7c0b84317b304c4c8e84fe3f0abecb5d2a18
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:01:21 2021 +0100
Trivial reformat to trigger a CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index a13fe90..27e30e6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -170,8 +170,9 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
try {
Object result = getJMXConnection().getAttribute(
new ObjectName(name), attribute);
-if(result != null)
+if (result != null) {
return result.toString();
+}
} catch (Exception e) {
// ignore access or connection open errors
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Trivial reformat to trigger a CI build
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 8623d4b Trivial reformat to trigger a CI build
8623d4b is described below
commit 8623d4becf96dce9c467600cc5791b3847e661f7
Author: Mark Thomas
AuthorDate: Mon Mar 29 19:01:12 2021 +0100
Trivial reformat to trigger a CI build
---
java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
index a13fe90..27e30e6 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorConditionBase.java
@@ -170,8 +170,9 @@ public abstract class JMXAccessorConditionBase extends
ProjectComponent implemen
try {
Object result = getJMXConnection().getAttribute(
new ObjectName(name), attribute);
-if(result != null)
+if (result != null) {
return result.toString();
+}
} catch (Exception e) {
// ignore access or connection open errors
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Enable debug logging for intermittently failing tests on CI systems
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
commit 42620fd5c31b34901037045bb93d1649b1301c05
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:46:21 2021 +
Enable debug logging for intermittently failing tests on CI systems
---
.../interceptors/TestNonBlockingCoordinator.java | 100 +++--
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 9f9ed42..2927dc4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -16,6 +16,9 @@
*/
package org.apache.catalina.tribes.group.interceptors;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -39,55 +42,62 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
-log.info("Setup");
-channels = new GroupChannel[CHANNEL_COUNT];
-coordinators = new NonBlockingCoordinator[CHANNEL_COUNT];
-Thread[] threads = new Thread[CHANNEL_COUNT];
-for ( int i=0; i
[tomcat] 01/02: Add additional debug logging - required to investigate CI failures
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
commit c6413a0e17d8997408610bde440800f765469e1c
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:45:38 2021 +
Add additional debug logging - required to investigate CI failures
---
.../tribes/group/interceptors/NonBlockingCoordinator.java| 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index ab26140..6e947cd 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -760,9 +760,15 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
@Override
public void fireInterceptorEvent(InterceptorEvent event) {
-if (event instanceof CoordinationEvent &&
-((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX)
-log.info(event);
+if (event instanceof CoordinationEvent) {
+if (((CoordinationEvent) event).type ==
CoordinationEvent.EVT_CONF_RX) {
+log.info(event);
+} else {
+if (log.isDebugEnabled()) {
+log.debug(event);
+}
+}
+}
}
public static class CoordinationEvent implements InterceptorEvent {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Enable debug logging for intermittently failing tests on CI systems
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d76786f7639cfc3327a69a8635c5e04c3b8055e3
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:46:21 2021 +
Enable debug logging for intermittently failing tests on CI systems
---
.../interceptors/TestNonBlockingCoordinator.java | 100 +++--
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index 9f9ed42..2927dc4 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -16,6 +16,9 @@
*/
package org.apache.catalina.tribes.group.interceptors;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -39,55 +42,62 @@ public class TestNonBlockingCoordinator {
@Before
public void setUp() throws Exception {
-log.info("Setup");
-channels = new GroupChannel[CHANNEL_COUNT];
-coordinators = new NonBlockingCoordinator[CHANNEL_COUNT];
-Thread[] threads = new Thread[CHANNEL_COUNT];
-for ( int i=0; i
[tomcat] 01/02: Add additional debug logging - required to investigate CI failures
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e31335ae25c327910d3be5d8e73a7a3747f2561f
Author: Mark Thomas
AuthorDate: Fri Mar 26 16:45:38 2021 +
Add additional debug logging - required to investigate CI failures
---
.../tribes/group/interceptors/NonBlockingCoordinator.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index a187805..71db650 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -760,9 +760,14 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
@Override
public void fireInterceptorEvent(InterceptorEvent event) {
-if (event instanceof CoordinationEvent &&
-((CoordinationEvent)event).type == CoordinationEvent.EVT_CONF_RX) {
-log.info(event);
+if (event instanceof CoordinationEvent) {
+if (((CoordinationEvent) event).type ==
CoordinationEvent.EVT_CONF_RX) {
+log.info(event);
+} else {
+if (log.isDebugEnabled()) {
+log.debug(event);
+}
+}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix intermittent CI failure
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
commit c3e3deaccca128a6c57ec801128f65be8e291dc4
Author: Mark Thomas
AuthorDate: Thu Mar 25 16:19:49 2021 +
Fix intermittent CI failure
If the complete/dispatch is on a new thread there is a race condition
between the new thread and the container thread. The COMPLETE_PENDIND
and DISPATCH_PENDING states were created to handle this scenario so use
them.
---
java/org/apache/coyote/AsyncStateMachine.java | 34 +++
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 2f9a28d..0826a2c 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -91,21 +91,23 @@ import org.apache.tomcat.util.security.PrivilegedSetTccl;
*| / | \
|
*|OT-complete() / | \OT-dispatch()
|
*| COMPLETE_PENDING«--«--/|
\---»-»DISPATCH_PENDING |
- *| | | |
|
- *|post()| timeout() post()| post()post()|
timeout() |
- *| | |--|| |--| |
|--||
- *| \|/ \|/ | complete() \|/\|/ | dispatch() \|/
\|/ ||
+ *| |/|\| /|\ |
|
+ *| | | ||
|post() |
+ *| | |complete() | dispatch()| |
|
+ *| | | || |
|
+ *| | |-«---«-- | --«---READ_WRITE--»| |
|
+ *| | |/ /|\ |
|
+ *| | | post()/ / |
|
+ *| | | / /|
|
+ *| | | / / |
|
+ *| | |/ / |
|
+ *|post()| timeout() post()| / /asyncOperation() |
timeout() |
+ *| | |--|| | /|
|--||
+ *| \|/ \|/ | complete() \|/ \|// dispatch() \|/
\|/ ||
*
|--«-COMPLETING««--STARTED»-»DISPATCHING|
- */|\ /|\ /|\ | /|\ \ /|\ /|\
/|\
- * || || \ \asyncOperation() | |
|
- * || | timeout()| \ \ | |
|
- * || ||\ \ | |
|
- * || || \ \| |
|
- * || || \ \ | |
|
- * || || \ \ | |
|
- * || || post()\ \ dispatch()| |
|
- * || | complete() | \ \|/| |
|
- * || |---««-- | --«---READ_WRITE»| |
|
+ */|\ /|\ | /|\ | /|\
/|\
+ * ||| |--||
|
+ * || timeout()| post() |
|
* ||| |
|
* || complete() \|/ dispatch() |
|
* ||«---TIMING_OUT»|
|
@@ -359,8 +361,10 @@ public class AsyncStateMachine {
}
+
public synchronized boolean asyncDispatch() {
-if (!ContainerThreadMarker.isContainerThread() && state ==
AsyncState.STARTING) {
+if (!ContainerThreadMarker.isContainerThread() && state ==
AsyncState.STARTING ||
+state == AsyncState.READ_WRITE_OP) {
updateState(AsyncState.DISPATCH_PENDING);
return false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Fix intermittent CI failure
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 70c7d663df87d35800eea571c2a1cecd4d5b4f91
Author: Mark Thomas
AuthorDate: Thu Mar 25 16:19:49 2021 +
Fix intermittent CI failure
If the complete/dispatch is on a new thread there is a race condition
between the new thread and the container thread. The COMPLETE_PENDIND
and DISPATCH_PENDING states were created to handle this scenario so use
them.
---
java/org/apache/coyote/AsyncStateMachine.java | 33 +++
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 4ad5a0d..4cc194e 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -91,21 +91,23 @@ import org.apache.tomcat.util.security.PrivilegedSetTccl;
*| / | \
|
*|OT-complete() / | \OT-dispatch()
|
*| COMPLETE_PENDING«--«--/|
\---»-»DISPATCH_PENDING |
- *| | | |
|
- *|post()| timeout() post()| post()post()|
timeout() |
- *| | |--|| |--| |
|--||
- *| \|/ \|/ | complete() \|/\|/ | dispatch() \|/
\|/ ||
+ *| |/|\| /|\ |
|
+ *| | | ||
|post() |
+ *| | |complete() | dispatch()| |
|
+ *| | | || |
|
+ *| | |-«---«-- | --«---READ_WRITE--»| |
|
+ *| | |/ /|\ |
|
+ *| | | post()/ / |
|
+ *| | | / /|
|
+ *| | | / / |
|
+ *| | |/ / |
|
+ *|post()| timeout() post()| / /asyncOperation() |
timeout() |
+ *| | |--|| | /|
|--||
+ *| \|/ \|/ | complete() \|/ \|// dispatch() \|/
\|/ ||
*
|--«-COMPLETING««--STARTED»-»DISPATCHING|
- */|\ /|\ /|\ | /|\ \ /|\ /|\
/|\
- * || || \ \asyncOperation() | |
|
- * || | timeout()| \ \ | |
|
- * || ||\ \ | |
|
- * || || \ \| |
|
- * || || \ \ | |
|
- * || || \ \ | |
|
- * || || post()\ \ dispatch()| |
|
- * || | complete() | \ \|/| |
|
- * || |---««-- | --«---READ_WRITE»| |
|
+ */|\ /|\ | /|\ | /|\
/|\
+ * ||| |--||
|
+ * || timeout()| post() |
|
* ||| |
|
* || complete() \|/ dispatch() |
|
* ||«---TIMING_OUT»|
|
@@ -360,7 +362,8 @@ class AsyncStateMachine {
synchronized boolean asyncDispatch() {
-if (!ContainerThreadMarker.isContainerThread() && state ==
AsyncState.STARTING) {
+if (!ContainerThreadMarker.isContainerThread() && state ==
AsyncState.STARTING ||
+state == AsyncState.READ_WRITE_OP) {
updateState(AsyncState.DISPATCH_PENDING);
return false;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Enable debug logging for a test that is failing intermittently in CI
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
commit f2ddf1e85caf43b4e761b2357c86cde538c122af
Author: Mark Thomas
AuthorDate: Wed Mar 24 19:03:10 2021 +
Enable debug logging for a test that is failing intermittently in CI
---
.../apache/catalina/core/TestAsyncContextImpl.java | 39 +-
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index 3790d00..2995fe0 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -28,6 +28,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
import javax.servlet.AsyncContext;
import javax.servlet.AsyncEvent;
@@ -2739,29 +2741,34 @@ public class TestAsyncContextImpl extends
TomcatBaseTest {
private void doTestAsyncIoEnd(boolean useThread, boolean useComplete)
throws Exception {
-Tomcat tomcat = getTomcatInstance();
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.ALL);
+try {
+Tomcat tomcat = getTomcatInstance();
-// No file system docBase required
-Context ctx = tomcat.addContext("", null);
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
-AsyncIoEndServlet asyncIoEndServlet = new AsyncIoEndServlet(useThread,
useComplete);
-Wrapper wrapper = Tomcat.addServlet(ctx, "asyncIoEndServlet",
asyncIoEndServlet);
-wrapper.setAsyncSupported(true);
-ctx.addServletMappingDecoded("/asyncIoEndServlet",
"asyncIoEndServlet");
+AsyncIoEndServlet asyncIoEndServlet = new
AsyncIoEndServlet(useThread, useComplete);
+Wrapper wrapper = Tomcat.addServlet(ctx, "asyncIoEndServlet",
asyncIoEndServlet);
+wrapper.setAsyncSupported(true);
+ctx.addServletMappingDecoded("/asyncIoEndServlet",
"asyncIoEndServlet");
-SimpleServlet simpleServlet = new SimpleServlet();
-Tomcat.addServlet(ctx, "simpleServlet", simpleServlet);
-ctx.addServletMappingDecoded("/simpleServlet", "simpleServlet");
+SimpleServlet simpleServlet = new SimpleServlet();
+Tomcat.addServlet(ctx, "simpleServlet", simpleServlet);
+ctx.addServletMappingDecoded("/simpleServlet", "simpleServlet");
-tomcat.start();
+tomcat.start();
-ByteChunk body = new ByteChunk();
-int rc = getUrl("http://localhost:; + getPort() +
"/asyncIoEndServlet", body, null);
+ByteChunk body = new ByteChunk();
+int rc = getUrl("http://localhost:; + getPort() +
"/asyncIoEndServlet", body, null);
-Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-Assert.assertEquals("OK", body.toString());
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertEquals("OK", body.toString());
-Assert.assertFalse(asyncIoEndServlet.getInvalidStateDetected());
+Assert.assertFalse(asyncIoEndServlet.getInvalidStateDetected());
+} finally {
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.INFO);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Enable debug logging for a test that is failing intermittently in CI
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2fa851bf833acaa2774c7bfe0ee500ec03ece62d
Author: Mark Thomas
AuthorDate: Wed Mar 24 19:03:10 2021 +
Enable debug logging for a test that is failing intermittently in CI
---
.../apache/catalina/core/TestAsyncContextImpl.java | 39 +-
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/catalina/core/TestAsyncContextImpl.java
b/test/org/apache/catalina/core/TestAsyncContextImpl.java
index a650ea7..421b3b4 100644
--- a/test/org/apache/catalina/core/TestAsyncContextImpl.java
+++ b/test/org/apache/catalina/core/TestAsyncContextImpl.java
@@ -28,6 +28,8 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent;
@@ -2739,29 +2741,34 @@ public class TestAsyncContextImpl extends
TomcatBaseTest {
private void doTestAsyncIoEnd(boolean useThread, boolean useComplete)
throws Exception {
-Tomcat tomcat = getTomcatInstance();
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.ALL);
+try {
+Tomcat tomcat = getTomcatInstance();
-// No file system docBase required
-Context ctx = tomcat.addContext("", null);
+// No file system docBase required
+Context ctx = tomcat.addContext("", null);
-AsyncIoEndServlet asyncIoEndServlet = new AsyncIoEndServlet(useThread,
useComplete);
-Wrapper wrapper = Tomcat.addServlet(ctx, "asyncIoEndServlet",
asyncIoEndServlet);
-wrapper.setAsyncSupported(true);
-ctx.addServletMappingDecoded("/asyncIoEndServlet",
"asyncIoEndServlet");
+AsyncIoEndServlet asyncIoEndServlet = new
AsyncIoEndServlet(useThread, useComplete);
+Wrapper wrapper = Tomcat.addServlet(ctx, "asyncIoEndServlet",
asyncIoEndServlet);
+wrapper.setAsyncSupported(true);
+ctx.addServletMappingDecoded("/asyncIoEndServlet",
"asyncIoEndServlet");
-SimpleServlet simpleServlet = new SimpleServlet();
-Tomcat.addServlet(ctx, "simpleServlet", simpleServlet);
-ctx.addServletMappingDecoded("/simpleServlet", "simpleServlet");
+SimpleServlet simpleServlet = new SimpleServlet();
+Tomcat.addServlet(ctx, "simpleServlet", simpleServlet);
+ctx.addServletMappingDecoded("/simpleServlet", "simpleServlet");
-tomcat.start();
+tomcat.start();
-ByteChunk body = new ByteChunk();
-int rc = getUrl("http://localhost:; + getPort() +
"/asyncIoEndServlet", body, null);
+ByteChunk body = new ByteChunk();
+int rc = getUrl("http://localhost:; + getPort() +
"/asyncIoEndServlet", body, null);
-Assert.assertEquals(HttpServletResponse.SC_OK, rc);
-Assert.assertEquals("OK", body.toString());
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertEquals("OK", body.toString());
-Assert.assertFalse(asyncIoEndServlet.getInvalidStateDetected());
+Assert.assertFalse(asyncIoEndServlet.getInvalidStateDetected());
+} finally {
+
LogManager.getLogManager().getLogger("org.apache.coyote").setLevel(Level.INFO);
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
