Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 2f14a20a7 -> db43643b3
add http-jetty dependency to samples/jaxs_rs/websocket explicitly; fix the previous merge issue Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/db43643b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/db43643b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/db43643b Branch: refs/heads/3.0.x-fixes Commit: db43643b3f4441044309b56dfd7a69e73325b59a Parents: 2f14a20 Author: Akitoshi Yoshida <[email protected]> Authored: Fri Aug 29 12:00:16 2014 +0200 Committer: Akitoshi Yoshida <[email protected]> Committed: Fri Aug 29 16:30:32 2014 +0200 ---------------------------------------------------------------------- distribution/src/main/release/samples/jax_rs/websocket/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/db43643b/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 5c9f117..6d5ae22 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml @@ -107,6 +107,11 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>3.0.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> <version>3.0.2-SNAPSHOT</version> </dependency>
