kurento-parent-pom removed from openvidu. POMs updated

pull/20/merge
pabloFuente 2017-12-13 22:39:26 +01:00
parent c5db83951d
commit d8eea40265
11 changed files with 274 additions and 97 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ nbactions.xml
*bower_components/ *bower_components/
.externalToolBuilders .externalToolBuilders
*bin/ *bin/
/.vscode

View File

@ -51,23 +51,23 @@
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc-client</artifactId> <artifactId>kurento-jsonrpc-client</artifactId>
<version>${version.kurento}</version>
</dependency> </dependency>
<!-- <dependency>
<groupId>io.openvidu</groupId>
<artifactId>openvidu-server</artifactId>
</dependency>-->
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc-client-jetty</artifactId> <artifactId>kurento-jsonrpc-client-jetty</artifactId>
<version>${version.kurento}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>${version.mockito}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -68,23 +68,20 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${version.httpclient}</version>
</dependency> </dependency>
<dependency> <dependency>
<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>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -20,6 +20,11 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>

View File

@ -1,5 +1,6 @@
<?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>
@ -66,11 +67,10 @@
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>${version.spring-boot}</version>
<configuration> <configuration>
<mainClass>${start-class}</mainClass> <mainClass>${start-class}</mainClass>
<layout>ZIP</layout> <layout>ZIP</layout>
@ -84,14 +84,20 @@
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration> <configuration>
<mainClass>${start-class}</mainClass> <mainClass>${start-class}</mainClass>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${version.enforcer.plugin}</version>
</plugin>
</plugins> </plugins>
</build> </build>
@ -99,60 +105,35 @@
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc-server</artifactId> <artifactId>kurento-jsonrpc-server</artifactId>
<version>${version.kurento}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<!--<exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId>
</exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-nop</artifactId>
</exclusion> -->
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>io.openvidu</groupId>
<artifactId>openvidu-test</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-client</artifactId> <artifactId>openvidu-client</artifactId>
</dependency> <version>1.1.0</version>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-client</artifactId> <artifactId>kurento-client</artifactId>
<exclusions> <version>${version.kurento}</version>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -163,10 +144,12 @@
<dependency> <dependency>
<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>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-security</artifactId>
<version>${version.spring-boot}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -174,14 +157,88 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${version.spring-boot}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${version.spring-boot}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>io.openvidu</groupId>
<artifactId>openvidu-test</artifactId>
<version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${version.slf4j}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>${version.hamcrest-core}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>${version.hamcrest-library}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${version.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${version.mockito}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${version.powermock}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${version.powermock}</version>
<scope>test</scope>
</dependency>
<!-- Test dependencies -->
</dependencies> </dependencies>
<!-- <profiles> <profile> <id>default</id> <activation> <property> <name>default</name>
<value>true</value> </property> </activation> <build> <plugins> <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <skipTests>true</skipTests> </configuration> </plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId>
<configuration> <skipTests>true</skipTests> </configuration> </plugin> </plugins>
</build> </profile> </profiles> -->
</project> </project>

View File

@ -106,7 +106,7 @@ public class RoomProtocolTest {
final Map<String, List<String>> expectedPeersList = new HashMap<String, List<String>>(); final Map<String, List<String>> expectedPeersList = new HashMap<String, List<String>>();
List<String> user0Streams = new ArrayList<String>(); List<String> user0Streams = new ArrayList<String>();
user0Streams.add("webcam"); user0Streams.add("user0_CAMERA");
expectedPeersList.put("user0", user0Streams); expectedPeersList.put("user0", user0Streams);
final Set<UserParticipant> existingParticipants = new HashSet<UserParticipant>(); final Set<UserParticipant> existingParticipants = new HashSet<UserParticipant>();

View File

@ -16,8 +16,8 @@
package io.openvidu.server.test.core; package io.openvidu.server.test.core;
import static org.hamcrest.CoreMatchers.containsString; import static org.junit.matchers.JUnitMatchers.containsString;
import static org.hamcrest.CoreMatchers.hasItem; import static org.junit.matchers.JUnitMatchers.hasItem;
import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.not;

View File

@ -123,14 +123,6 @@
<version>21.0</version> <version>21.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<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>
@ -146,6 +138,7 @@
<dependency> <dependency>
<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>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xml-apis</groupId> <groupId>xml-apis</groupId>

View File

@ -20,6 +20,11 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>

View File

@ -52,29 +52,41 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-client</artifactId> <artifactId>openvidu-client</artifactId>
<version>1.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-commons</artifactId> <artifactId>kurento-commons</artifactId>
<version>${version.kurento}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kurento</groupId> <groupId>org.kurento</groupId>
<artifactId>kurento-test</artifactId> <artifactId>kurento-test</artifactId>
<version>${version.kurento}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId> <artifactId>spring-boot-starter-logging</artifactId>
</exclusion> </exclusion>
</exclusions> <exclusion>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId> <artifactId>spring-boot-starter-log4j2</artifactId>
</exclusion>
<!-- <exclusion>
<groupId>org.kurento</groupId>
<artifactId>kurento-repository-internal</artifactId>
</exclusion>-->
</exclusions>
</dependency> </dependency>
<!--<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>-->
</dependencies> </dependencies>
</project> </project>

149
pom.xml
View File

@ -2,12 +2,6 @@
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>
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-parent-pom</artifactId>
<version>6.6.2</version>
</parent>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-parent</artifactId> <artifactId>openvidu-parent</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
@ -47,16 +41,49 @@
</developers> </developers>
<properties> <properties>
<!-- OpenVidu versions --> <version.kurento>6.6.2</version.kurento>
<version.openvidu>1.1.0</version.openvidu> <version.spring-boot>1.4.2.RELEASE</version.spring-boot>
<version.junit>4.12</version.junit>
<version.kurento.jsonrpc.js>5.1.3</version.kurento.jsonrpc.js> <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.json-simple>1.1.1</version.json-simple>
<version.httpclient>4.5.4</version.httpclient>
<version.enforcer.plugin>1.4.1</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>
<openvidu.scm.url>https://github.com/OpenVidu/openvidu</openvidu.scm.url> <openvidu.scm.url>https://github.com/OpenVidu/openvidu</openvidu.scm.url>
<openvidu.scm.connection>git@github.com:OpenVidu/openvidu.git</openvidu.scm.connection> <openvidu.scm.connection>git@github.com:OpenVidu/openvidu.git</openvidu.scm.connection>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- ************** -->
<!-- Build settings -->
<!-- ************** -->
<!-- Cross plugins settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- maven-compiler-plugin -->
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<!-- Options to override the compiler arguments directly on the compiler
arument line to separate between what the IDE understands as the source level
and what the Maven compiler actually use. -->
<maven.compiler.argument.target>${maven.compiler.target}</maven.compiler.argument.target>
<maven.compiler.argument.source>${maven.compiler.source}</maven.compiler.argument.source>
<!-- maven-enforcer-plugin -->
<maven.min.version>3.0.3</maven.min.version>
<jdk.min.version>${maven.compiler.source}</jdk.min.version>
<jdk.max.version>${maven.compiler.source}</jdk.max.version>
</properties> </properties>
<distributionManagement> <distributionManagement>
@ -70,6 +97,97 @@
</repository> </repository>
</distributionManagement> </distributionManagement>
<build>
<plugins>
<plugin>
<!-- Check for the minimum version of Java and Maven. Runs during the
validate phase. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java-version</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<message>To build this project JDK ${jdk.min.version} (or
greater) is required. Please install it.</message>
<version>${jdk.min.version}</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-maven-version</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<message>To build this project Maven ${maven.min.version} (or
greater) is required. Please install it.</message>
<version>${maven.min.version}</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-bytecode-version</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${jdk.max.version}</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
<fail>true</fail>
</configuration>
</execution>
<execution>
<id>enforce-ban-duplicate-classes</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banDuplicateClasses>
<findAllDuplicates>true</findAllDuplicates>
</banDuplicateClasses>
</rules>
<fail>false</fail>
</configuration>
</execution>
<execution>
<id>enforce-ban-circular-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<banCircularDependencies />
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.0-beta-4</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles> <profiles>
<profile> <profile>
<id>default</id> <id>default</id>
@ -191,33 +309,22 @@
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-server</artifactId> <artifactId>openvidu-server</artifactId>
<version>${version.openvidu}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-client</artifactId> <artifactId>openvidu-client</artifactId>
<version>${version.openvidu}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-test</artifactId> <artifactId>openvidu-test</artifactId>
<version>${version.openvidu}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-test-e2e</artifactId> <artifactId>openvidu-test-e2e</artifactId>
<version>${version.openvidu}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.openvidu</groupId> <groupId>io.openvidu</groupId>
<artifactId>openvidu-java-client</artifactId> <artifactId>openvidu-java-client</artifactId>
<version>${version.openvidu}</version>
</dependency>
<dependency>
<groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc-js</artifactId>
<version>${version.kurento.jsonrpc.js}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>