diff --git a/openvidu-client/pom.xml b/openvidu-client/pom.xml index 303791e7..a7bcbd88 100644 --- a/openvidu-client/pom.xml +++ b/openvidu-client/pom.xml @@ -1,11 +1,12 @@ - 4.0.0 io.openvidu openvidu-parent - 1.9.0-beta-1 + 2.0.0 openvidu-client @@ -67,7 +68,7 @@ org.mockito mockito-core - ${version.mockito} + ${version.mockito.core} test diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml index e59fecab..2f67919c 100644 --- a/openvidu-java-client/pom.xml +++ b/openvidu-java-client/pom.xml @@ -6,7 +6,7 @@ io.openvidu openvidu-parent - 1.9.0-beta-1 + 2.0.0 openvidu-java-client @@ -105,7 +105,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + ${version.javadoc.plugin} public @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + ${version.source.plugin} attach-sources @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + ${version.javadoc.plugin} public @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${version.gpg.plugin} sign-artifacts @@ -170,7 +170,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + ${version.nexus.staging.plugin} true ossrh diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml index ba901064..967d190e 100644 --- a/openvidu-server/pom.xml +++ b/openvidu-server/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -94,7 +96,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + ${version.exec.plugin} ${start-class} @@ -149,7 +151,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + {version.exec.plugin} ${start-class} @@ -189,7 +191,7 @@ io.openvidu openvidu-client - 1.1.0 + ${version.openvidu.client} org.slf4j @@ -244,7 +246,7 @@ org.thymeleaf thymeleaf-spring4 - 3.0.9.RELEASE + ${version.thymeleaf} org.slf4j @@ -255,7 +257,7 @@ nz.net.ultraq.thymeleaf thymeleaf-layout-dialect - 2.2.2 + ${version.thymeleaflayout} org.springframework.boot @@ -265,22 +267,22 @@ com.github.docker-java docker-java - 3.1.1 - - - io.openvidu - openvidu-java-client - 2.10.0 + ${version.dockerjava} org.codehaus.janino janino - 3.0.7 + ${version.janino} org.apache.commons commons-lang3 - 3.7 + ${version.commonslang} + + + io.openvidu + openvidu-java-client + ${version.openvidu.java.client} @@ -288,7 +290,7 @@ io.openvidu openvidu-test - 1.1.0 + ${version.openvidu.test} test @@ -321,13 +323,13 @@ org.mockito mockito-all - ${version.mockito} + ${version.mockito.all} test org.mockito mockito-core - ${version.mockito} + ${version.mockito.core} test @@ -345,7 +347,7 @@ org.powermock powermock-module-junit4 - ${version.powermock} + ${version.powermock.junit4} test diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java index 36da6c4b..c0f73d7b 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java @@ -33,12 +33,10 @@ import io.openvidu.client.OpenViduException; import io.openvidu.client.OpenViduException.Code; import io.openvidu.client.internal.ProtocolElements; import io.openvidu.java.client.OpenViduRole; -import io.openvidu.java.client.Recording.OutputMode; import io.openvidu.server.core.EndReason; import io.openvidu.server.core.Participant; import io.openvidu.server.core.Session; import io.openvidu.server.kurento.kms.Kms; -import io.openvidu.server.recording.Recording; /** * @author Pablo Fuente (pablofuenteperez@gmail.com) @@ -285,8 +283,7 @@ public class KurentoSession extends Session { // Stop recording if session is being recorded if (recordingManager.sessionIsBeingRecorded(this.sessionId)) { - Recording stoppedRecording = this.recordingManager.forceStopRecording(this, - EndReason.mediaServerDisconnect); + this.recordingManager.forceStopRecording(this, EndReason.mediaServerDisconnect); } // Close all MediaEndpoints of participants diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java index 887ce676..b223a74c 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java @@ -220,6 +220,7 @@ public class RecordingManager { case COMPOSED: recording = this.composedRecordingService.stopRecording(session, recording, reason); if (recording.hasVideo()) { + // Evict the recorder participant if composed recording with video this.sessionManager.evictParticipant( session.getParticipantByPublicId(ProtocolElements.RECORDER_PARTICIPANT_PUBLICID), null, null, null); diff --git a/openvidu-test-browsers/pom.xml b/openvidu-test-browsers/pom.xml index 29e7d407..3aec39e0 100644 --- a/openvidu-test-browsers/pom.xml +++ b/openvidu-test-browsers/pom.xml @@ -6,7 +6,7 @@ io.openvidu openvidu-parent - 1.9.0-beta-1 + 2.0.0 openvidu-test-browsers @@ -51,15 +51,9 @@ 1.8 ${java.version} ${java.version} - UTF-8 UTF-8 - - - 5.4.0 - 1.4.0 - 3.141.59 @@ -71,17 +65,17 @@ org.seleniumhq.selenium selenium-java - ${org-seleniumhq-selenium.version} + ${version.selenium} org.seleniumhq.selenium selenium-chrome-driver - ${org-seleniumhq-selenium.version} + ${version.selenium} org.seleniumhq.selenium selenium-firefox-driver - ${org-seleniumhq-selenium.version} + ${version.selenium} @@ -106,7 +100,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + ${version.source.plugin} attach-sources @@ -119,7 +113,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${version.gpg.plugin} sign-artifacts @@ -133,7 +127,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + ${version.nexus.staging.plugin} true ossrh diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml index a62f777e..fc012949 100644 --- a/openvidu-test-e2e/pom.xml +++ b/openvidu-test-e2e/pom.xml @@ -6,7 +6,7 @@ io.openvidu openvidu-parent - 1.9.0-beta-1 + 2.0.0 openvidu-test-e2e @@ -51,15 +51,9 @@ 1.8 ${java.version} ${java.version} - UTF-8 UTF-8 - - - 5.4.0 - 1.4.0 - 3.141.59 @@ -68,7 +62,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 + ${version.surefire.plugin} @@ -78,19 +72,19 @@ org.junit.jupiter junit-jupiter-api - ${junit.jupiter.version} + ${version.junit.jupiter} test io.github.bonigarcia selenium-jupiter - 3.1.0 + ${version.selenium.jupiter} test io.github.bonigarcia webdrivermanager - 3.3.0 + ${version.webdrivermanager} test @@ -98,43 +92,43 @@ org.seleniumhq.selenium selenium-java - ${org-seleniumhq-selenium.version} + ${version.selenium} test org.seleniumhq.selenium selenium-chrome-driver - ${org-seleniumhq-selenium.version} + ${version.selenium} test org.seleniumhq.selenium selenium-firefox-driver - ${org-seleniumhq-selenium.version} + ${version.selenium} test org.seleniumhq.selenium selenium-api - ${org-seleniumhq-selenium.version} + ${version.selenium} test org.seleniumhq.selenium selenium-remote-driver - ${org-seleniumhq-selenium.version} + ${version.selenium} test org.junit.platform junit-platform-runner - ${junit.platform.version} + ${version.junit.platform} test org.junit.jupiter junit-jupiter-engine - ${junit.jupiter.version} + ${version.junit.jupiter} test @@ -161,24 +155,24 @@ 0.2.3 test - - io.openvidu - openvidu-test-browsers - 1.0.0 - test - - - io.openvidu - openvidu-java-client - 2.10.0 - test - com.mashape.unirest unirest-java 1.4.9 test + + io.openvidu + openvidu-test-browsers + ${version.openvidu.test.browsers} + test + + + io.openvidu + openvidu-java-client + ${version.openvidu.java.client} + test + diff --git a/openvidu-test/pom.xml b/openvidu-test/pom.xml index ceb4cf71..f2e36153 100644 --- a/openvidu-test/pom.xml +++ b/openvidu-test/pom.xml @@ -1,11 +1,12 @@ - 4.0.0 io.openvidu openvidu-parent - 1.9.0-beta-1 + 2.0.0 openvidu-test @@ -33,12 +34,12 @@ https://github.com/OpenVidu/openvidu - - ${openvidu.scm.url} - scm:git:${openvidu.scm.connection} - scm:git:${openvidu.scm.connection} - develop - + + ${openvidu.scm.url} + scm:git:${openvidu.scm.connection} + scm:git:${openvidu.scm.connection} + develop + @@ -59,7 +60,7 @@ io.openvidu openvidu-client - 1.1.0 + ${version.openvidu.client} org.kurento @@ -69,7 +70,7 @@ org.kurento kurento-test - 6.7.1 + ${version.kurento} org.springframework.boot diff --git a/pom.xml b/pom.xml index 9ddf42df..e3c4a4a0 100644 --- a/pom.xml +++ b/pom.xml @@ -42,16 +42,42 @@ - 6.10.0 + 6.10.1-SNAPSHOT 2.1.5.RELEASE 4.12 - 1.10.19 + 5.5.0-M1 + 1.5.0-M1 + 3.141.59 + 1.10.19 + 2.28.2 1.7.4 + 2.0.2 2.1 2.1 1.1.1 4.5.8 + 3.0.12 + 3.9 + 3.1.2 + 3.0.11.RELEASE + 2.4.1 + + 3.6.1 + 3.2.1 + + 2.10.0 + 1.1.0 + 1.1.0 + 1.0.0 + 3.0.0-M2 + 1.2 + 3.1.0 + 3.0.0-M3 + 1.6 + 1.6.8 + 1.6.0 + 3.1.0 1.8 1.8 @@ -181,7 +207,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.1 + ${version.extra.enforcer.rules.plugin} @@ -233,7 +259,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + ${version.source.plugin} attach-sources @@ -246,7 +272,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + ${version.gpg.plugin} sign-artifacts @@ -260,7 +286,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + ${version.nexus.staging.plugin} true ossrh