You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2020/03/11 08:42:34 UTC
[aries-jax-rs-whiteboard] branch master updated: Revert
"[ARIES-1968] Use latest CXF"
This is an automated email from the ASF dual-hosted git repository.
csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new dee3b4d Revert "[ARIES-1968] Use latest CXF"
dee3b4d is described below
commit dee3b4dc50a671890e3806f393c58572a4e6fc0e
Author: Carlos Sierra Andrés <ca...@liferay.com>
AuthorDate: Wed Mar 11 09:42:03 2020 +0100
Revert "[ARIES-1968] Use latest CXF"
This reverts commit e4d2deecb0b8cf7182994dc84c5e4c643971cf14.
---
jax-rs.itests/src/main/java/test/JaxrsTest.java | 6 ++----
pom.xml | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index 1369698..b263e97 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -2496,8 +2496,8 @@ public class JaxrsTest extends TestHelper {
source1.open();
source2.open();
- //The filter IS invoked on the subscribe method
- assertEquals(2, atomicInteger.get());
+ //The filter IS NOT invoked on the subscribe method
+ assertEquals(0, atomicInteger.get());
WebTarget broadcast = createDefaultTarget().path("/sse").path(
"/broadcast");
@@ -2510,8 +2510,6 @@ public class JaxrsTest extends TestHelper {
assertEquals(Arrays.asList("welcome", "message"), source1Events);
assertEquals(Arrays.asList("welcome", "message"), source2Events);
- atomicInteger.set(0);
-
broadcast.request().post(
Entity.entity("another message", MediaType.TEXT_PLAIN_TYPE));
diff --git a/pom.xml b/pom.xml
index 11ad3b1..9e7945c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.2.13-SNAPSHOT</cxf.version>
+ <cxf.version>3.2.12</cxf.version>
<bnd.version>4.2.0</bnd.version>
<dsl.version>1.2.2</dsl.version>
</properties>