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

Bump some patches and minor dependencies

v2
cruizba 2025-01-10 17:43:55 +01:00
parent b6deca81e1
commit 582a663ff0
9 changed files with 167 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,38 +66,28 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents.client5</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId> <artifactId>httpclient5</artifactId>
<version>5.1.4</version> <version>5.4.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.10</version> <version>2.10.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.36</version> <version>1.7.36.redhat-00003</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>5.9.1</version> <version>5.11.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>1.7</version> <version>1.9.0</version>
</dependency>
<!--
This dependency is used by commons-validator 1.7. But it should be
replaced or updated in the future:
https://issues.apache.org/jira/browse/VALIDATOR-485?jql=project%20%3D%20VALIDATOR%20AND%20fixVersion%20%3D%202.0
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
openvidu-node-client/package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "2.30.0", "version": "2.30.0",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"axios": "1.7.1", "axios": "1.7.9",
"buffer": "6.0.3" "buffer": "6.0.3"
}, },
"devDependencies": { "devDependencies": {
@ -187,9 +187,9 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
}, },
"node_modules/axios": { "node_modules/axios": {
"version": "1.7.1", "version": "1.7.9",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
"integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
"dependencies": { "dependencies": {
"follow-redirects": "^1.15.6", "follow-redirects": "^1.15.6",
"form-data": "^4.0.0", "form-data": "^4.0.0",

2
openvidu-node-client/package.json
View File

@ -1,7 +1,7 @@
{ {
"author": "OpenVidu", "author": "OpenVidu",
"dependencies": { "dependencies": {
"axios": "1.7.1", "axios": "1.7.9",
"buffer": "6.0.3" "buffer": "6.0.3"
}, },
"description": "OpenVidu Node Client", "description": "OpenVidu Node Client",

45
openvidu-server/pom.xml
View File

@ -237,7 +237,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.docker-java</groupId> <groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-okhttp</artifactId> <artifactId>docker-java-transport-zerodep</artifactId>
<version>${version.dockerjava}</version> <version>${version.dockerjava}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -261,6 +261,49 @@
<version>${version.maven.artifact}</version> <version>${version.maven.artifact}</version>
</dependency> </dependency>
<!-- fixed patched dependencies -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${version.commons.io}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${version.commons.compress}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${version.snakeyaml}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>${version.woodstox}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.google.guava}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${version.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>${version.netty}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${version.logback.classic}</version>
</dependency>
<!-- Test dependencies --> <!-- Test dependencies -->
<dependency> <dependency>

4
openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java
View File

@ -51,8 +51,8 @@ import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DefaultDockerClientConfig;
import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientBuilder;
import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.okhttp.OkDockerHttpClient;
import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient;
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import io.openvidu.client.OpenViduException; import io.openvidu.client.OpenViduException;
@ -74,7 +74,7 @@ public class LocalDockerManager implements DockerManager {
@Override @Override
public DockerManager init() { public DockerManager init() {
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
DockerHttpClient dockerHttpClient = new OkDockerHttpClient.Builder() DockerHttpClient dockerHttpClient = new ZerodepDockerHttpClient.Builder()
.dockerHost(dockerClientConfig.getDockerHost()) .dockerHost(dockerClientConfig.getDockerHost())
.sslConfig(dockerClientConfig.getSSLConfig()) .sslConfig(dockerClientConfig.getSSLConfig())
.build(); .build();

42
openvidu-test-browsers/pom.xml
View File

@ -102,6 +102,48 @@
<artifactId>java-client</artifactId> <artifactId>java-client</artifactId>
<version>${version.appium}</version> <version>${version.appium}</version>
</dependency> </dependency>
<!-- fixed patched dependencies -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${version.commons.io}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${version.commons.compress}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${version.snakeyaml}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>${version.woodstox}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.google.guava}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${version.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>${version.netty}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${version.logback.classic}</version>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

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

@ -109,7 +109,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.docker-java</groupId> <groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-okhttp</artifactId> <artifactId>docker-java-transport-zerodep</artifactId>
<version>${version.dockerjava}</version> <version>${version.dockerjava}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -127,6 +127,49 @@
<artifactId>java-string-similarity</artifactId> <artifactId>java-string-similarity</artifactId>
<version>${version.stringsimilarity}</version> <version>${version.stringsimilarity}</version>
</dependency> </dependency>
<!-- fixed patched dependencies -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${version.commons.io}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${version.commons.compress}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${version.snakeyaml}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>${version.woodstox}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.google.guava}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${version.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>${version.netty}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${version.logback.classic}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/MediaNodeDockerUtils.java
View File

@ -9,8 +9,8 @@ import com.github.dockerjava.api.command.ExecCreateCmdResponse;
import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DefaultDockerClientConfig;
import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientBuilder;
import com.github.dockerjava.core.DockerClientConfig; import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.okhttp.OkDockerHttpClient;
import com.github.dockerjava.transport.DockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient;
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
public class MediaNodeDockerUtils { public class MediaNodeDockerUtils {
@ -53,7 +53,7 @@ public class MediaNodeDockerUtils {
public static DockerClient getDockerClient() { public static DockerClient getDockerClient() {
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
DockerHttpClient dockerHttpClient = new OkDockerHttpClient.Builder() DockerHttpClient dockerHttpClient = new ZerodepDockerHttpClient.Builder()
.dockerHost(dockerClientConfig.getDockerHost()) .dockerHost(dockerClientConfig.getDockerHost())
.sslConfig(dockerClientConfig.getSSLConfig()) .sslConfig(dockerClientConfig.getSSLConfig())
.build(); .build();

23
pom.xml
View File

@ -20,6 +20,20 @@
</license> </license>
</licenses> </licenses>
<!-- Additonal repositories -->
<repositories>
<repository>
<id>redhat-ga</id>
<url>https://maven.repository.redhat.com/ga/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<organization> <organization>
<name>OpenVidu</name> <name>OpenVidu</name>
<url>https://openvidu.io</url> <url>https://openvidu.io</url>
@ -63,6 +77,15 @@
<version.appium>8.3.0</version.appium> <version.appium>8.3.0</version.appium>
<version.stringsimilarity>2.0.0</version.stringsimilarity> <version.stringsimilarity>2.0.0</version.stringsimilarity>
<!-- fixed patched versions -->
<version.commons.io>2.16.1</version.commons.io>
<version.commons.compress>1.26.2</version.commons.compress>
<version.snakeyaml>1.33.0.redhat-00002</version.snakeyaml>
<version.woodstox>6.6.2</version.woodstox>
<version.google.guava>33.2.1-jre</version.google.guava>
<version.netty>4.1.112.Final</version.netty>
<version.logback.classic>1.2.13</version.logback.classic>
<version.compiler.plugin>3.10.1</version.compiler.plugin> <version.compiler.plugin>3.10.1</version.compiler.plugin>
<version.enforcer.plugin>3.1.0</version.enforcer.plugin> <version.enforcer.plugin>3.1.0</version.enforcer.plugin>
<version.extra.enforcer.rules.plugin>1.6.1</version.extra.enforcer.rules.plugin> <version.extra.enforcer.rules.plugin>1.6.1</version.extra.enforcer.rules.plugin>