diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml index 05d1d854..4b88031e 100644 --- a/openvidu-java-client/pom.xml +++ b/openvidu-java-client/pom.xml @@ -66,38 +66,28 @@ org.apache.httpcomponents.client5 httpclient5 - 5.1.4 + 5.4.1 com.google.code.gson gson - 2.10 + 2.10.1 org.slf4j slf4j-api - 1.7.36 + 1.7.36.redhat-00003 org.junit.jupiter junit-jupiter-api - 5.9.1 + 5.11.4 test commons-validator commons-validator - 1.7 - - - - org.apache.commons - commons-collections4 - 4.4 + 1.9.0 diff --git a/openvidu-node-client/package-lock.json b/openvidu-node-client/package-lock.json index 8f38a35f..137500a1 100644 --- a/openvidu-node-client/package-lock.json +++ b/openvidu-node-client/package-lock.json @@ -9,7 +9,7 @@ "version": "2.30.0", "license": "Apache-2.0", "dependencies": { - "axios": "1.7.1", + "axios": "1.7.9", "buffer": "6.0.3" }, "devDependencies": { @@ -187,9 +187,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.1.tgz", - "integrity": "sha512-+LV37nQcd1EpFalkXksWNBiA17NZ5m5/WspmHGmZmdx1qBOg/VNq/c4eRJiA9VQQHBOs+N0ZhhdU10h2TyNK7Q==", + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/openvidu-node-client/package.json b/openvidu-node-client/package.json index 7df83d72..12ac1abd 100644 --- a/openvidu-node-client/package.json +++ b/openvidu-node-client/package.json @@ -1,7 +1,7 @@ { "author": "OpenVidu", "dependencies": { - "axios": "1.7.1", + "axios": "1.7.9", "buffer": "6.0.3" }, "description": "OpenVidu Node Client", diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml index 84d933d1..ca8ec6ef 100644 --- a/openvidu-server/pom.xml +++ b/openvidu-server/pom.xml @@ -237,7 +237,7 @@ com.github.docker-java - docker-java-transport-okhttp + docker-java-transport-zerodep ${version.dockerjava} @@ -261,6 +261,49 @@ ${version.maven.artifact} + + + commons-io + commons-io + ${version.commons.io} + + + org.apache.commons + commons-compress + ${version.commons.compress} + + + org.yaml + snakeyaml + ${version.snakeyaml} + + + com.fasterxml.woodstox + woodstox-core + ${version.woodstox} + + + com.google.guava + guava + ${version.google.guava} + + + io.netty + netty-handler + ${version.netty} + + + io.netty + netty-resolver-dns + ${version.netty} + + + ch.qos.logback + logback-classic + ${version.logback.classic} + + + diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java b/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java index 2a0bccfd..bb694481 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java @@ -51,8 +51,8 @@ import com.github.dockerjava.api.model.Volume; import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.okhttp.OkDockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.zerodep.ZerodepDockerHttpClient; import com.google.common.collect.ImmutableList; import io.openvidu.client.OpenViduException; @@ -74,7 +74,7 @@ public class LocalDockerManager implements DockerManager { @Override public DockerManager init() { DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); - DockerHttpClient dockerHttpClient = new OkDockerHttpClient.Builder() + DockerHttpClient dockerHttpClient = new ZerodepDockerHttpClient.Builder() .dockerHost(dockerClientConfig.getDockerHost()) .sslConfig(dockerClientConfig.getSSLConfig()) .build(); diff --git a/openvidu-test-browsers/pom.xml b/openvidu-test-browsers/pom.xml index 8631f253..6730800d 100644 --- a/openvidu-test-browsers/pom.xml +++ b/openvidu-test-browsers/pom.xml @@ -102,6 +102,48 @@ java-client ${version.appium} + + + + commons-io + commons-io + ${version.commons.io} + + + org.apache.commons + commons-compress + ${version.commons.compress} + + + org.yaml + snakeyaml + ${version.snakeyaml} + + + com.fasterxml.woodstox + woodstox-core + ${version.woodstox} + + + com.google.guava + guava + ${version.google.guava} + + + io.netty + netty-handler + ${version.netty} + + + io.netty + netty-resolver-dns + ${version.netty} + + + ch.qos.logback + logback-classic + ${version.logback.classic} + diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml index d595eff1..6dee1a0a 100644 --- a/openvidu-test-e2e/pom.xml +++ b/openvidu-test-e2e/pom.xml @@ -109,7 +109,7 @@ com.github.docker-java - docker-java-transport-okhttp + docker-java-transport-zerodep ${version.dockerjava} @@ -127,6 +127,49 @@ java-string-similarity ${version.stringsimilarity} + + + + commons-io + commons-io + ${version.commons.io} + + + org.apache.commons + commons-compress + ${version.commons.compress} + + + org.yaml + snakeyaml + ${version.snakeyaml} + + + com.fasterxml.woodstox + woodstox-core + ${version.woodstox} + + + com.google.guava + guava + ${version.google.guava} + + + io.netty + netty-handler + ${version.netty} + + + io.netty + netty-resolver-dns + ${version.netty} + + + ch.qos.logback + logback-classic + ${version.logback.classic} + + diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/MediaNodeDockerUtils.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/MediaNodeDockerUtils.java index 19f1fbab..7e88690a 100644 --- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/MediaNodeDockerUtils.java +++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/MediaNodeDockerUtils.java @@ -9,8 +9,8 @@ import com.github.dockerjava.api.command.ExecCreateCmdResponse; import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientConfig; -import com.github.dockerjava.okhttp.OkDockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient; +import com.github.dockerjava.zerodep.ZerodepDockerHttpClient; public class MediaNodeDockerUtils { @@ -53,7 +53,7 @@ public class MediaNodeDockerUtils { public static DockerClient getDockerClient() { DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build(); - DockerHttpClient dockerHttpClient = new OkDockerHttpClient.Builder() + DockerHttpClient dockerHttpClient = new ZerodepDockerHttpClient.Builder() .dockerHost(dockerClientConfig.getDockerHost()) .sslConfig(dockerClientConfig.getSSLConfig()) .build(); diff --git a/pom.xml b/pom.xml index 067cc966..c95e3e1b 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,20 @@ + + + + redhat-ga + https://maven.repository.redhat.com/ga/ + + true + + + true + + + + OpenVidu https://openvidu.io @@ -63,6 +77,15 @@ 8.3.0 2.0.0 + + 2.16.1 + 1.26.2 + 1.33.0.redhat-00002 + 6.6.2 + 33.2.1-jre + 4.1.112.Final + 1.2.13 + 3.10.1 3.1.0 1.6.1