POM dependencies update

2019-06-11 16:13:48 +02:00 · 2019-06-11 16:13:48 +02:00 · f3310b2abf
parent 1cfdcb0fed
commit f3310b2abf
9 changed files with 106 additions and 90 deletions
--- a/openvidu-client/pom.xml
+++ b/openvidu-client/pom.xml
@ -1,11 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>

 	<parent>
 		<groupId>io.openvidu</groupId>
 		<artifactId>openvidu-parent</artifactId>
-		<version>1.9.0-beta-1</version>
+		<version>2.0.0</version>
 	</parent>

 	<artifactId>openvidu-client</artifactId>
@ -67,7 +68,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>${version.mockito}</version>
+			<version>${version.mockito.core}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
--- a/openvidu-java-client/pom.xml
+++ b/openvidu-java-client/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.openvidu</groupId>
 		<artifactId>openvidu-parent</artifactId>
-		<version>1.9.0-beta-1</version>
+		<version>2.0.0</version>
 	</parent>

 	<artifactId>openvidu-java-client</artifactId>
@ -105,7 +105,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>${version.javadoc.plugin}</version>
 						<configuration>
 							<show>public</show>
 						</configuration>
@ -127,7 +127,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>${version.source.plugin}</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>
@ -140,7 +140,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>${version.javadoc.plugin}</version>
 						<configuration>
 							<show>public</show>
 						</configuration>
@ -156,7 +156,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>${version.gpg.plugin}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@ -170,7 +170,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
+						<version>${version.nexus.staging.plugin}</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
--- a/openvidu-server/pom.xml
+++ b/openvidu-server/pom.xml
@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>

 	<parent>
@ -94,7 +96,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>${version.exec.plugin}</version>
 						<configuration>
 							<mainClass>${start-class}</mainClass>
 						</configuration>
@ -149,7 +151,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>1.6.0</version>
+						<version>{version.exec.plugin}</version>
 						<configuration>
 							<mainClass>${start-class}</mainClass>
 						</configuration>
@ -189,7 +191,7 @@
 		<dependency>
 			<groupId>io.openvidu</groupId>
 			<artifactId>openvidu-client</artifactId>
-			<version>1.1.0</version>
+			<version>${version.openvidu.client}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@ -244,7 +246,7 @@
 		<dependency>
 			<groupId>org.thymeleaf</groupId>
 			<artifactId>thymeleaf-spring4</artifactId>
-			<version>3.0.9.RELEASE</version>
+			<version>${version.thymeleaf}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@ -255,7 +257,7 @@
 		<dependency>
 			<groupId>nz.net.ultraq.thymeleaf</groupId>
 			<artifactId>thymeleaf-layout-dialect</artifactId>
-			<version>2.2.2</version>
+			<version>${version.thymeleaflayout}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@ -265,22 +267,22 @@
 		<dependency>
 			<groupId>com.github.docker-java</groupId>
 			<artifactId>docker-java</artifactId>
-			<version>3.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>io.openvidu</groupId>
-			<artifactId>openvidu-java-client</artifactId>
-			<version>2.10.0</version>
+			<version>${version.dockerjava}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
 			<artifactId>janino</artifactId>
-			<version>3.0.7</version>
+			<version>${version.janino}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.7</version>
+			<version>${version.commonslang}</version>
+		</dependency>
+		<dependency>
+			<groupId>io.openvidu</groupId>
+			<artifactId>openvidu-java-client</artifactId>
+			<version>${version.openvidu.java.client}</version>
 		</dependency>

 		<!-- Test dependencies -->
@ -288,7 +290,7 @@
 		<dependency>
 			<groupId>io.openvidu</groupId>
 			<artifactId>openvidu-test</artifactId>
-			<version>1.1.0</version>
+			<version>${version.openvidu.test}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@ -321,13 +323,13 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>${version.mockito}</version>
+			<version>${version.mockito.all}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>${version.mockito}</version>
+			<version>${version.mockito.core}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@ -345,7 +347,7 @@
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-junit4</artifactId>
-			<version>${version.powermock}</version>
+			<version>${version.powermock.junit4}</version>
 			<scope>test</scope>
 		</dependency>

--- 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
--- 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);
--- a/openvidu-test-browsers/pom.xml
+++ b/openvidu-test-browsers/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.openvidu</groupId>
 		<artifactId>openvidu-parent</artifactId>
-		<version>1.9.0-beta-1</version>
+		<version>2.0.0</version>
 	</parent>

 	<artifactId>openvidu-test-browsers</artifactId>
@ -51,15 +51,9 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-
 		<!-- Encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-		<!-- Test dependencies version -->
-		<junit.jupiter.version>5.4.0</junit.jupiter.version>
-		<junit.platform.version>1.4.0</junit.platform.version>
-		<org-seleniumhq-selenium.version>3.141.59</org-seleniumhq-selenium.version>
 	</properties>

 	<dependencies>
@ -71,17 +65,17 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-firefox-driver</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 		</dependency>
 	</dependencies>

@ -106,7 +100,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>${version.source.plugin}</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>
@ -119,7 +113,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>${version.gpg.plugin}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@ -133,7 +127,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
+						<version>${version.nexus.staging.plugin}</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>
--- a/openvidu-test-e2e/pom.xml
+++ b/openvidu-test-e2e/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.openvidu</groupId>
 		<artifactId>openvidu-parent</artifactId>
-		<version>1.9.0-beta-1</version>
+		<version>2.0.0</version>
 	</parent>

 	<artifactId>openvidu-test-e2e</artifactId>
@ -51,15 +51,9 @@
 		<java.version>1.8</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-
 		<!-- Encoding -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-		<!-- Test dependencies version -->
