Merge branch 'release/v1.7.1'

OpenEMS · Dec 7, 2017 · fa71912 · fa71912
2 parents 92656db + c3cbe3c
commit fa71912
Show file tree

Hide file tree

Showing 12 changed files with 560 additions and 456 deletions.
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -5,7 +5,7 @@
 	<url>http://openems.io</url>
 	<groupId>io.openems</groupId>
 	<artifactId>edge</artifactId>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<packaging>jar</packaging>
 	<scm>
 		<url>https://github.com/OpenEMS/openems</url>
@@ -25,7 +25,7 @@
 		<restlet.version>2.3.10</restlet.version>
 		<odoo-java-api.version>3.0.1</odoo-java-api.version>
 		<slf4j.version>1.7.25</slf4j.version>
-		<websocket.version>1.3.4</websocket.version>
+		<websocket.version>1.3.6</websocket.version>
 	</properties>
 	<repositories>
 		<repository>

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
 	<url>http://openems.io</url>
 	<groupId>io.openems</groupId>
 	<artifactId>common</artifactId>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<packaging>jar</packaging>
 	<scm>
 		<url>https://github.com/OpenEMS/openems</url>
@@ -23,7 +23,7 @@
 		<restlet.version>2.3.10</restlet.version>
 		<odoo-java-api-version>1.1.0.RELEASE</odoo-java-api-version>
 		<slf4j.version>1.7.25</slf4j.version>
-		<websocket.version>1.3.4</websocket.version>
+		<websocket.version>1.3.6</websocket.version>
 	</properties>
 	<repositories>
 		<repository>

diff --git a/common/src/io/openems/common/websocket/AbstractWebsocketServer.java b/common/src/io/openems/common/websocket/AbstractWebsocketServer.java
@@ -39,7 +39,7 @@ protected abstract void _onMessage(WebSocket websocket, JsonObject jMessage, Opt
 
 	@SuppressWarnings("deprecation")
 	public AbstractWebsocketServer(int port, M sessionManager) {
-		super(new InetSocketAddress(port), Lists.newArrayList(new Draft_6455(), new Draft_76()));
+		super(new InetSocketAddress(port), Lists.newArrayList(new Draft_6455()));
 		this.sessionManager = sessionManager;
 	}
 

diff --git a/edge/pom.xml b/edge/pom.xml
@@ -5,7 +5,7 @@
 	<url>http://openems.io</url>
 	<groupId>io.openems</groupId>
 	<artifactId>edge</artifactId>
-	<version>1.7.0</version>
+	<version>1.7.1</version>
 	<packaging>jar</packaging>
 	<scm>
 		<url>https://github.com/OpenEMS/openems</url>
@@ -26,7 +26,7 @@
 		<restlet.version>2.3.10</restlet.version>
 		<sdnotify.version>1.1</sdnotify.version>
 		<slf4j.version>1.7.25</slf4j.version>
-		<websocket.version>1.3.4</websocket.version>
+		<websocket.version>1.3.6</websocket.version>
 	</properties>
 	<repositories>
 		<repository>