diff --git a/akka-fun-test-java/pom.xml b/akka-fun-test-java/pom.xml index 3a0fc927eb..f6e6a727b7 100644 --- a/akka-fun-test-java/pom.xml +++ b/akka-fun-test-java/pom.xml @@ -34,25 +34,25 @@ com.sun.jersey jersey-server - 1.1.3-ea + ${jersey.version} test com.sun.jersey jersey-json - 1.1.3-ea + ${jersey.version} test com.sun.jersey jersey-client - 1.1.3-ea + ${jersey.version} test com.sun.jersey jersey-atom - 1.1.3-ea + ${jersey.version} test diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml index 583a32c897..3d0f0f9313 100755 --- a/akka-kernel/pom.xml +++ b/akka-kernel/pom.xml @@ -170,17 +170,17 @@ com.sun.jersey jersey-core - 1.1.3-ea + ${jersey.version} com.sun.jersey jersey-server - 1.1.3-ea + ${jersey.version} com.sun.jersey jersey-json - 1.1.3-ea + ${jersey.version} javax.ws.rs @@ -190,22 +190,22 @@ com.sun.jersey.contribs jersey-scala - 1.1.3-ea - - - org.atmosphere - atmosphere-runtime - 0.5-SNAPSHOT - - - org.atmosphere - atmosphere-jersey - 0.5-SNAPSHOT + ${jersey.version} org.atmosphere atmosphere-annotations - 0.5-SNAPSHOT + ${atmosphere.version} + + + org.atmosphere + atmosphere-jersey + ${atmosphere.version} + + + org.atmosphere + atmosphere-runtime + ${atmosphere.version} diff --git a/akka-rest/pom.xml b/akka-rest/pom.xml index ab010b9fa9..9dc47f6db8 100644 --- a/akka-rest/pom.xml +++ b/akka-rest/pom.xml @@ -37,17 +37,17 @@ com.sun.jersey jersey-core - 1.1.3-ea + ${jersey.version} com.sun.jersey jersey-server - 1.1.3-ea + ${jersey.version} com.sun.jersey jersey-json - 1.1.3-ea + ${jersey.version} javax.ws.rs @@ -57,7 +57,7 @@ com.sun.jersey.contribs jersey-scala - 1.1.3-ea + ${jersey.version} diff --git a/akka-samples-scala/src/main/scala/SimpleService.scala b/akka-samples-scala/src/main/scala/SimpleService.scala index e16d6691b9..7e4fffb00b 100644 --- a/akka-samples-scala/src/main/scala/SimpleService.scala +++ b/akka-samples-scala/src/main/scala/SimpleService.scala @@ -15,8 +15,7 @@ import javax.ws.rs.{GET, POST, Path, Produces, WebApplicationException, Consumes import org.atmosphere.annotation.{Broadcast, Suspend} import org.atmosphere.util.XSSHtmlFilter -import org.atmosphere.cpr.BroadcastFilter -import org.atmosphere.cpr.Broadcaster +import org.atmosphere.cpr.{BroadcastFilter,Broadcaster} import org.atmosphere.jersey.Broadcastable class Boot { @@ -32,10 +31,10 @@ class Boot { Supervise( new PersistentSimpleService, LifeCycle(Permanent)) :: - Supervise( + Supervise( new PubSub, - LifeCycle(Permanent)) :: - Nil) ) + LifeCycle(Permanent)) + :: Nil)) factory.newInstance.start } diff --git a/pom.xml b/pom.xml index 7ffd4cd08a..2e1cc89d73 100755 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,8 @@ ${maven.compiler.source} ${project.build.sourceEncoding} ${project.build.sourceEncoding} + 0.5-SNAPSHOT + 1.1.5-ea-SNAPSHOT