Repository: cxf Updated Branches: refs/heads/master d226c07d4 -> ebce4a65b
use jetty9 in samples/jax_rs/websocket by default Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ebce4a65 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ebce4a65 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ebce4a65 Branch: refs/heads/master Commit: ebce4a65b15a1a99f18c1ea0111affafc447ce7e Parents: d226c07 Author: Akitoshi Yoshida <a...@apache.org> Authored: Wed Mar 30 17:11:34 2016 +0200 Committer: Akitoshi Yoshida <a...@apache.org> Committed: Wed Mar 30 17:11:43 2016 +0200 ---------------------------------------------------------------------- .../src/main/release/samples/jax_rs/websocket/pom.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ebce4a65/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 12701f2..b894cff 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml @@ -41,11 +41,6 @@ <profiles> <profile> <id>jetty8</id> - <activation> - <property> - <name>!jetty9</name> - </property> - </activation> <properties> <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version> </properties> @@ -60,6 +55,12 @@ </profile> <profile> <id>jetty9</id> + <!-- activate it by default --> + <activation> + <property> + <name>!jetty8</name> + </property> + </activation> <properties> <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version> </properties>