Force the current websocket stuff to use Jetty8 for now.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c692780 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c692780 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c692780 Branch: refs/heads/master Commit: 4c6927800df3a8dcdf8bb4ba07ec72d73d04d208 Parents: a6fce3d Author: Daniel Kulp <dk...@apache.org> Authored: Wed Aug 13 13:02:07 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Aug 14 09:09:24 2014 -0400 ---------------------------------------------------------------------- components/camel-ahc-ws/pom.xml | 5 +++-- components/camel-atmosphere-websocket/pom.xml | 5 +++-- components/camel-web-standalone/pom.xml | 3 ++- components/camel-web/pom.xml | 2 +- components/camel-websocket/pom.xml | 5 ++++- parent/pom.xml | 4 +++- 6 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-ahc-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml index d6f80f3..d4e3b1c 100644 --- a/components/camel-ahc-ws/pom.xml +++ b/components/camel-ahc-ws/pom.xml @@ -68,16 +68,17 @@ <scope>test</scope> </dependency> - <!-- Jetty for testing--> + <!-- Jetty8 for testing--> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index 3060d3f..f37519c 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -96,16 +96,17 @@ <scope>test</scope> </dependency> - <!-- Jetty for testing--> + <!-- Jetty 8 for testing--> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty8-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-web-standalone/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-web-standalone/pom.xml b/components/camel-web-standalone/pom.xml index 4f3c82d..16fa9b3 100755 --- a/components/camel-web-standalone/pom.xml +++ b/components/camel-web-standalone/pom.xml @@ -41,7 +41,7 @@ <dependency> <!-- not org.eclipse.jetty at present --> - <groupId>org.mortbay.jetty</groupId> + <groupId>${jetty-runner-groupId}</groupId> <artifactId>jetty-runner</artifactId> <version>${jetty-version}</version> </dependency> @@ -52,6 +52,7 @@ </dependency> </dependencies> + <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-web/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-web/pom.xml b/components/camel-web/pom.xml index 5520824..66d2fbc 100644 --- a/components/camel-web/pom.xml +++ b/components/camel-web/pom.xml @@ -252,7 +252,7 @@ <!-- mvn jetty:run --> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>${jetty-runner-groupId}</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> <!-- http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/components/camel-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 7ab0507..951c5c2 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -54,19 +54,22 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>${jetty-version}</version> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlets</artifactId> + <version>${jetty8-version}</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> + <version>${jetty8-version}</version> </dependency> <!-- test dependencies --> http://git-wip-us.apache.org/repos/asf/camel/blob/4c692780/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8066699..4a9d39f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -231,6 +231,7 @@ <jetty8-version>8.1.15.v20140411</jetty8-version> <jetty9-version>9.2.2.v20140723</jetty9-version> <jetty-version>${jetty8-version}</jetty-version> + <jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId> <jettison-version>1.3.5</jettison-version> <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version> <jexcelapi-version>2.4.2</jexcelapi-version> @@ -2609,7 +2610,7 @@ </dependencies> </plugin> <plugin> - <groupId>org.mortbay.jetty</groupId> + <groupId>${jetty-runner-groupId}</groupId> <artifactId>jetty-maven-plugin</artifactId> <version>${jetty-version}</version> </plugin> @@ -2867,6 +2868,7 @@ <id>jetty9</id> <properties> <jetty-version>${jetty9-version}</jetty-version> + <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId> </properties> </profile>