You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2014/08/13 12:02:48 UTC
git commit: update pom for sample websocket's pom
Repository: cxf
Updated Branches:
refs/heads/master 7e95279dd -> f7a091afe
update pom for sample websocket's pom
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f7a091af
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f7a091af
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f7a091af
Branch: refs/heads/master
Commit: f7a091afedbc7ca809a7205d7c053a1f5386865e
Parents: 7e95279
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Wed Aug 13 12:02:47 2014 +0200
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Wed Aug 13 12:02:47 2014 +0200
----------------------------------------------------------------------
.../main/release/samples/jax_rs/websocket/pom.xml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7a091af/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index 186d21a..f8a1c3b 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -30,9 +30,10 @@
</parent>
<properties>
<cxf.version>${project.version}</cxf.version>
- <cxf.ahc.version>1.8.1</cxf.ahc.version>
- <cxf.jetty.version>8.1.14.v20131031</cxf.jetty.version>
- <cxf.netty3.version>3.8.0.Final</cxf.netty3.version>
+ <!-- TODO remove these local entries after making the referenced dependency managed in parent/pom.xml -->
+ <cxf.ahc.version>1.8.5</cxf.ahc.version>
+ <cxf.jetty8.version>8.1.15.v20140411</cxf.jetty8.version>
+ <cxf.netty3.version>3.9.1.Final</cxf.netty3.version>
</properties>
<profiles>
<profile>
@@ -103,11 +104,11 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-websocket</artifactId>
- <version>${cxf.jetty.version}</version>
- </dependency>
+ <artifactId>jetty-websocket</artifactId>
+ <version>${cxf.jetty8.version}</version>
+ </dependency>
<dependency>
<groupId>com.ning</groupId>
<artifactId>async-http-client</artifactId>