diff --git a/openvidu-java-client/pom.xml b/openvidu-java-client/pom.xml index 2f7ce8a0d..81ce7b9b6 100644 --- a/openvidu-java-client/pom.xml +++ b/openvidu-java-client/pom.xml @@ -75,7 +75,7 @@ openvidu-java-client must be self-contained to be used as an external dependency outside from this multi-module project. The version number must be EXACTLY the same as in the parent pom.xml nonetheless --> - 2.11.0 + 2.13.2 org.slf4j @@ -84,7 +84,7 @@ openvidu-java-client must be self-contained to be used as an external dependency outside from this multi-module project. The version number must be EXACTLY the same as in the parent pom.xml nonetheless --> - 2.0.16 + 2.0.17 org.junit.jupiter diff --git a/openvidu-server/pom.xml b/openvidu-server/pom.xml index 5933d639a..b061b90f6 100644 --- a/openvidu-server/pom.xml +++ b/openvidu-server/pom.xml @@ -274,19 +274,19 @@ ${version.logback} - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${version.jackson} - com.fasterxml.jackson.core + tools.jackson.core jackson-core ${version.jackson} com.fasterxml.jackson.core jackson-annotations - ${version.jackson} + ${version.jackson-annotations} diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java index ccf770db1..54f5be043 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/ChromeUser.java @@ -21,9 +21,9 @@ import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.Duration; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; import org.openqa.selenium.UnexpectedAlertBehaviour; import org.openqa.selenium.chrome.ChromeDriver; @@ -93,7 +93,7 @@ public class ChromeUser extends BrowserUser { this.driver = new ChromeDriver(options); } - this.driver.manage().timeouts().setScriptTimeout(timeOfWaitInSeconds, TimeUnit.SECONDS); + this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java index 7b988fff2..0b304d18d 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/EdgeUser.java @@ -2,7 +2,7 @@ package io.openvidu.test.browsers; import java.net.MalformedURLException; import java.net.URL; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.openqa.selenium.UnexpectedAlertBehaviour; import org.openqa.selenium.edge.EdgeDriver; @@ -36,7 +36,7 @@ public class EdgeUser extends BrowserUser { this.driver = new EdgeDriver(options); } - this.driver.manage().timeouts().setScriptTimeout(timeOfWaitInSeconds, TimeUnit.SECONDS); + this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java index e7ee64146..4e7dff470 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/FirefoxUser.java @@ -19,7 +19,7 @@ package io.openvidu.test.browsers; import java.net.MalformedURLException; import java.net.URL; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.openqa.selenium.UnexpectedAlertBehaviour; import org.openqa.selenium.firefox.FirefoxDriver; @@ -60,7 +60,7 @@ public class FirefoxUser extends BrowserUser { this.driver = new FirefoxDriver(options); } - this.driver.manage().timeouts().setScriptTimeout(timeOfWaitInSeconds, TimeUnit.SECONDS); + this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java index 85c60136c..211484d04 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/OperaUser.java @@ -2,7 +2,7 @@ package io.openvidu.test.browsers; import java.net.MalformedURLException; import java.net.URL; -import java.util.concurrent.TimeUnit; +import java.time.Duration; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.remote.Browser; @@ -39,7 +39,7 @@ public class OperaUser extends BrowserUser { // this.driver = new OperaDriver(options); } - this.driver.manage().timeouts().setScriptTimeout(timeOfWaitInSeconds, TimeUnit.SECONDS); + this.driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(timeOfWaitInSeconds)); this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080)); } diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml index 89270cd28..6284f276f 100644 --- a/openvidu-test-e2e/pom.xml +++ b/openvidu-test-e2e/pom.xml @@ -135,19 +135,19 @@ ${version.logback} - com.fasterxml.jackson.core + tools.jackson.core jackson-databind ${version.jackson} - com.fasterxml.jackson.core + tools.jackson.core jackson-core ${version.jackson} com.fasterxml.jackson.core jackson-annotations - ${version.jackson} + ${version.jackson-annotations} diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java index ccc23dc2c..de9868d97 100644 --- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java +++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java @@ -38,7 +38,7 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.containers.wait.strategy.WaitStrategy; -import org.testcontainers.shaded.org.apache.commons.io.FileUtils; +import org.apache.commons.io.FileUtils; import org.testcontainers.utility.DockerImageName; import com.google.gson.Gson; diff --git a/pom.xml b/pom.xml index 5aba58bba..b4e73a7fe 100644 --- a/pom.xml +++ b/pom.xml @@ -43,40 +43,41 @@ - 3.4.0 + 3.5.7 7.2.1-SNAPSHOT 2.31.0 1.1.0 1.1.0 1.1.1 - 5.11.4 - 4.26.0 - 5.14.2 + 5.12.2 + 4.38.0 + 5.20.0 3.1.12 3.6.0 - 2.0.16 + 2.0.17 - 2.11.0 + 2.13.2 0.2.5 - 1.20.4 - 9.3.0 - 2.0.0 - 1.5.12 - 2.18.1 + 2.0.1 + 10.0.0 + 2.0.0 + 1.5.20 + 3.0.2 + 2.20 - 3.13.0 - 3.5.0 - 1.8.0 + 3.14.1 + 3.6.2 + 1.11.0 3.3.1 3.7.1 - 3.5.2 - 3.2.7 + 3.5.4 + 3.2.8 1.7.0 - 3.5.0 - 3.11.1 - 3.9.9 + 3.6.2 + 3.12.0 + 3.9.11 https://github.com/OpenVidu/openvidu git@github.com:OpenVidu/openvidu.git @@ -96,7 +97,7 @@ ${java.version} - 3.0.3 + 3.9.0