diff --git a/openvidu-client/pom.xml b/openvidu-client/pom.xml index cf559f92..35538e63 100644 --- a/openvidu-client/pom.xml +++ b/openvidu-client/pom.xml @@ -65,12 +65,6 @@ ${version.junit} test - - org.hamcrest - hamcrest - ${version.hamcrest} - test - org.mockito mockito-core diff --git a/openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java b/openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java index 0cea17e4..2bee1201 100644 --- a/openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java +++ b/openvidu-client/src/test/java/io/openvidu/client/test/OpenViduClientTest.java @@ -18,8 +18,6 @@ package io.openvidu.client.test; import static io.openvidu.client.internal.ProtocolElements.JOINROOM_METHOD; import static io.openvidu.client.internal.ProtocolElements.JOINROOM_ROOM_PARAM; import static io.openvidu.client.internal.ProtocolElements.JOINROOM_USER_PARAM; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -28,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.kurento.jsonrpc.client.JsonRpcClient; @@ -70,7 +69,6 @@ public class OpenViduClientTest { Map> joinResult = new HashMap>(); when(jsonRpcClient.sendRequest(JOINROOM_METHOD, params)).thenReturn(result); - assertThat(client.joinRoom("room", "user"), is(joinResult)); - + Assertions.assertEquals(client.joinRoom("room", "user"), joinResult); } } diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml index eb45dade..b5b12c75 100644 --- a/openvidu-server/pom.xml +++ b/openvidu-server/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -279,16 +281,6 @@ janino ${version.janino} - - org.apache.commons - commons-lang3 - ${version.commonslang} - - - com.google.code.gson - gson - ${version.gson} - io.openvidu openvidu-java-client @@ -314,12 +306,6 @@ - - org.hamcrest - hamcrest - ${version.hamcrest} - test - io.openvidu openvidu-test-browsers diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java index f71eeb04..2ccd98e6 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java @@ -1125,8 +1125,8 @@ public class KurentoSessionManager extends SessionManager { } } - @Override /* Protected by Session.closingLock.readLock */ + @Override public Participant publishIpcam(Session session, MediaOptions mediaOptions, ConnectionProperties connectionProperties) throws Exception { final String sessionId = session.getSessionId(); diff --git a/pom.xml b/pom.xml index 0674148a..3fb7edf9 100644 --- a/pom.xml +++ b/pom.xml @@ -43,22 +43,17 @@ 6.18.1-SNAPSHOT - 2.7.5 + 2.7.6 5.9.1 - 1.9.1 3.141.59 4.9.0 2.0.9 - 2.2 - 4.5.13 3.1.9 - 3.12.0 3.2.13 1.7.36 2.10 1.4.9 0.2.5 - 1.10.0 1.16.2 7.6.0