Repository: camel Updated Branches: refs/heads/master b0ae439fa -> fa9b2032f
Upgrade to async-http-client version 1.9.27 and grizzly-websockets version 2.3.21, also add the missing dependency to the camel-ahc-ws POM to fix it's currently failing tests on the CI-Server. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa9b2032 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa9b2032 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa9b2032 Branch: refs/heads/master Commit: fa9b2032fdeedf8c8fbbb7abc1107da5c7528814 Parents: b0ae439 Author: Babak Vahdat <bvah...@apache.org> Authored: Thu Jun 18 20:50:42 2015 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Thu Jun 18 20:50:42 2015 +0200 ---------------------------------------------------------------------- components/camel-ahc-ws/pom.xml | 6 ++++++ parent/pom.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fa9b2032/components/camel-ahc-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml index 6370269..3eb7f65 100644 --- a/components/camel-ahc-ws/pom.xml +++ b/components/camel-ahc-ws/pom.xml @@ -50,6 +50,12 @@ <version>${grizzly-websockets-version}</version> <optional>true</optional> </dependency> + <dependency> + <groupId>org.glassfish.grizzly</groupId> + <artifactId>connection-pool</artifactId> + <version>${grizzly-websockets-version}</version> + <optional>true</optional> + </dependency> <!-- testing --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fa9b2032/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 24d1bad..1ccc6ab 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -36,7 +36,7 @@ <abdera-version>1.1.3</abdera-version> <!-- Note that activemq dependency is only used for testing! --> <activemq-version>5.11.1</activemq-version> - <ahc-version>1.9.26</ahc-version> + <ahc-version>1.9.27</ahc-version> <ant-bundle-version>1.7.0_6</ant-bundle-version> <antlr-bundle-version>3.4_1</antlr-bundle-version> <antlr-runtime-bundle-version>3.4_2</antlr-runtime-bundle-version> @@ -191,7 +191,7 @@ <google-api-services-drive-version>v2-rev151-1.19.0</google-api-services-drive-version> <google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version> <google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version> - <grizzly-websockets-version>2.3.19</grizzly-websockets-version> + <grizzly-websockets-version>2.3.21</grizzly-websockets-version> <groovy-version>2.4.3</groovy-version> <gson-version>2.3.1</gson-version> <guice-bundle-version>3.0_1</guice-bundle-version>