Repository: camel Updated Branches: refs/heads/master f8dd9c1c9 -> 68793857c
upgrade atmosphere to 2.2.0 with its osgi version range [2.0,3.0) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68793857 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68793857 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68793857 Branch: refs/heads/master Commit: 68793857cbc14046733cf6be3c1c2a0d503c0d00 Parents: f8dd9c1 Author: Akitoshi Yoshida <a...@apache.org> Authored: Wed Jul 23 16:33:45 2014 +0200 Committer: Akitoshi Yoshida <a...@apache.org> Committed: Wed Jul 23 16:34:45 2014 +0200 ---------------------------------------------------------------------- components/camel-atmosphere-websocket/pom.xml | 1 + parent/pom.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/68793857/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index f42b83d..3060d3f 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -37,6 +37,7 @@ <camel.osgi.import.pkg> !org.apache.camel.component.atmosphere.websocket.*, javax.servlet*;version="2.5", + org.atmosphere.*;version="${atmosphere-version-range}", org.apache.catalina;resolution:=optional, org.apache.catalina.comet;resolution:=optional, org.eclipse.jetty.continuation;version="[7.6,8.2)";resolution:=optional, http://git-wip-us.apache.org/repos/asf/camel/blob/68793857/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9e4b695..a1c21cc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -54,7 +54,8 @@ <asm-bundle-version>3.3.1_1</asm-bundle-version> <asm-version>3.3.1</asm-version> <aspectj-version>1.6.2</aspectj-version> - <atmosphere-version>2.1.7</atmosphere-version> + <atmosphere-version>2.2.0</atmosphere-version> + <atmosphere-version-range>[2.0,3.0)</atmosphere-version-range> <atomikos-transactions-version>3.9.3</atomikos-transactions-version> <avalon-bundle-version>4.3.1_1</avalon-bundle-version> <avalon-version>4.3.1</avalon-version>
