ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dependencies update

pull/203/head
pabloFuente 2019-02-18 11:11:19 +01:00
parent 9bcce47e9c
commit ae77bdcd0a
5 changed files with 32 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openvidu-java-client/pom.xml
View File

@ -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"> 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> <modelVersion>4.0.0</modelVersion>
@ -93,6 +94,7 @@
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>default</id> <id>default</id>
<activation> <activation>
@ -103,7 +105,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
<configuration> <configuration>
<show>public</show> <show>public</show>
</configuration> </configuration>
@ -111,6 +113,7 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<id>release-sign-artifacts</id> <id>release-sign-artifacts</id>
<activation> <activation>
@ -137,7 +140,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version> <version>3.0.1</version>
<configuration> <configuration>
<show>public</show> <show>public</show>
</configuration> </configuration>
@ -175,28 +178,10 @@
<autoReleaseAfterClose>true</autoReleaseAfterClose> <autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

4
openvidu-server/pom.xml
View File

@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8'?> <?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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>

34
openvidu-test-e2e/pom.xml
View File

@ -57,15 +57,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Test dependencies version --> <!-- Test dependencies version -->
<junit.jupiter.version>5.0.3</junit.jupiter.version> <junit.jupiter.version>5.4.0</junit.jupiter.version>
<junit.platform.version>1.3.2</junit.platform.version> <junit.platform.version>1.4.0</junit.platform.version>
<selenium-jupiter.version>3.1.0</selenium-jupiter.version> <org-seleniumhq-selenium.version>3.141.59</org-seleniumhq-selenium.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>
</properties> </properties>
<dependencies> <dependencies>
@ -78,13 +72,13 @@
<dependency> <dependency>
<groupId>io.github.bonigarcia</groupId> <groupId>io.github.bonigarcia</groupId>
<artifactId>selenium-jupiter</artifactId> <artifactId>selenium-jupiter</artifactId>
<version>2.1.0</version> <version>3.1.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.bonigarcia</groupId> <groupId>io.github.bonigarcia</groupId>
<artifactId>webdrivermanager</artifactId> <artifactId>webdrivermanager</artifactId>
<version>2.2.0</version> <version>3.3.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -119,16 +113,10 @@
<version>${org-seleniumhq-selenium.version}</version> <version>${org-seleniumhq-selenium.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.junit.platform</groupId> <groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId> <artifactId>junit-platform-runner</artifactId>
<version>1.0.1</version> <version>${junit.platform.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -141,33 +129,37 @@
<groupId>com.googlecode.json-simple</groupId> <groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>
<version>${version.json-simple}</version> <version>${version.json-simple}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xml-apis</groupId> <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId> <artifactId>xml-apis</artifactId>
<version>1.4.01</version> <version>2.0.2</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jcodec</groupId> <groupId>org.jcodec</groupId>
<artifactId>jcodec</artifactId> <artifactId>jcodec</artifactId>
<version>0.2.3</version> <version>0.2.3</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jcodec</groupId> <groupId>org.jcodec</groupId>
<artifactId>jcodec-javase</artifactId> <artifactId>jcodec-javase</artifactId>
<version>0.2.3</version> <version>0.2.3</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-java-client</artifactId> <artifactId>openvidu-java-client</artifactId>
<version>2.8.1</version> <version>2.8.1</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.mashape.unirest</groupId> <groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId> <artifactId>unirest-java</artifactId>
<version>1.4.9</version> <version>1.4.9</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

3
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
View File

@ -58,7 +58,6 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.platform.runner.JUnitPlatform; import org.junit.platform.runner.JUnitPlatform;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.openqa.selenium.By; import org.openqa.selenium.By;
@ -78,7 +77,6 @@ import com.google.gson.JsonObject;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.mashape.unirest.http.HttpMethod; import com.mashape.unirest.http.HttpMethod;
import io.github.bonigarcia.SeleniumExtension;
import io.github.bonigarcia.wdm.WebDriverManager; import io.github.bonigarcia.wdm.WebDriverManager;
import io.openvidu.java.client.Connection; import io.openvidu.java.client.Connection;
import io.openvidu.java.client.KurentoOptions; import io.openvidu.java.client.KurentoOptions;
@ -114,7 +112,6 @@ import io.openvidu.test.e2e.utils.Unzipper;
*/ */
@Tag("e2e") @Tag("e2e")
@DisplayName("E2E tests for OpenVidu TestApp") @DisplayName("E2E tests for OpenVidu TestApp")
@ExtendWith(SeleniumExtension.class)
@RunWith(JUnitPlatform.class) @RunWith(JUnitPlatform.class)
public class OpenViduTestAppE2eTest { public class OpenViduTestAppE2eTest {

50
pom.xml
View File

@ -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"> 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> <modelVersion>4.0.0</modelVersion>
@ -44,15 +45,13 @@
<version.kurento>6.9.0</version.kurento> <version.kurento>6.9.0</version.kurento>
<version.spring-boot>1.4.2.RELEASE</version.spring-boot> <version.spring-boot>1.4.2.RELEASE</version.spring-boot>
<version.junit>4.12</version.junit> <version.junit>4.12</version.junit>
<version.slf4j>1.7.13</version.slf4j>
<version.mockito>1.10.19</version.mockito> <version.mockito>1.10.19</version.mockito>
<version.powermock>1.6.3</version.powermock> <version.powermock>1.7.4</version.powermock>
<version.hamcrest-core>1.3</version.hamcrest-core> <version.hamcrest-core>2.1</version.hamcrest-core>
<version.hamcrest-library>1.3</version.hamcrest-library> <version.hamcrest-library>2.1</version.hamcrest-library>
<version.json-simple>1.1.1</version.json-simple> <version.json-simple>1.1.1</version.json-simple>
<version.httpclient>4.5.6</version.httpclient> <version.httpclient>4.5.7</version.httpclient>
<version.enforcer.plugin>1.4.1</version.enforcer.plugin> <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
<version.eclipse.plugin>2.10</version.eclipse.plugin>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -182,7 +181,7 @@
<dependency> <dependency>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId> <artifactId>extra-enforcer-rules</artifactId>
<version>1.0-beta-4</version> <version>1.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
@ -242,19 +241,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </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> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
@ -280,26 +266,6 @@
<autoReleaseAfterClose>false</autoReleaseAfterClose> <autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
</profile> </profile>