mirror of https://github.com/OpenVidu/openvidu.git
Update all Java project dependencies
parent
6f3475fd94
commit
c82d7315ef
|
@ -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>2.7.18</version.spring-boot>
|
||||
<version.spring-boot>3.4.1</version.spring-boot>
|
||||
<version.openvidu.java.client>2.30.0</version.openvidu.java.client>
|
||||
<version.slf4j>1.7.36</version.slf4j>
|
||||
<version.selenium>4.12.1</version.selenium>
|
||||
<version.gson>2.10</version.gson>
|
||||
<version.slf4j>2.0.16</version.slf4j>
|
||||
<version.selenium>4.27.0</version.selenium>
|
||||
<version.gson>2.11.0</version.gson>
|
||||
<version.jcodec>0.2.5</version.jcodec>
|
||||
<version.junit>5.9.1</version.junit>
|
||||
<version.appium>8.3.0</version.appium>
|
||||
<version.junit>5.11.4</version.junit>
|
||||
<version.appium>9.3.0</version.appium>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
|
@ -4,10 +4,10 @@ import java.net.MalformedURLException;
|
|||
import java.net.URL;
|
||||
|
||||
import org.openqa.selenium.chrome.ChromeOptions;
|
||||
import org.openqa.selenium.remote.CapabilityType;
|
||||
import org.openqa.selenium.remote.DesiredCapabilities;
|
||||
import org.openqa.selenium.remote.RemoteWebDriver;
|
||||
|
||||
import io.appium.java_client.remote.MobileCapabilityType;
|
||||
import io.appium.java_client.remote.MobilePlatform;
|
||||
|
||||
// Run Docker Android:
|
||||
|
@ -40,7 +40,7 @@ public class AndroidChromeUser extends BrowserUser {
|
|||
"autoplay-policy=no-user-gesture-required");
|
||||
|
||||
DesiredCapabilities capabilities = new DesiredCapabilities();
|
||||
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
|
||||
capabilities.setCapability(CapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
|
||||
capabilities.setCapability(ChromeOptions.CAPABILITY, options);
|
||||
|
||||
URL url = null;
|
||||
|
|
|
@ -290,33 +290,33 @@ public class CustomHttpClient {
|
|||
if (body != null && !body.isEmpty()) {
|
||||
body = body.replaceAll("'", "\"");
|
||||
BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(body);
|
||||
switch (method) {
|
||||
case POST:
|
||||
switch (method.name()) {
|
||||
case "POST":
|
||||
builder = builder.POST(bodyPublisher);
|
||||
break;
|
||||
case PUT:
|
||||
case "PUT":
|
||||
builder = builder.PUT(bodyPublisher);
|
||||
break;
|
||||
case PATCH:
|
||||
case "PATCH":
|
||||
default:
|
||||
builder = builder.method("PATCH", bodyPublisher);
|
||||
break;
|
||||
}
|
||||
builder.setHeader("Content-Type", "application/json");
|
||||
} else {
|
||||
switch (method) {
|
||||
case GET:
|
||||
switch (method.name()) {
|
||||
case "GET":
|
||||
builder = builder.GET();
|
||||
builder.setHeader("Content-Type", "application/x-www-form-urlencoded");
|
||||
break;
|
||||
case POST:
|
||||
case "POST":
|
||||
builder = builder.POST(HttpRequest.BodyPublishers.noBody());
|
||||
break;
|
||||
case DELETE:
|
||||
case "DELETE":
|
||||
builder = builder.DELETE();
|
||||
builder.setHeader("Content-Type", "application/x-www-form-urlencoded");
|
||||
break;
|
||||
case PUT:
|
||||
case "PUT":
|
||||
builder = builder.PUT(HttpRequest.BodyPublishers.noBody());
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -6,13 +6,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
@SpringBootApplication
|
||||
public class CustomLayoutHandler extends WebSecurityConfigurerAdapter implements WebMvcConfigurer {
|
||||
public class CustomLayoutHandler implements WebMvcConfigurer {
|
||||
|
||||
private static ConfigurableApplicationContext context;
|
||||
public static CountDownLatch initLatch;
|
||||
|
@ -24,9 +25,10 @@ public class CustomLayoutHandler extends WebSecurityConfigurerAdapter implements
|
|||
.run(args);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void configure(HttpSecurity security) throws Exception {
|
||||
security.httpBasic().disable();
|
||||
@Bean
|
||||
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||
http.httpBasic().disable();
|
||||
return http.build();
|
||||
}
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
|
|
|
@ -32,10 +32,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
||||
import org.springframework.security.web.SecurityFilterChain;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
@ -174,13 +174,11 @@ public class CustomWebhook {
|
|||
CustomWebhook.initLatch.countDown();
|
||||
}
|
||||
|
||||
@Configuration
|
||||
public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
||||
@Override
|
||||
protected void configure(HttpSecurity http) throws Exception {
|
||||
http.requiresChannel().antMatchers("/webhook").requiresInsecure();
|
||||
http.csrf().disable().authorizeRequests().antMatchers("/webhook").permitAll();
|
||||
}
|
||||
@Bean
|
||||
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||
http.requiresChannel().requestMatchers("/webhook").requiresInsecure();
|
||||
http.csrf().disable().authorizeRequests().requestMatchers("/webhook").permitAll();
|
||||
return http.build();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -50,13 +50,13 @@
|
|||
<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>2.7.18</version.spring-boot>
|
||||
<version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
|
||||
<version.selenium>4.12.1</version.selenium>
|
||||
<version.gson>2.10</version.gson>
|
||||
<version.spring-boot>3.4.1</version.spring-boot>
|
||||
<version.surefire.plugin>3.5.2</version.surefire.plugin>
|
||||
<version.selenium>4.27.0</version.selenium>
|
||||
<version.gson>2.11.0</version.gson>
|
||||
<version.livekit-server>0.8.3</version.livekit-server>
|
||||
<version.testcontainers>1.17.6</version.testcontainers>
|
||||
<version.dockerjava>3.2.13</version.dockerjava>
|
||||
<version.testcontainers>1.20.4</version.testcontainers>
|
||||
<version.dockerjava>3.4.1</version.dockerjava>
|
||||
<version.stringsimilarity>2.0.0</version.stringsimilarity>
|
||||
<version.openvidu-test-browsers>1.1.0</version.openvidu-test-browsers>
|
||||
</properties>
|
||||
|
|
Loading…
Reference in New Issue