mirror of https://github.com/OpenVidu/openvidu.git
Merge pull request #857 from OpenVidu/appmod/java-upgrade-20251218002817
Appmod/java upgrade 20251218002817master
commit
b266916f7f
|
|
@ -49,14 +49,14 @@
|
|||
<openvidu.scm.url>https://github.com/OpenVidu/openvidu</openvidu.scm.url>
|
||||
<openvidu.scm.connection>git@github.com:OpenVidu/openvidu.git</openvidu.scm.connection>
|
||||
|
||||
<version.spring-boot>3.4.1</version.spring-boot>
|
||||
<version.openvidu.java.client>2.30.0</version.openvidu.java.client>
|
||||
<version.slf4j>2.0.16</version.slf4j>
|
||||
<version.selenium>4.27.0</version.selenium>
|
||||
<version.gson>2.11.0</version.gson>
|
||||
<version.spring-boot>4.0.0</version.spring-boot>
|
||||
<version.openvidu.java.client>2.32.1</version.openvidu.java.client>
|
||||
<version.slf4j>2.0.17</version.slf4j>
|
||||
<version.selenium>4.39.0</version.selenium>
|
||||
<version.gson>2.13.2</version.gson>
|
||||
<version.jcodec>0.2.5</version.jcodec>
|
||||
<version.junit>5.11.4</version.junit>
|
||||
<version.appium>9.3.0</version.appium>
|
||||
<version.junit>5.14.1</version.junit>
|
||||
<version.appium>10.0.0</version.appium>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -107,6 +107,20 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.14.1</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
|
|
|
|||
|
|
@ -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(java.time.Duration.ofSeconds(timeOfWaitInSeconds));
|
||||
this.configureDriver(new org.openqa.selenium.Dimension(1920, 1080));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public class CustomLayoutHandler implements WebMvcConfigurer {
|
|||
|
||||
@Bean
|
||||
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||
http.httpBasic().disable();
|
||||
http.httpBasic(basic -> basic.disable());
|
||||
return http.build();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -176,8 +176,8 @@ public class CustomWebhook {
|
|||
|
||||
@Bean
|
||||
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||
http.requiresChannel().requestMatchers("/webhook").requiresInsecure();
|
||||
http.csrf().disable().authorizeRequests().requestMatchers("/webhook").permitAll();
|
||||
http.requiresChannel(channel -> channel.requestMatchers("/webhook").requiresInsecure());
|
||||
http.csrf(csrf -> csrf.disable()).authorizeHttpRequests(auth -> auth.requestMatchers("/webhook").permitAll());
|
||||
return http.build();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -468,17 +468,17 @@ public class OpenViduTestE2e {
|
|||
case "firefox":
|
||||
container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, false);
|
||||
setupBrowserAux(BrowserNames.FIREFOX, container, false);
|
||||
browserUser = new FirefoxUser("TestUser", 50, false);
|
||||
browserUser = new FirefoxUser("TestUser", 50, false, headless);
|
||||
break;
|
||||
case "firefoxDisabledOpenH264":
|
||||
container = firefoxContainer("selenium/standalone-firefox:" + FIREFOX_VERSION, 2147483648L, 1, true);
|
||||
setupBrowserAux(BrowserNames.FIREFOX, container, false);
|
||||
browserUser = new FirefoxUser("TestUser", 50, true);
|
||||
browserUser = new FirefoxUser("TestUser", 50, true, headless);
|
||||
break;
|
||||
case "edge":
|
||||
container = edgeContainer("selenium/standalone-edge:" + EDGE_VERSION, 2147483648L, 1, false);
|
||||
setupBrowserAux(BrowserNames.EDGE, container, false);
|
||||
browserUser = new EdgeUser("TestUser", 50);
|
||||
browserUser = new EdgeUser("TestUser", 50, headless);
|
||||
break;
|
||||
default:
|
||||
log.error("Browser {} not recognized", browser);
|
||||
|
|
|
|||
Loading…
Reference in New Issue