You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2014/07/23 14:33:31 UTC
git commit: upgrade atmosphere to 2.2.0 with the osgi range [2.0, 3.0)
Repository: cxf
Updated Branches:
refs/heads/master 6127950d2 -> e6efdf543
upgrade atmosphere to 2.2.0 with the osgi range [2.0,3.0)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e6efdf54
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e6efdf54
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e6efdf54
Branch: refs/heads/master
Commit: e6efdf5432f714ead11411495cdf73164a26d561
Parents: 6127950
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Wed Jul 23 14:30:47 2014 +0200
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Wed Jul 23 14:32:22 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 3 ++-
rt/transports/websocket/pom.xml | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e6efdf54/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9dc65d2..b32f4a1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -75,7 +75,8 @@
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.activemq.version>5.9.1</cxf.activemq.version>
<cxf.ahc.version>1.8.5</cxf.ahc.version>
- <cxf.atmosphere.version>2.1.7</cxf.atmosphere.version>
+ <cxf.atmosphere.version>2.2.0</cxf.atmosphere.version>
+ <cxf.atmosphere.version.range>[2.0,3.0)</cxf.atmosphere.version.range>
<cxf.axiom.version>1.2.14</cxf.axiom.version>
<cxf.bcprov.version>1.50</cxf.bcprov.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/e6efdf54/rt/transports/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/pom.xml b/rt/transports/websocket/pom.xml
index 02885b4..34aebad 100644
--- a/rt/transports/websocket/pom.xml
+++ b/rt/transports/websocket/pom.xml
@@ -40,6 +40,7 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
org.eclipse.jetty*;version="${cxf.jetty.osgi.version}",
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
+ org.atmosphere*;version="${cxf.atmosphere.version.range}";resolution:=optional,
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}"
</cxf.osgi.import>
<cxf.osgi.dynamic.import>