Merge branch 'Kurento:main' into main

Kurento · Nov 7, 2024 · 41591e2 · 41591e2
2 parents b934bb9 + 011d53d
commit 41591e2
Show file tree

Hide file tree

Showing 117 changed files with 238 additions and 215 deletions.
diff --git a/.github/workflows/server-buildpackage-rust.child.yaml b/.github/workflows/server-buildpackage-rust.child.yaml
@@ -76,6 +76,7 @@ jobs:
           JOB_GIT_NAME: "${{ inputs.jobGitName }}"
           JOB_DISTRO: "${{ matrix.jobDistro }}"
           JOB_RELEASE: "${{ inputs.jobRelease }}"
+          APT_PROXY_URL: "${{ vars.APT_PROXY_URL }}"
           DISABLE_APT_PROXY: "true"
         working-directory: "${{ inputs.directory }}"
         run: "ci_job_package_gst_rust_debian.sh"

diff --git a/.github/workflows/server-buildpackage.child.yaml b/.github/workflows/server-buildpackage.child.yaml
@@ -92,6 +92,7 @@ jobs:
           JOB_GIT_NAME: "${{ inputs.jobGitName }}"
           JOB_GIT_NAME_FALLBACK: "${{ inputs.jobGitNameFallback }}"
           JOB_RELEASE: "${{ inputs.jobRelease }}"
+          APT_PROXY_URL: "${{ vars.APT_PROXY_URL }}"
           DISABLE_APT_PROXY: "true"
           INSTALL_PATH: "${{ steps.copy-artifacts.outputs.download-path }}"
         working-directory: "${{ inputs.directory }}"

diff --git a/.github/workflows/server-deploy-debian.child.yaml b/.github/workflows/server-deploy-debian.child.yaml
@@ -81,5 +81,6 @@ jobs:
           JOB_RELEASE: "${{ inputs.jobRelease }}"
           JOB_DEPLOY_NAME: "${{ inputs.jobDeployName }}"
           APTLY_GPG_SUBKEY: "${{ vars.APTLY_GPG_SUBKEY }}"
+          APTLY_SERVER: "${{ vars.APTLY_SERVER }}"
         working-directory: "artifacts/"
         run: "ci_job_deploy_debian.sh"
