Merge pull request #178 from m-oben/feature/upgrade-websocket

TVolden · web-flow · commit 4115ce290daa · 2022-02-26T19:58:08.000+01:00
Upgrade Java-Websocket dependency to 1.5.2
diff --git a/OCPP-J/build.gradle b/OCPP-J/build.gradle
@@ -5,7 +5,7 @@
 dependencies {
     compile project(':common')
     compile 'com.google.code.gson:gson:2.8.0'
-    compile 'org.java-websocket:Java-WebSocket:1.5.1'
+    compile 'org.java-websocket:Java-WebSocket:1.5.2'
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'org.hamcrest:hamcrest-core:1.3'
diff --git a/OCPP-J/pom.xml b/OCPP-J/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketListener.java b/OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketListener.java
@@ -262,7 +262,7 @@ public void close() {
       // Do second try
       try {
         server.stop();
-      } catch (IOException | InterruptedException ex) {
+      } catch (InterruptedException ex) {
         logger.error("Failed to close listener", ex);
       }
     } finally {
diff --git a/ocpp-v1_6-example/json-client-implementation/pom.xml b/ocpp-v1_6-example/json-client-implementation/pom.xml
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.java-websocket</groupId>
 			<artifactId>Java-WebSocket</artifactId>
-			<version>1.5.1</version>
+			<version>1.5.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
diff --git a/ocpp-v1_6-example/json_server_example/pom.xml b/ocpp-v1_6-example/json_server_example/pom.xml
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.java-websocket</groupId>
 			<artifactId>Java-WebSocket</artifactId>
-			<version>1.5.1</version>
+			<version>1.5.2</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
diff --git a/ocpp-v1_6/build.gradle b/ocpp-v1_6/build.gradle
@@ -5,7 +5,7 @@
 dependencies {
     compile project(':common')
     compile project(':OCPP-J')
-    compile 'org.java-websocket:Java-WebSocket:1.5.1'
+    compile 'org.java-websocket:Java-WebSocket:1.5.2'
     compile group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0'
     
     testCompile 'junit:junit:4.12'
diff --git a/ocpp-v1_6/pom.xml b/ocpp-v1_6/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/ocpp-v2_0/build.gradle b/ocpp-v2_0/build.gradle
@@ -5,7 +5,7 @@
 dependencies {
     compile project(':common')
     compile project(':OCPP-J')
-    compile 'org.java-websocket:Java-WebSocket:1.5.1'
+    compile 'org.java-websocket:Java-WebSocket:1.5.2'
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'org.hamcrest:hamcrest-core:1.3'
diff --git a/ocpp-v2_0/pom.xml b/ocpp-v2_0/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.java-websocket</groupId>
             <artifactId>Java-WebSocket</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ public void close() {`
`262`	`262`	`// Do second try`
`263`	`263`	`try {`
`264`	`264`	`server.stop();`
`265`		`- } catch (IOException \| InterruptedException ex) {`
	`265`	`+ } catch (InterruptedException ex) {`
`266`	`266`	`logger.error("Failed to close listener", ex);`
`267`	`267`	`}`
`268`	`268`	`} finally {`