cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Updating Atmosphere version
Date Thu, 29 Sep 2016 10:09:04 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 3fbedf139 -> a998152a2


Updating Atmosphere version


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a998152a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a998152a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a998152a

Branch: refs/heads/master
Commit: a998152a243dabee50aa49f28d76037666adecd9
Parents: 3fbedf1
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Sep 29 11:08:34 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Sep 29 11:08:34 2016 +0100

----------------------------------------------------------------------
 .../src/main/release/samples/jax_rs/websocket_web/pom.xml     | 2 +-
 parent/pom.xml                                                | 2 +-
 .../apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a998152a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 1976690..d9fac05 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <cxf.version>${project.version}</cxf.version>
         <!-- TODO remove these local entries after making the referenced dependency managed
in parent/pom.xml -->
-        <cxf.atmosphere.version>2.4.3</cxf.atmosphere.version>
+        <cxf.atmosphere.version>2.4.7</cxf.atmosphere.version>
         <cxf.jetty92.version>9.2.15.v20160210</cxf.jetty92.version>
         <cxf.jetty93.version>9.3.5.v20151012</cxf.jetty93.version>
         <cxf.jetty.version>${cxf.jetty93.version}</cxf.jetty.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/a998152a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 91967a8..1d39542 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,7 +69,7 @@
         <cxf.activemq.version>5.12.1</cxf.activemq.version>
         <cxf.ahc.version>1.9.8</cxf.ahc.version>
         <cxf.apacheds.version>2.0.0-M23</cxf.apacheds.version>
-        <cxf.atmosphere.version>2.4.3</cxf.atmosphere.version>
+        <cxf.atmosphere.version>2.4.7</cxf.atmosphere.version>
         <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
         <cxf.axiom.version>1.2.14</cxf.axiom.version>
         <cxf.bcprov.version>1.55</cxf.bcprov.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/a998152a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index c19472f..8d87119 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -152,8 +152,11 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
         Client client = ClientBuilder.newClient();
         client.register((Object)ClientFilterClientAndConfigCheck.class);
         client.property("clientproperty", "somevalue");
-        Invocation.Builder builder = client.target(address)
-            .request("application/xml").header("a", "b");
+        WebTarget webTarget = client.target(address);
+        //WebClient.getConfig(webTarget);
+        Invocation.Builder builder = webTarget.request("application/xml").header("a", "b");
+        WebClient.getConfig(builder);
+        
         Response r = builder.get();
         Book book = r.readEntity(Book.class);
         assertEquals(124L, book.getId());


Mime
View raw message