diff --git a/browser/kurento-utils-js/package.json b/browser/kurento-utils-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kurento-utils",
-  "version": "7.1.1-dev",
+  "version": "7.1.2-dev",
   "description": "Kurento JavaScript Utilities",
   "keywords": [
     "kurento",

diff --git a/ci-scripts/ci_job_deploy_debian.sh b/ci-scripts/ci_job_deploy_debian.sh
@@ -13,6 +13,10 @@
 #/
 #/ * Variable(s) from Jenkins global configuration:
 #/
+#/ APTLY_SERVER
+#/ 
+#/   IP address of the ssh server that hosts the aptly service. A DNS name is not allowed just an IPv4
+#/
 #/ APTLY_GPG_SUBKEY
 #/
 #/   The GnuPG key used to sign Debian package repositories with Aptly.
@@ -128,6 +132,7 @@ docker run --pull always --rm -i \
     --mount type=bind,src="$KURENTO_SCRIPTS_HOME",dst=/ci-scripts \
     --mount type=bind,src="$APTLY_SSH_KEY_PATH",dst=/id_aptly_ssh \
     --mount type=bind,src="$PWD",dst=/workdir \
+    --add-host aptly=$APTLY_SERVER \
     --workdir /workdir \
     buildpack-deps:20.04-scm /bin/bash <<DOCKERCOMMANDS
 
@@ -141,25 +146,25 @@ set -o xtrace
 # Exit trap, used to clean up.
 on_exit() {
     ssh -n -o StrictHostKeyChecking=no -i /id_aptly_ssh \
-        aptly@www.naevatec.com -p 3322 '\
+        aptly@aptly -p 3322 '\
             rm -rf "$TEMP_DIR"'
 }
 trap on_exit EXIT
 
 ssh -n -o StrictHostKeyChecking=no -i /id_aptly_ssh \
-    aptly@www.naevatec.com -p 3322 '\
+    aptly@aptly -p 3322 '\
         mkdir -p "$TEMP_DIR"'
 
 scp -o StrictHostKeyChecking=no -i /id_aptly_ssh \
     -P 3322 ./*.*deb \
-    aptly@www.naevatec.com:"$TEMP_DIR"
+    aptly@aptly:"$TEMP_DIR"
 
 scp -o StrictHostKeyChecking=no -i /id_aptly_ssh \
     -P 3322 /ci-scripts/ci_aptly_repo_publish.sh \
-    aptly@www.naevatec.com:"$TEMP_DIR"
+    aptly@aptly:"$TEMP_DIR"
 
 ssh -n -o StrictHostKeyChecking=no -i /id_aptly_ssh \
-    aptly@www.naevatec.com -p 3322 '\
+    aptly@aptly -p 3322 '\
         cd "$TEMP_DIR" \
         && GPGKEY="$APTLY_GPG_SUBKEY" \
            ./ci_aptly_repo_publish.sh $PUBLISH_ARGS'

diff --git a/ci-scripts/ci_job_package_debian.sh b/ci-scripts/ci_job_package_debian.sh
@@ -19,6 +19,11 @@
 #/   Added for GitHub Actions: No proxy is needed.
 #/   Optional.
 #/
+#/ APT_PROXY_URL
+#/
+#/   Sets the URL that points to the Apt proxy to be used (if not diabled)
+#/   Madatory if DISABLE_APT_PROXY is set to false
+#/
 #/ INSTALL_PATH
 #/
 #/   Path where to find the packages that should be installed.
@@ -96,7 +101,7 @@ if [[ "$JOB_RELEASE" == "true" ]]; then
 fi
 
 if [[ "${DISABLE_APT_PROXY:-}" != "true" ]]; then
-    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy http://proxy.openvidu.io:3142)
+    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy "$APT_PROXY_URL")
 fi
 
 

diff --git a/ci-scripts/ci_job_package_gst_rust_debian.sh b/ci-scripts/ci_job_package_gst_rust_debian.sh
@@ -19,6 +19,11 @@
 #/   Added for GitHub Actions: No proxy is needed.
 #/   Optional.
 #/
+#/ APT_PROXY_URL
+#/
+#/   Sets the URL that points to the Apt proxy to be used (if not diabled)
+#/   Madatory if DISABLE_APT_PROXY is set to false
+#/
 #/ INSTALL_PATH
 #/
 #/   Path where to find the packages that should be installed.
@@ -104,7 +109,7 @@ if [[ "$JOB_RELEASE" == "true" ]]; then
 fi
 
 if [[ "${DISABLE_APT_PROXY:-}" != "true" ]]; then
-    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy http://proxy.openvidu.io:3142)
+    KURENTO_BUILDPACKAGE_ARGS+=(--apt-proxy "$APT_PROXY_URL")
 fi
 if [[ -n "$GST_RUST_PACKAGE" ]]; then
     KURENTO_BUILDPACKAGE_ARGS+=(--package "$GST_RUST_PACKAGE")

diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 		<relativePath>../parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-client</artifactId>

diff --git a/clients/java/commons/pom.xml b/clients/java/commons/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 		<relativePath>../parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-commons</artifactId>

diff --git a/clients/java/jsonrpc/jsonrpc-client-jetty/pom.xml b/clients/java/jsonrpc/jsonrpc-client-jetty/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-jsonrpc</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>kurento-jsonrpc-client-jetty</artifactId>
 	<packaging>jar</packaging>

diff --git a/clients/java/jsonrpc/jsonrpc-client/pom.xml b/clients/java/jsonrpc/jsonrpc-client/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-jsonrpc</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>kurento-jsonrpc-client</artifactId>
 	<packaging>jar</packaging>

diff --git a/clients/java/jsonrpc/jsonrpc-demo-server/pom.xml b/clients/java/jsonrpc/jsonrpc-demo-server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-jsonrpc</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>kurento-jsonrpc-demo-server</artifactId>
 	<packaging>jar</packaging>

diff --git a/clients/java/jsonrpc/jsonrpc-server/pom.xml b/clients/java/jsonrpc/jsonrpc-server/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-jsonrpc</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>kurento-jsonrpc-server</artifactId>
 	<packaging>jar</packaging>

diff --git a/clients/java/jsonrpc/pom.xml b/clients/java/jsonrpc/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 		<relativePath>../parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-jsonrpc</artifactId>

diff --git a/clients/java/maven-plugin/pom.xml b/clients/java/maven-plugin/pom.xml
@@ -6,7 +6,7 @@
 	<!-- Maven coordinates -->
 	<groupId>org.kurento</groupId>
 	<artifactId>kurento-maven-plugin</artifactId>
-	<version>7.1.1-SNAPSHOT</version>
+	<version>7.1.2-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
 	<!-- Project-level information -->
@@ -158,7 +158,7 @@
 			7.0.1-SNAPSHOT, we cannot assume that the server will also be
 			7.0.1-SNAPSHOT, because it might already be 7.0.2-SNAPSHOT or higher.
 			-->
-			<version>[7.1.1-SNAPSHOT,8.0.0)</version>
+			<version>[7.1.2-SNAPSHOT,8.0.0)</version>
 		</dependency>
 	</dependencies>
 

diff --git a/clients/java/parent-pom/pom.xml b/clients/java/parent-pom/pom.xml
@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-qa-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 		<relativePath>../qa-pom</relativePath>
 	</parent>
 	<artifactId>kurento-parent-pom</artifactId>
-	<version>7.1.1-SNAPSHOT</version>
+	<version>7.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- Project-level information -->
@@ -78,9 +78,9 @@
 		7.0.1-SNAPSHOT, we cannot assume that the server will also be
 		7.0.1-SNAPSHOT, because it might already be 7.0.2-SNAPSHOT or higher.
 		-->
-		<version.kms-api-core>[7.1.1-SNAPSHOT,8.0.0)</version.kms-api-core>
-		<version.kms-api-elements>[7.1.1-SNAPSHOT,8.0.0)</version.kms-api-elements>
-		<version.kms-api-filters>[7.1.1-SNAPSHOT,8.0.0)</version.kms-api-filters>
+		<version.kms-api-core>[7.1.2-SNAPSHOT,8.0.0)</version.kms-api-core>
+		<version.kms-api-elements>[7.1.2-SNAPSHOT,8.0.0)</version.kms-api-elements>
+		<version.kms-api-filters>[7.1.2-SNAPSHOT,8.0.0)</version.kms-api-filters>
 
 		<!-- Kurento miscellaneous tools -->
 		<version.kurento-maven-plugin>7.0.0</version.kurento-maven-plugin>

diff --git a/clients/java/pom.xml b/clients/java/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-parent-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 		<relativePath>parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-java</artifactId>

diff --git a/clients/java/qa-pom/pom.xml b/clients/java/qa-pom/pom.xml
@@ -5,7 +5,7 @@
 	<!-- Maven coordinates -->
 	<groupId>org.kurento</groupId>
 	<artifactId>kurento-qa-pom</artifactId>
-	<version>7.1.1-SNAPSHOT</version>
+	<version>7.1.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- Project-level information -->

diff --git a/clients/java/qa-pom/qa-config/pom.xml b/clients/java/qa-pom/qa-config/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.kurento</groupId>
 		<artifactId>kurento-qa-pom</artifactId>
-		<version>7.1.1-SNAPSHOT</version>
+		<version>7.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>kurento-qa-config</artifactId>
 

diff --git a/clients/javascript/client/package.json b/clients/javascript/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kurento-client",
-  "version": "7.1.1-dev",
+  "version": "7.1.2-dev",
   "description": "JavaScript Client API for Kurento Media Server",
   "keywords": [
     "kurento",

diff --git a/clients/javascript/jsonrpc/package.json b/clients/javascript/jsonrpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kurento-jsonrpc",
-  "version": "7.1.1-dev",
+  "version": "7.1.2-dev",
   "description": "Kurento RPC client library for Browser and Node.js",
   "keywords": [
     "kurento",

diff --git a/server/cmake-utils/CMakeLists.txt b/server/cmake-utils/CMakeLists.txt
@@ -24,7 +24,7 @@ if(HAS_PARENT)
 endif()
 
 include(KurentoGitHelpers)
-get_git_version(PROJECT_VERSION 7.1.1-dev)
+get_git_version(PROJECT_VERSION 7.1.2-dev)
 message(STATUS "Project version: ${PROJECT_NAME}-${PROJECT_VERSION}")
 
 # CMake Config Mode search file. Adds the main Kurento dir to CMAKE_MODULE_PATH.

diff --git a/server/cmake-utils/debian/changelog b/server/cmake-utils/debian/changelog
@@ -1,9 +1,9 @@
-kurento-cmake-utils (7.1.1-1kurento1) UNRELEASED; urgency=medium
+kurento-cmake-utils (7.1.2-1kurento1) UNRELEASED; urgency=medium
 
   [ Kurento ]
   * UNRELEASED
 
- -- Saul Pablo Labajo Izquierdo <[email protected]>  Fri, 20 Sep 2024 09:56:15 +0000
+ -- Saul Pablo Labajo Izquierdo <[email protected]>  Wed, 06 Nov 2024 11:57:27 +0000
 
 kms-cmake-utils (6.18.0-0kurento1) testing; urgency=medium
 

diff --git a/server/jsonrpc/CMakeLists.txt b/server/jsonrpc/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 
 include(KurentoGitHelpers)
 install_git_hook(pre-commit ${CMAKE_CURRENT_SOURCE_DIR}/hooks/pre-commit.hook)
-get_git_version(PROJECT_VERSION 7.1.1-dev)
+get_git_version(PROJECT_VERSION 7.1.2-dev)
 message(STATUS "Project version: ${PROJECT_NAME}-${PROJECT_VERSION}")
 
 # Compiler flags

diff --git a/server/jsonrpc/debian/changelog b/server/jsonrpc/debian/changelog
@@ -1,9 +1,9 @@
-kurento-jsonrpc (7.1.1-1kurento1) UNRELEASED; urgency=medium
+kurento-jsonrpc (7.1.2-1kurento1) UNRELEASED; urgency=medium
 
   [ Juan Navarro ]
   * UNRELEASED
 
- -- Saul Pablo Labajo Izquierdo <[email protected]>  Fri, 20 Sep 2024 09:56:15 +0000
+ -- Saul Pablo Labajo Izquierdo <[email protected]>  Wed, 06 Nov 2024 11:57:28 +0000
 
 kms-jsonrpc (6.18.0-0kurento1) testing; urgency=medium
 

diff --git a/server/jsonrpc/debian/control b/server/jsonrpc/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Build-Depends:
  cmake,
  debhelper-compat (= 13),
- kurento-cmake-utils (>= 7.1.1),
+ kurento-cmake-utils (>= 7.1.2),
  libboost-dev,
  libboost-test-dev,
  libjsoncpp-dev,

diff --git a/server/media-server/CMakeLists.txt b/server/media-server/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 
 include(KurentoGitHelpers)
 install_git_hook(pre-commit ${CMAKE_CURRENT_SOURCE_DIR}/hooks/pre-commit.hook)
-get_git_version(PROJECT_VERSION 7.1.1-dev)
+get_git_version(PROJECT_VERSION 7.1.2-dev)
 message(STATUS "Project version: ${PROJECT_NAME}-${PROJECT_VERSION}")
 
 # Compiler flags

diff --git a/server/media-server/debian/changelog b/server/media-server/debian/changelog
@@ -1,4 +1,4 @@
-kurento-media-server (7.1.1-1kurento1) UNRELEASED; urgency=medium
+kurento-media-server (7.1.2-1kurento1) UNRELEASED; urgency=medium
 
   [ Mario Jr ]
   * GStreamer 1.14 port
@@ -8,7 +8,7 @@ kurento-media-server (7.1.1-1kurento1) UNRELEASED; urgency=medium
   * Add 'libwebsocketpp-dev' to Build-Deps, without versioning
   * debian/control: Drop 'libssl1.0-dev' for Bionic compatibility
 
- -- Saul Pablo Labajo Izquierdo <[email protected]>  Fri, 20 Sep 2024 09:56:16 +0000
+ -- Saul Pablo Labajo Izquierdo <[email protected]>  Wed, 06 Nov 2024 11:57:28 +0000
 
 kurento-media-server (6.18.0-0kurento1) testing; urgency=medium
 

diff --git a/server/media-server/debian/control b/server/media-server/debian/control
@@ -5,11 +5,11 @@ Build-Depends:
  cmake,
  debhelper-compat (= 13),
  gstreamer1.0-plugins-good,
- kurento-cmake-utils (>= 7.1.1),
- kurento-module-core-dev (>= 7.1.1),
- kurento-module-creator (>= 7.1.1),
- kurento-module-elements-dev (>= 7.1.1),
- kurento-module-filters-dev (>= 7.1.1),
+ kurento-cmake-utils (>= 7.1.2),
+ kurento-module-core-dev (>= 7.1.2),
+ kurento-module-creator (>= 7.1.2),
+ kurento-module-elements-dev (>= 7.1.2),
+ kurento-module-filters-dev (>= 7.1.2),
  libboost-dev,
  libboost-filesystem-dev,
  libboost-log-dev,
@@ -41,9 +41,9 @@ Depends:
  gstreamer1.0-plugins-base,
  gstreamer1.0-plugins-good,
  gstreamer1.0-plugins-ugly,
- kurento-module-core (>= 7.1.1),
- kurento-module-elements (>= 7.1.1),
- kurento-module-filters (>= 7.1.1),
+ kurento-module-core (>= 7.1.2),
+ kurento-module-elements (>= 7.1.2),
+ kurento-module-filters (>= 7.1.2),
  libgstreamer-plugins-base1.0-0,
 Suggests:
  kurento-dbg,
@@ -61,12 +61,12 @@ Section: devel
 Depends:
  ${misc:Depends},
  cmake,
- kurento-cmake-utils (>= 7.1.1),
+ kurento-cmake-utils (>= 7.1.2),
  kurento-media-server (= ${binary:Version}),
- kurento-module-core-dev (>= 7.1.1),
- kurento-module-creator (>= 7.1.1),
- kurento-module-elements-dev (>= 7.1.1),
- kurento-module-filters-dev (>= 7.1.1),
+ kurento-module-core-dev (>= 7.1.2),
+ kurento-module-creator (>= 7.1.2),
+ kurento-module-elements-dev (>= 7.1.2),
+ kurento-module-filters-dev (>= 7.1.2),
  libboost-log-dev,
  libboost-program-options-dev,
  libboost-thread-dev,