diff --git a/.gitignore b/.gitignore
index f77efede..af572e5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ nbactions.xml
*bower_components/
.externalToolBuilders
*bin/
+/.vscode
diff --git a/openvidu-client/pom.xml b/openvidu-client/pom.xml
index 75a75cb6..7e72133c 100644
--- a/openvidu-client/pom.xml
+++ b/openvidu-client/pom.xml
@@ -51,23 +51,23 @@
org.kurento
kurento-jsonrpc-client
+ ${version.kurento}
-
org.kurento
kurento-jsonrpc-client-jetty
+ ${version.kurento}
junit
junit
+ ${version.junit}
test
org.mockito
mockito-core
+ ${version.mockito}
test
diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml
index 7c40355a..ee438701 100644
--- a/openvidu-java-client/pom.xml
+++ b/openvidu-java-client/pom.xml
@@ -68,23 +68,20 @@
junit
junit
+ ${version.junit}
test
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
org.apache.httpcomponents
httpclient
+ ${version.httpclient}
com.googlecode.json-simple
json-simple
+ ${version.json-simple}
diff --git a/openvidu-server/.project b/openvidu-server/.project
index bb71ae66..0bb10237 100644
--- a/openvidu-server/.project
+++ b/openvidu-server/.project
@@ -20,6 +20,11 @@
+
+ org.springframework.ide.eclipse.boot.validation.springbootbuilder
+
+
+
org.eclipse.m2e.core.maven2Builder
diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml
index 914c9f03..bdf64e7c 100644
--- a/openvidu-server/pom.xml
+++ b/openvidu-server/pom.xml
@@ -1,5 +1,6 @@
-
+
4.0.0
@@ -66,11 +67,10 @@
-
-
org.springframework.boot
spring-boot-maven-plugin
+ ${version.spring-boot}
${start-class}
ZIP
@@ -84,14 +84,20 @@
-
org.codehaus.mojo
exec-maven-plugin
+ 1.6.0
${start-class}
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${version.enforcer.plugin}
+
@@ -99,30 +105,35 @@
org.kurento
kurento-jsonrpc-server
+ ${version.kurento}
org.springframework.boot
spring-boot-starter-logging
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
-
- io.openvidu
- openvidu-test
- test
-
io.openvidu
openvidu-client
-
-
- org.mockito
- mockito-core
- test
+ 1.1.0
org.kurento
kurento-client
+ ${version.kurento}
org.springframework.boot
@@ -130,58 +141,104 @@
+
+ com.googlecode.json-simple
+ json-simple
+ ${version.json-simple}
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+ ${version.spring-boot}
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+ ${version.spring-boot}
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ ${version.spring-boot}
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+
+
+
+
+
+
+
+ io.openvidu
+ openvidu-test
+ 1.1.0
+ test
+
org.slf4j
slf4j-log4j12
+ ${version.slf4j}
test
org.hamcrest
hamcrest-core
+ ${version.hamcrest-core}
+ test
+
+
+ org.hamcrest
+ hamcrest-library
+ ${version.hamcrest-library}
+ test
+
+
+ org.mockito
+ mockito-all
+ ${version.mockito}
+ test
+
+
+ org.mockito
+ mockito-core
+ ${version.mockito}
+ test
+
+
+ org.hamcrest
+ hamcrest-core
+
+
+
+
+ org.powermock
+ powermock-api-mockito
+ ${version.powermock}
test
org.powermock
powermock-module-junit4
+ ${version.powermock}
test
-
- org.powermock
- powermock-api-mockito
- test
-
-
- org.springframework.boot
- spring-boot-starter-security
-
-
- org.springframework.boot
- spring-boot-starter-logging
-
-
-
-
- com.googlecode.json-simple
- json-simple
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
- org.springframework.boot
- spring-boot-starter-logging
-
-
-
+
+
+
-
-
\ No newline at end of file
diff --git a/openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java
index 1ea4b2a3..c28f27d7 100644
--- a/openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java
+++ b/openvidu-server/src/test/java/io/openvidu/server/test/RoomProtocolTest.java
@@ -106,7 +106,7 @@ public class RoomProtocolTest {
final Map> expectedPeersList = new HashMap>();
List user0Streams = new ArrayList();
- user0Streams.add("webcam");
+ user0Streams.add("user0_CAMERA");
expectedPeersList.put("user0", user0Streams);
final Set existingParticipants = new HashSet();
diff --git a/openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java b/openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java
index 6514eda5..940a674b 100644
--- a/openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java
+++ b/openvidu-server/src/test/java/io/openvidu/server/test/core/RoomManagerTest.java
@@ -16,8 +16,8 @@
package io.openvidu.server.test.core;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.hasItem;
+import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.junit.matchers.JUnitMatchers.hasItem;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml
index 1324a725..20d8f0c4 100644
--- a/openvidu-test-e2e/pom.xml
+++ b/openvidu-test-e2e/pom.xml
@@ -123,14 +123,6 @@
21.0
test
-
-
-
- org.slf4j
- slf4j-api
- test
-
-
org.junit.platform
junit-platform-runner
@@ -144,8 +136,9 @@
test
- com.googlecode.json-simple
- json-simple
+ com.googlecode.json-simple
+ json-simple
+ ${version.json-simple}
xml-apis
diff --git a/openvidu-test/.project b/openvidu-test/.project
index 3359d1c3..3adde4b0 100644
--- a/openvidu-test/.project
+++ b/openvidu-test/.project
@@ -20,6 +20,11 @@
+
+ org.springframework.ide.eclipse.boot.validation.springbootbuilder
+
+
+
org.eclipse.m2e.core.maven2Builder
diff --git a/openvidu-test/pom.xml b/openvidu-test/pom.xml
index e2ba94e7..8be0bd64 100644
--- a/openvidu-test/pom.xml
+++ b/openvidu-test/pom.xml
@@ -52,29 +52,41 @@
junit
junit
+ ${version.junit}
compile
io.openvidu
openvidu-client
+ 1.1.0
org.kurento
kurento-commons
+ ${version.kurento}
org.kurento
kurento-test
+ ${version.kurento}
org.springframework.boot
spring-boot-starter-logging
+
+ org.springframework.boot
+ spring-boot-starter-log4j2
+
+
-
+
diff --git a/pom.xml b/pom.xml
index cb821e7c..91b9b673 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
- org.kurento
- kurento-parent-pom
- 6.6.2
-
-
io.openvidu
openvidu-parent
1.1.0
@@ -47,16 +41,49 @@
-
- 1.1.0
-
- 5.1.3
+ 6.6.2
+ 1.4.2.RELEASE
+ 4.12
+ 1.7.13
+ 1.10.19
+ 1.6.3
+ 1.3
+ 1.3
+ 1.1.1
+ 4.5.4
+ 1.4.1
+ 2.10
1.8
1.8
https://github.com/OpenVidu/openvidu
git@github.com:OpenVidu/openvidu.git
+
+ UTF-8
+
+
+
+
+
+
+ UTF-8
+ UTF-8
+
+
+ 1.8
+ 1.8
+
+
+ ${maven.compiler.target}
+ ${maven.compiler.source}
+
+
+ 3.0.3
+ ${maven.compiler.source}
+ ${maven.compiler.source}
@@ -70,6 +97,97 @@
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+
+ enforce-java-version
+
+ enforce
+
+
+
+
+ To build this project JDK ${jdk.min.version} (or
+ greater) is required. Please install it.
+ ${jdk.min.version}
+
+
+
+
+
+ enforce-maven-version
+
+ enforce
+
+
+
+
+ To build this project Maven ${maven.min.version} (or
+ greater) is required. Please install it.
+ ${maven.min.version}
+
+
+
+
+
+ enforce-bytecode-version
+
+ enforce
+
+
+
+
+ ${jdk.max.version}
+
+
+ true
+
+
+
+ enforce-ban-duplicate-classes
+
+ enforce
+
+
+
+
+ true
+
+
+ false
+
+
+
+ enforce-ban-circular-dependencies
+
+ enforce
+
+
+
+
+
+ true
+
+
+
+
+
+ org.codehaus.mojo
+ extra-enforcer-rules
+ 1.0-beta-4
+
+
+
+
+
+
default
@@ -191,33 +309,22 @@
io.openvidu
openvidu-server
- ${version.openvidu}
io.openvidu
openvidu-client
- ${version.openvidu}
io.openvidu
openvidu-test
- ${version.openvidu}
io.openvidu
openvidu-test-e2e
- ${version.openvidu}
io.openvidu
openvidu-java-client
- ${version.openvidu}
-
-
-
- org.kurento
- kurento-jsonrpc-js
- ${version.kurento.jsonrpc.js}