From 2397b21096ad1c184d9f22629f74a6c44a9ba923 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 16 Aug 2013 21:57:04 -0400 Subject: [PATCH] Upgrade spring-websocket to Tyrus 1.2.1 This targets currently nightly snapshots and future release of Glassfish 4.0.1. --- build.gradle | 4 ++-- .../server/support/GlassFishRequestUpgradeStrategy.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8029e662c4..af8914b223 100644 --- 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/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java index cef4dc7ae4..ccb055f1e5 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java @@ -32,7 +32,7 @@ import org.glassfish.tyrus.core.ComponentProviderService; 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;