You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/07/06 00:48:26 UTC
[cxf] branch 3.5.x-fixes updated (400ce2dfbe -> f19236e64a)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 400ce2dfbe CXF-8730: Fix org.apache.cxf.osgi.itests.jaxrs.JaxRsServiceTest (#967)
new 5800c2bb13 Update maven-enforcer-plugin to 3.1.0
new d15c6a76ef Update Undertow to 2.2.18.Final
new b913b8d366 Recording .gitmergeinfo Changes
new 1cca8bfe47 Fixing Undertow SSE test failures caused by [UNDERTOW-1786] (handle IO properly for async context write)
new f19236e64a Recording .gitmergeinfo Changes
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 3 ++
parent/pom.xml | 2 +-
pom.xml | 2 +-
systests/rs-sse/rs-sse-base/pom.xml | 6 +++-
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 41 ++++++++++++----------
.../jaxrs/sse/undertow/UndertowEmbeddedTest.java | 5 +++
6 files changed, 37 insertions(+), 22 deletions(-)
[cxf] 04/05: Fixing Undertow SSE test failures caused by [UNDERTOW-1786] (handle IO properly for async context write)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1cca8bfe4785df94886acdeb964df40e397ecfa4
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 19:55:48 2022 -0400
Fixing Undertow SSE test failures caused by [UNDERTOW-1786] (handle IO properly for async context write)
(cherry picked from commit 980ebec9b4e3cb99c0386ba3c795cad21e924ac7)
# Conflicts:
# systests/rs-sse/rs-sse-base/pom.xml
---
systests/rs-sse/rs-sse-base/pom.xml | 6 +++-
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 41 ++++++++++++----------
.../jaxrs/sse/undertow/UndertowEmbeddedTest.java | 5 +++
3 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/systests/rs-sse/rs-sse-base/pom.xml b/systests/rs-sse/rs-sse-base/pom.xml
index a23fb650ca..6d3d2bcaa7 100644
--- a/systests/rs-sse/rs-sse-base/pom.xml
+++ b/systests/rs-sse/rs-sse-base/pom.xml
@@ -56,11 +56,15 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java
index e02a001575..7005d98533 100644
--- a/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java
+++ b/systests/rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse/AbstractSseTest.java
@@ -49,6 +49,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import org.junit.Before;
import org.junit.Test;
+import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.hasItems;
@@ -375,25 +376,27 @@ public abstract class AbstractSseTest extends AbstractSseBaseTest {
.put(null);
assertThat(r.getStatus(), equalTo(204));
- // Give server some time to finish up the sink
- Thread.sleep(2000);
-
- // Only two out of 4 messages should be delivered, others should be discarded
- final BookBroadcasterStats stats =
- createWebClient("/rest/api/bookstore/client-closes-connection/stats", MediaType.APPLICATION_JSON)
- .get()
- .readEntity(BookBroadcasterStats.class);
-
- // Tomcat will feedback through onError callback, others through onComplete
- assertThat(stats.isErrored(), equalTo(supportsErrorPropagation()));
- // The sink should be in closed state
- assertThat(stats.isWasClosed(), equalTo(true));
- // The onClose callback should be called
- assertThat(stats.isClosed(), equalTo(true));
-
- // It is very hard to get the predictable match here, but at most
- // 2 events could get through before the client's connection drop off
- assertTrue(stats.getCompleted() == 2 || stats.getCompleted() == 1);
+ await()
+ .atMost(10, TimeUnit.SECONDS)
+ .pollDelay(1, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ // Only two out of 4 messages should be delivered, others should be discarded
+ final BookBroadcasterStats stats =
+ createWebClient("/rest/api/bookstore/client-closes-connection/stats", MediaType.APPLICATION_JSON)
+ .get()
+ .readEntity(BookBroadcasterStats.class);
+
+ // Tomcat will feedback through onError callback, others through onComplete
+ assertThat(stats.isErrored(), equalTo(supportsErrorPropagation()));
+ // The sink should be in closed state
+ assertThat(stats.isWasClosed(), equalTo(true));
+ // The onClose callback should be called
+ assertThat(stats.isClosed(), equalTo(true));
+
+ // It is very hard to get the predictable match here, but at most
+ // 2 events could get through before the client's connection drop off
+ assertTrue(stats.getCompleted() <= 3);
+ });
}
@Test
diff --git a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
index 0c48ce1551..6f6c80fe5b 100644
--- a/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
+++ b/systests/rs-sse/rs-sse-undertow/src/test/java/org/apache/cxf/systest/jaxrs/sse/undertow/UndertowEmbeddedTest.java
@@ -48,5 +48,10 @@ public class UndertowEmbeddedTest extends AbstractSseTest {
protected int getPort() {
return EmbeddedTomcatServer.PORT;
}
+
+ @Override
+ protected boolean supportsErrorPropagation() {
+ return true;
+ }
}
[cxf] 01/05: Update maven-enforcer-plugin to 3.1.0
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5800c2bb132d37be1a5dc76bdf18241c0e67df8d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 29 17:10:47 2022 -0400
Update maven-enforcer-plugin to 3.1.0
(cherry picked from commit 99049ddfca6a3dc00d820ec343515ee8b66160b7)
(cherry picked from commit 719c96a310c0afa62d430588cf38e77523080fa2)
# Conflicts:
# pom.xml
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0935828712..8931d7e2ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -638,7 +638,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0-M3</version>
+ <version>3.1.0</version>
<configuration>
<rules>
<requireMavenVersion>
[cxf] 03/05: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b913b8d366af27a07d5c9cb80f10bf7fbf0ee5f2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 11:20:11 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 051a350d12..7974125496 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -10,6 +10,7 @@ B 6d64fdb0d9219ca829f29a2f38480033b60a4c98
B 79ee9824ee30b1b710d7385efc3cec736b4a5c54
B 7f683ba748e2133af0f93f1d77df5921b4e86011
B 7fc2c4ca26c8615d1c231292dbcd96992e45b2a5
+B 8311c0ea9783697307e616bd4c3f669e8396eab3
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
B 9723e32190d3a820e0eecf19177561155399c867
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
@@ -35,6 +36,7 @@ M 5566cc4600827e08fda454c5644b9ec81251fbba
M 5b9788a6dd477113da850f5eea48cde9064eac01
M 60e202dde133752bdf2de35bb8b0ca3dda6113fa
M 6ea9ff22de288343f78f73e44f47983888cbf0b2
+M 719c96a310c0afa62d430588cf38e77523080fa2
M 7501891ee05153ba43eab3cdadccf789dd15de1e
M 7a4d0b1b6b71e5253e6a4e21b45e4b6fd1d714ae
M 8a76536ff93dedf5b71d9d6f222323c34f3dbeb8
[cxf] 05/05: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f19236e64a9c74d1eafe6b47b266b09ac3805d78
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 20:38:48 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7974125496..2c18d052f1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -44,6 +44,7 @@ M 8c348a6138035882657a37b738e13b755fbe231f
M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158
M 97dc25412eac3342f643ea5faa38c9718d2139bf
+M 980ebec9b4e3cb99c0386ba3c795cad21e924ac7
M a75b56a7c3826a48320202aca771cbcbdca6a350
M a903a5392b3cd2b5925c6afa46f289b3b94a694a
M b207c718e84bed8120bb114f1d79f575094c3a14
[cxf] 02/05: Update Undertow to 2.2.18.Final
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d15c6a76efe761066a918a3352ca1fdc32560db5
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 09:54:59 2022 -0400
Update Undertow to 2.2.18.Final
(cherry picked from commit b6e3ab83a37cfb777d6eebf9711e552027bde37a)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 43cfb702cae5b90c93cabe769854df2b284e1879)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 692dcb0100..88b2e2b0d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,7 +217,7 @@
<cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
<cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
<cxf.undertow.xnio.osgi.version>[3.3,4.0)</cxf.undertow.xnio.osgi.version>
- <cxf.undertow.version>2.2.12.Final</cxf.undertow.version>
+ <cxf.undertow.version>2.2.18.Final</cxf.undertow.version>
<!-- the Export-Package is the same as the Maven artifact
version (with the Final), but we don't want an import package with a version
with a qualifier. We do want a range. -->