-		<junit.jupiter.version>5.4.0</junit.jupiter.version>
-		<junit.platform.version>1.4.0</junit.platform.version>
-		<org-seleniumhq-selenium.version>3.141.59</org-seleniumhq-selenium.version>
 	</properties>

 	<build>
@ -68,7 +62,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M3</version>
+					<version>${version.surefire.plugin}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@ -78,19 +72,19 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit.jupiter.version}</version>
+			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
 			<artifactId>selenium-jupiter</artifactId>
-			<version>3.1.0</version>
+			<version>${version.selenium.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
 			<artifactId>webdrivermanager</artifactId>
-			<version>3.3.0</version>
+			<version>${version.webdrivermanager}</version>
 			<scope>test</scope>
 		</dependency>

@ -98,43 +92,43 @@
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-chrome-driver</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-firefox-driver</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-api</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-remote-driver</artifactId>
-			<version>${org-seleniumhq-selenium.version}</version>
+			<version>${version.selenium}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-runner</artifactId>
-			<version>${junit.platform.version}</version>
+			<version>${version.junit.platform}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit.jupiter.version}</version>
+			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@ -161,24 +155,24 @@
 			<version>0.2.3</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.openvidu</groupId>
-			<artifactId>openvidu-test-browsers</artifactId>
-			<version>1.0.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.openvidu</groupId>
-			<artifactId>openvidu-java-client</artifactId>
-			<version>2.10.0</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.mashape.unirest</groupId>
 			<artifactId>unirest-java</artifactId>
 			<version>1.4.9</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.openvidu</groupId>
+			<artifactId>openvidu-test-browsers</artifactId>
+			<version>${version.openvidu.test.browsers}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.openvidu</groupId>
+			<artifactId>openvidu-java-client</artifactId>
+			<version>${version.openvidu.java.client}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>

 </project>
--- a/openvidu-test/pom.xml
+++ b/openvidu-test/pom.xml
@ -1,11 +1,12 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>

 	<parent>
 		<groupId>io.openvidu</groupId>
 		<artifactId>openvidu-parent</artifactId>
-		<version>1.9.0-beta-1</version>
+		<version>2.0.0</version>
 	</parent>

 	<artifactId>openvidu-test</artifactId>
@ -59,7 +60,7 @@
 		<dependency>
 			<groupId>io.openvidu</groupId>
 			<artifactId>openvidu-client</artifactId>
-			<version>1.1.0</version>
+			<version>${version.openvidu.client}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.kurento</groupId>
@ -69,7 +70,7 @@
 		<dependency>
 			<groupId>org.kurento</groupId>
 			<artifactId>kurento-test</artifactId>
-			<version>6.7.1</version>
+			<version>${version.kurento}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
--- a/pom.xml
+++ b/pom.xml
@ -42,16 +42,42 @@
 	</developers>

 	<properties>
-		<version.kurento>6.10.0</version.kurento>
+		<version.kurento>6.10.1-SNAPSHOT</version.kurento>
 		<version.spring-boot>2.1.5.RELEASE</version.spring-boot>
 		<version.junit>4.12</version.junit>
-		<version.mockito>1.10.19</version.mockito>
+		<version.junit.jupiter>5.5.0-M1</version.junit.jupiter>
+		<version.junit.platform>1.5.0-M1</version.junit.platform>
+		<version.selenium>3.141.59</version.selenium>
+		<version.mockito.all>1.10.19</version.mockito.all>
+		<version.mockito.core>2.28.2</version.mockito.core>
 		<version.powermock>1.7.4</version.powermock>
+		<version.powermock.junit4>2.0.2</version.powermock.junit4>
 		<version.hamcrest-core>2.1</version.hamcrest-core>
 		<version.hamcrest-library>2.1</version.hamcrest-library>
 		<version.json-simple>1.1.1</version.json-simple>
 		<version.httpclient>4.5.8</version.httpclient>
+		<version.janino>3.0.12</version.janino>
+		<version.commonslang>3.9</version.commonslang>
+		<version.dockerjava>3.1.2</version.dockerjava>
+		<version.thymeleaf>3.0.11.RELEASE</version.thymeleaf>
+		<version.thymeleaflayout>2.4.1</version.thymeleaflayout>
+
+		<version.webdrivermanager>3.6.1</version.webdrivermanager>
+		<version.selenium.jupiter>3.2.1</version.selenium.jupiter>
+
+		<version.openvidu.java.client>2.10.0</version.openvidu.java.client>
+		<version.openvidu.client>1.1.0</version.openvidu.client>
+		<version.openvidu.test>1.1.0</version.openvidu.test>
+		<version.openvidu.test.browsers>1.0.0</version.openvidu.test.browsers>
+
 		<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
+		<version.extra.enforcer.rules.plugin>1.2</version.extra.enforcer.rules.plugin>
+		<version.source.plugin>3.1.0</version.source.plugin>
+		<version.surefire.plugin>3.0.0-M3</version.surefire.plugin>
+		<version.gpg.plugin>1.6</version.gpg.plugin>
+		<version.nexus.staging.plugin>1.6.8</version.nexus.staging.plugin>
+		<version.exec.plugin>1.6.0</version.exec.plugin>
+		<version.javadoc.plugin>3.1.0</version.javadoc.plugin>

 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
@ -181,7 +207,7 @@
 					<dependency>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>extra-enforcer-rules</artifactId>
-						<version>1.1</version>
+						<version>${version.extra.enforcer.rules.plugin}</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@ -233,7 +259,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>${version.source.plugin}</version>
 						<executions>
 							<execution>
 								<id>attach-sources</id>
@ -246,7 +272,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>${version.gpg.plugin}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@ -260,7 +286,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
+						<version>${version.nexus.staging.plugin}</version>
 						<extensions>true</extensions>
 						<configuration>
 							<serverId>ossrh</serverId>