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:59:11 UTC
[cxf] branch 3.4.x-fixes updated (1e0455be5d -> 0b245004a4)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 1e0455be5d Recording .gitmergeinfo Changes
new f6bee90bd7 Update maven-enforcer-plugin to 3.1.0
new e1605ad158 Update Undertow to 2.2.18.Final
new 15fb77e706 Fixing Undertow SSE test failures caused by [UNDERTOW-1786] (handle IO properly for async context write)
new 0b245004a4 Recording .gitmergeinfo Changes
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
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, 36 insertions(+), 22 deletions(-)
[cxf] 03/04: 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 15fb77e7068b5a0a336dd1b2c8555980d525960d
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
(cherry picked from commit 1cca8bfe4785df94886acdeb964df40e397ecfa4)
---
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 a253180abe..146f46f939 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] 04/04: 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0b245004a47d11afc09f4757de0839c27dd8a6ac
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 20:49:17 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4367bb099c..00e35d0451 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -115,6 +115,7 @@ B b729ec906ab4391e33152d0a9223506555a3c384
B b756a926aad920c977c16fe6df469630b189d1b6
B b88bbda9b0ebd41af1f00909e553c92055d9cfa5
B b902794f187035a6efe39e3632ccc7be0adc8a89
+B b913b8d366af27a07d5c9cb80f10bf7fbf0ee5f2
B bbfd114ccc7bdbe9c09f1048a8fac13ece19d61e
B bcde2712f577c400c03d6acf8c33877510505e0e
B bfd64d8112f211ed3c2409d8b1b04355ce75c8bc
@@ -140,6 +141,7 @@ B ec8dc6db5d7f574a077ccd3afcd847c744b9b7a8
B ee2e5ee16fe802cc1f4010b59b73c5ef53777429
B eeacfd4bdaeee2bf89fb5ef0743608838dd96efd
B f12836ba2635e74cc20b17ca21327db126563cdc
+B f19236e64a9c74d1eafe6b47b266b09ac3805d78
B f1ef4ca9c4a7d99b6d846b6401410ca3eb637cc2
B f25e730dd9000f2119ee972295cc7adaf6fdbb07
B f315acdde42f967102c7503d46d1edbb3affc210
[cxf] 01/04: 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f6bee90bd7937676e32337cc4cd61b50a09a354a
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
(cherry picked from commit 5800c2bb132d37be1a5dc76bdf18241c0e67df8d)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ddf3776029..57be9b6e24 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] 02/04: 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e1605ad158426901c24464ac7367a066c65a2afd
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)
(cherry picked from commit d15c6a76efe761066a918a3352ca1fdc32560db5)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 6224c8badb..2d0ee1b79e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -220,7 +220,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. -->