From 2a90cdbe6214a5a15f10375f575c2ec437b03c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Mon, 11 Feb 2019 11:54:45 +0100
Subject: [PATCH] fix imports/dependencies
---
pom.xml | 26 ++++++++++++++-----
.../thm/arsnova/config/WebSocketConfig.java | 2 +-
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index a274f68a6..ccd6a0d59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,13 +170,14 @@
<artifactId>spring-integration-mail</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-messaging</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-websocket</artifactId>
+ <scope>compile</scope>
</dependency>
<!-- Security -->
<dependency>
@@ -244,8 +245,8 @@
<artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -253,6 +254,17 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.11.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/main/java/de/thm/arsnova/config/WebSocketConfig.java b/src/main/java/de/thm/arsnova/config/WebSocketConfig.java
index 7b10e27fe..c81588390 100644
--- a/src/main/java/de/thm/arsnova/config/WebSocketConfig.java
+++ b/src/main/java/de/thm/arsnova/config/WebSocketConfig.java
@@ -20,7 +20,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
- registry.addEndpoint("/ws");
+ registry.addEndpoint("/ws").setAllowedOrigins("*").withSockJS();
}
}
--
GitLab