From ae77bdcd0af82040422f5908f13afe379b79ae54 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Mon, 18 Feb 2019 11:11:19 +0100
Subject: [PATCH] Dependencies update

---
 openvidu-java-client/pom.xml                  | 31 +++---------
 openvidu-server/pom.xml                       |  4 +-
 openvidu-test-e2e/pom.xml                     | 34 +++++--------
 .../test/e2e/OpenViduTestAppE2eTest.java      |  3 --
 pom.xml                                       | 50 +++----------------
 5 files changed, 32 insertions(+), 90 deletions(-)

diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml
index ad0dc7e7..342b386a 100644
--- a/openvidu-java-client/pom.xml
+++ b/openvidu-java-client/pom.xml
@@ -1,4 +1,5 @@
-<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>
 
@@ -93,6 +94,7 @@
 	</dependencies>
 
 	<profiles>
+
 		<profile>
 			<id>default</id>
 			<activation>
@@ -103,7 +105,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.0.0</version>
+						<version>3.0.1</version>
 						<configuration>
 							<show>public</show>
 						</configuration>
@@ -111,6 +113,7 @@
 				</plugins>
 			</build>
 		</profile>
+
 		<profile>
 			<id>release-sign-artifacts</id>
 			<activation>
@@ -137,7 +140,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.0.0</version>
+						<version>3.0.1</version>
 						<configuration>
 							<show>public</show>
 						</configuration>
@@ -175,28 +178,10 @@
 							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
 					</plugin>
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-resources</id>
-								<phase>validate</phase>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${basedir}/target/classes/static/</outputDirectory>
-									<resources>
-										<resource>
-											<directory>${basedir}/../elastest-torm-gui/dist</directory>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
+
 	</profiles>
+
 </project>
diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml
index f272dbf9..3bb830ee 100644
--- 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>
diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml
index a33ecb69..ab50f6a4 100644
--- a/openvidu-test-e2e/pom.xml
+++ b/openvidu-test-e2e/pom.xml
@@ -57,15 +57,9 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Test dependencies version -->
-		<junit.jupiter.version>5.0.3</junit.jupiter.version>
-		<junit.platform.version>1.3.2</junit.platform.version>
-		<selenium-jupiter.version>3.1.0</selenium-jupiter.version>
-		<org-seleniumhq-selenium.version>3.13.0</org-seleniumhq-selenium.version>
-		<slf4j.version>1.7.25</slf4j.version>
-
-		<!-- Plugins versions -->
-		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
-		<jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.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>
@@ -78,13 +72,13 @@
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
 			<artifactId>selenium-jupiter</artifactId>
-			<version>2.1.0</version>
+			<version>3.1.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.github.bonigarcia</groupId>
 			<artifactId>webdrivermanager</artifactId>
-			<version>2.2.0</version>
+			<version>3.3.0</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -119,16 +113,10 @@
 			<version>${org-seleniumhq-selenium.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>23.0</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-runner</artifactId>
-			<version>1.0.1</version>
+			<version>${junit.platform.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -141,33 +129,37 @@
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId>json-simple</artifactId>
 			<version>${version.json-simple}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>xml-apis</groupId>
 			<artifactId>xml-apis</artifactId>
-			<version>1.4.01</version>
+			<version>2.0.2</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jcodec</groupId>
 			<artifactId>jcodec</artifactId>
 			<version>0.2.3</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jcodec</groupId>
 			<artifactId>jcodec-javase</artifactId>
 			<version>0.2.3</version>
+			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>io.openvidu</groupId>
 			<artifactId>openvidu-java-client</artifactId>
 			<version>2.8.1</version>
+			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>com.mashape.unirest</groupId>
 			<artifactId>unirest-java</artifactId>
 			<version>1.4.9</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
index e5df469d..4dafa32d 100644
--- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
+++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
@@ -58,7 +58,6 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
@@ -78,7 +77,6 @@ import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import com.mashape.unirest.http.HttpMethod;
 
-import io.github.bonigarcia.SeleniumExtension;
 import io.github.bonigarcia.wdm.WebDriverManager;
 import io.openvidu.java.client.Connection;
 import io.openvidu.java.client.KurentoOptions;
@@ -114,7 +112,6 @@ import io.openvidu.test.e2e.utils.Unzipper;
  */
 @Tag("e2e")
 @DisplayName("E2E tests for OpenVidu TestApp")
-@ExtendWith(SeleniumExtension.class)
 @RunWith(JUnitPlatform.class)
 public class OpenViduTestAppE2eTest {
 
diff --git a/pom.xml b/pom.xml
index a7d6480a..07b8095f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,5 @@
-<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>
 
@@ -44,15 +45,13 @@
 		<version.kurento>6.9.0</version.kurento>
 		<version.spring-boot>1.4.2.RELEASE</version.spring-boot>
 		<version.junit>4.12</version.junit>
-		<version.slf4j>1.7.13</version.slf4j>
 		<version.mockito>1.10.19</version.mockito>
-		<version.powermock>1.6.3</version.powermock>
-		<version.hamcrest-core>1.3</version.hamcrest-core>
-		<version.hamcrest-library>1.3</version.hamcrest-library>
+		<version.powermock>1.7.4</version.powermock>
+		<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.6</version.httpclient>
-		<version.enforcer.plugin>1.4.1</version.enforcer.plugin>
-		<version.eclipse.plugin>2.10</version.eclipse.plugin>
+		<version.httpclient>4.5.7</version.httpclient>
+		<version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
 
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -182,7 +181,7 @@
 					<dependency>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>extra-enforcer-rules</artifactId>
-						<version>1.0-beta-4</version>
+						<version>1.1</version>
 					</dependency>
 				</dependencies>
 			</plugin>
@@ -242,19 +241,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.10.4</version>
-						<executions>
-							<execution>
-								<id>attach-javadocs</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
@@ -280,26 +266,6 @@
 							<autoReleaseAfterClose>false</autoReleaseAfterClose>
 						</configuration>
 					</plugin>
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-resources</id>
-								<phase>validate</phase>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${basedir}/target/classes/static/</outputDirectory>
-									<resources>
-										<resource>
-											<directory>${basedir}/../elastest-torm-gui/dist</directory>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>