Upgrade spring-websocket to Tyrus 1.2.1

This targets currently nightly snapshots and future release of Glassfish 4.0.1.
saddamalmahali · Aug 21, 2013 · 2397b21 · 2397b21
1 parent e540628
commit 2397b21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -510,8 +510,8 @@ project("spring-websocket") {
 			exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
 			exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
 		}
-		optional("org.glassfish.tyrus:tyrus-websocket-core:1.0")
-		optional("org.glassfish.tyrus:tyrus-container-servlet:1.0")
+		optional("org.glassfish.tyrus:tyrus-websocket-core:1.2.1")
+		optional("org.glassfish.tyrus:tyrus-container-servlet:1.2.1")
 		optional("org.eclipse.jetty:jetty-webapp:9.0.4.v20130625") {
 			exclude group: "org.eclipse.jetty.orbit", module: "javax.servlet"
 		}

diff --git a/...n/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java b/...n/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java
@@ -32,7 +32,7 @@
 import org.glassfish.tyrus.core.EndpointWrapper;
 import org.glassfish.tyrus.core.ErrorCollector;
 import org.glassfish.tyrus.core.RequestContext;
-import org.glassfish.tyrus.server.TyrusEndpoint;
+import org.glassfish.tyrus.core.TyrusEndpoint;
 import org.glassfish.tyrus.servlet.TyrusHttpUpgradeHandler;
 import org.glassfish.tyrus.websockets.Connection;
 import org.glassfish.tyrus.websockets.Version;