deployment & openvidu-server: Bump to jdk 21

openvidu-server/docker/openvidu-dev/Dockerfile

@@ -15,7 +15,7 @@ RUN echo "deb [arch=amd64] http://ubuntu.openvidu.io/7.1.1 noble main" | tee /et
 
 # Install Java, supervisor and netstat
 RUN apt-get update && apt-get install -y \
-	openjdk-11-jre \
+	openjdk-21-jre \
 	supervisor && \
 	rm -rf /var/lib/apt/lists/*
 

openvidu-server/docker/openvidu-server-pro/Dockerfile

@@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
   curl \
   wget \
-  openjdk-11-jre \
+  openjdk-21-jre \
   jq \
   docker.io \
   ethtool \

openvidu-server/docker/openvidu-server/Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER info@openvidu.io
 RUN apt-get update && apt-get install -y \
   curl \
   wget \
-  openjdk-11-jre \
+  openjdk-21-jre \
   dnsutils \
 && rm -rf /var/lib/apt/lists/*
 

openvidu-server/pom.xml

@@ -235,6 +235,16 @@
 			<artifactId>docker-java</artifactId>
 			<version>${version.dockerjava}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-transport-okhttp</artifactId>
+			<version>${version.dockerjava}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-api</artifactId>
+			<version>${version.dockerjava}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.janino</groupId>
 			<artifactId>janino</artifactId>

openvidu-server/src/main/java/io/openvidu/server/utils/LocalDockerManager.java

@@ -51,7 +51,7 @@ 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.jaxrs.JerseyDockerHttpClient;
+import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.google.common.collect.ImmutableList;
 
@@ -74,10 +74,13 @@ public class LocalDockerManager implements DockerManager {
 	@Override
 	public DockerManager init() {
 		DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
-		DockerHttpClient dockerHttpClient = new JerseyDockerHttpClient.Builder()
-				.dockerHost(dockerClientConfig.getDockerHost()).sslConfig(dockerClientConfig.getSSLConfig()).build();
-		this.dockerClient = DockerClientBuilder.getInstance(dockerClientConfig).withDockerHttpClient(dockerHttpClient)
-				.build();
+		DockerHttpClient dockerHttpClient = new OkDockerHttpClient.Builder()
+			.dockerHost(dockerClientConfig.getDockerHost())
+			.sslConfig(dockerClientConfig.getSSLConfig())
+			.build();
+		this.dockerClient = DockerClientBuilder.getInstance(dockerClientConfig)
+			.withDockerHttpClient(dockerHttpClient)
+			.build();
 		return this;
 	}
 

openvidu-test-e2e/docker/Dockerfile

@@ -16,7 +16,7 @@ RUN apt-get update && apt-get -y upgrade && \
     iproute2 \
     lsb-release \
     maven \
-    openjdk-11-jdk-headless \
+    openjdk-21-jdk-headless \
     rsync \
     software-properties-common \
     sudo && \

openvidu-test-e2e/pom.xml

@@ -107,6 +107,16 @@
 			<artifactId>docker-java</artifactId>
 			<version>${version.dockerjava}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-transport-okhttp</artifactId>
+			<version>${version.dockerjava}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.docker-java</groupId>
+			<artifactId>docker-java-api</artifactId>
+			<version>${version.dockerjava}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>

openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/MediaNodeDockerUtils.java

@@ -9,7 +9,7 @@ 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.jaxrs.JerseyDockerHttpClient;
+import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 
 public class MediaNodeDockerUtils {
@@ -53,9 +53,13 @@ public class MediaNodeDockerUtils {
 
 	public static DockerClient getDockerClient() {
 		DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
-		DockerHttpClient dockerHttpClient = new JerseyDockerHttpClient.Builder()
-				.dockerHost(dockerClientConfig.getDockerHost()).sslConfig(dockerClientConfig.getSSLConfig()).build();
-		return DockerClientBuilder.getInstance(dockerClientConfig).withDockerHttpClient(dockerHttpClient).build();
+		DockerHttpClient dockerHttpClient = new OkDockerHttpClient.Builder()
+			.dockerHost(dockerClientConfig.getDockerHost())
+			.sslConfig(dockerClientConfig.getSSLConfig())
+			.build();
+		return DockerClientBuilder.getInstance(dockerClientConfig)
+			.withDockerHttpClient(dockerHttpClient)
+			.build();
 	}
 
 }

pom.xml

@@ -55,7 +55,7 @@
 		<version.mockito.core>4.9.0</version.mockito.core>
 		<version.powermock>2.0.9</version.powermock>
 		<version.janino>3.1.9</version.janino>
-		<version.dockerjava>3.2.13</version.dockerjava>
+		<version.dockerjava>3.4.1</version.dockerjava>
 		<version.slf4j>1.7.36</version.slf4j>
 		<version.gson>2.10</version.gson>
 		<version.jcodec>0.2.5</version.jcodec>