diff options
| -rw-r--r-- | backend/build.gradle | 6 | ||||
| -rw-r--r-- | backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java | 6 | ||||
| -rw-r--r-- | backend/src/test/java/org/luxons/sevenwonders/SevenWondersTest.java | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/backend/build.gradle b/backend/build.gradle index dd3f4ffd..705104aa 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -1,10 +1,12 @@ plugins { - id 'org.springframework.boot' version '1.5.3.RELEASE' + id 'org.springframework.boot' version '2.0.1.RELEASE' } apply plugin: 'java' apply plugin: 'idea' apply plugin: 'checkstyle' +apply plugin: 'org.springframework.boot' +apply plugin: 'io.spring.dependency-management' group 'org.luxons' version '1.0-SNAPSHOT' @@ -22,7 +24,7 @@ configurations { dependencies { compile project(':game-engine') compile 'org.springframework.boot:spring-boot-starter-websocket' - compile 'org.springframework.security:spring-security-core:4.2.0.RELEASE' + compile 'org.springframework.security:spring-security-core:5.0.4.RELEASE' compile 'ch.qos.logback:logback-classic:1.1.8' compile 'org.hildan.livedoc:livedoc-springboot:4.3.2' compile 'org.hildan.livedoc:livedoc-ui-webjar:4.3.2' diff --git a/backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java b/backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java index 7ac53250..b8018a86 100644 --- a/backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java +++ b/backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java @@ -5,14 +5,14 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer; import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker; import org.springframework.web.socket.config.annotation.StompEndpointRegistry; +import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; import org.springframework.web.socket.server.support.DefaultHandshakeHandler; @Configuration @EnableWebSocketMessageBroker -public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer { +public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { private final TopicSubscriptionInterceptor topicSubscriptionInterceptor; @@ -46,6 +46,6 @@ public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer { @Override public void configureClientInboundChannel(ChannelRegistration registration) { - registration.setInterceptors(topicSubscriptionInterceptor); + registration.interceptors(topicSubscriptionInterceptor); } } diff --git a/backend/src/test/java/org/luxons/sevenwonders/SevenWondersTest.java b/backend/src/test/java/org/luxons/sevenwonders/SevenWondersTest.java index 5a618243..8cd959e3 100644 --- a/backend/src/test/java/org/luxons/sevenwonders/SevenWondersTest.java +++ b/backend/src/test/java/org/luxons/sevenwonders/SevenWondersTest.java @@ -15,7 +15,7 @@ import org.luxons.sevenwonders.test.api.ApiPlayer; import org.luxons.sevenwonders.test.api.ApiPlayerTurnInfo; import org.luxons.sevenwonders.test.api.SevenWondersClient; import org.luxons.sevenwonders.test.api.SevenWondersSession; -import org.springframework.boot.context.embedded.LocalServerPort; +import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.junit4.SpringRunner; |