Skip to content

Commit

Permalink
Prepare for next development iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
slabajo committed Sep 20, 2024
1 parent f31e84f commit 3ca11c1
Show file tree
Hide file tree
Showing 117 changed files with 256 additions and 256 deletions.
2 changes: 1 addition & 1 deletion browser/kurento-utils-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kurento-utils",
"version": "7.1.0",
"version": "7.1.1-dev",
"description": "Kurento JavaScript Utilities",
"keywords": [
"kurento",
Expand Down
2 changes: 1 addition & 1 deletion clients/java/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-parent-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<artifactId>kurento-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-parent-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<artifactId>kurento-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/jsonrpc/jsonrpc-client-jetty/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>kurento-jsonrpc-client-jetty</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/jsonrpc/jsonrpc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>kurento-jsonrpc-client</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/jsonrpc/jsonrpc-demo-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>kurento-jsonrpc-demo-server</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/jsonrpc/jsonrpc-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-jsonrpc</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>kurento-jsonrpc-server</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/jsonrpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-parent-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<relativePath>../parent-pom</relativePath>
</parent>
<artifactId>kurento-jsonrpc</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions clients/java/maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- Maven coordinates -->
<groupId>org.kurento</groupId>
<artifactId>kurento-maven-plugin</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<!-- Project-level information -->
Expand Down Expand Up @@ -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.0,8.0.0)</version>
<version>[7.1.1-SNAPSHOT,8.0.0)</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions clients/java/parent-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-qa-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<relativePath>../qa-pom</relativePath>
</parent>
<artifactId>kurento-parent-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<packaging>pom</packaging>

<!-- Project-level information -->
Expand Down Expand Up @@ -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.0,8.0.0)</version.kms-api-core>
<version.kms-api-elements>[7.1.0,8.0.0)</version.kms-api-elements>
<version.kms-api-filters>[7.1.0,8.0.0)</version.kms-api-filters>
<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>

<!-- Kurento miscellaneous tools -->
<version.kurento-maven-plugin>7.0.0</version.kurento-maven-plugin>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-parent-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<relativePath>parent-pom</relativePath>
</parent>
<artifactId>kurento-java</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion clients/java/qa-pom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- Maven coordinates -->
<groupId>org.kurento</groupId>
<artifactId>kurento-qa-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<packaging>pom</packaging>

<!-- Project-level information -->
Expand Down
2 changes: 1 addition & 1 deletion clients/java/qa-pom/qa-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kurento</groupId>
<artifactId>kurento-qa-pom</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
</parent>
<artifactId>kurento-qa-config</artifactId>

Expand Down
10 changes: 5 additions & 5 deletions clients/javascript/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kurento-client",
"version": "7.1.0",
"version": "7.1.1-dev",
"description": "JavaScript Client API for Kurento Media Server",
"keywords": [
"kurento",
Expand Down Expand Up @@ -68,10 +68,10 @@
"es6-promise": "^4.0.5",
"extend": "^3.0.0",
"inherits": "^2.0.0",
"kurento-client-core": "7.1.0",
"kurento-client-elements": "7.1.0",
"kurento-client-filters": "7.1.0",
"kurento-jsonrpc": "7.1.0",
"kurento-client-core": "git+https://github.com/Kurento/kurento-client-core-js.git",
"kurento-client-elements": "git+https://github.com/Kurento/kurento-client-elements-js.git",
"kurento-client-filters": "git+https://github.com/Kurento/kurento-client-filters-js.git",
"kurento-jsonrpc": "https://gitpkg.now.sh/Kurento/kurento/clients/javascript/jsonrpc?main",
"minimist": "^1.2.0",
"promise": "7.1.1",
"promisecallback": "0.0.4",
Expand Down
2 changes: 1 addition & 1 deletion clients/javascript/jsonrpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kurento-jsonrpc",
"version": "7.1.0",
"version": "7.1.1-dev",
"description": "Kurento RPC client library for Browser and Node.js",
"keywords": [
"kurento",
Expand Down
4 changes: 2 additions & 2 deletions doc-kurento/VERSIONS.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# shellcheck disable=SC2034
declare -A PROJECT_VERSIONS=(
# Version of the documentation itself; it appears in the main menu
[VERSION_DOC]="7.1"
[VERSION_DOC]="<NextVersion>-dev"

# Version of Kurento Media Server
[VERSION_KMS]="7.1.0"
Expand All @@ -33,7 +33,7 @@ declare -A PROJECT_VERSIONS=(
# Indicates if the current state of this code is Release or Nightly.
# If "true", all mentioned repos will be checked out to the corresponding
# versions; otherwise, they will be kept at the default branch (main).
[VERSION_RELEASE]="true"
[VERSION_RELEASE]="false"
)

# If the build is not for a release, then some versions can be set to more
Expand Down
2 changes: 1 addition & 1 deletion server/cmake-utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(HAS_PARENT)
endif()

include(KurentoGitHelpers)
get_git_version(PROJECT_VERSION 7.1.0)
get_git_version(PROJECT_VERSION 7.1.1-dev)
message(STATUS "Project version: ${PROJECT_NAME}-${PROJECT_VERSION}")

# CMake Config Mode search file. Adds the main Kurento dir to CMAKE_MODULE_PATH.
Expand Down
4 changes: 2 additions & 2 deletions server/cmake-utils/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
kurento-cmake-utils (7.1.0-1kurento1) UNRELEASED; urgency=medium
kurento-cmake-utils (7.1.1-1kurento1) UNRELEASED; urgency=medium

[ Kurento ]
* UNRELEASED

-- Saul Pablo Labajo Izquierdo <[email protected]> Mon, 16 Sep 2024 14:29:55 +0000
-- Saul Pablo Labajo Izquierdo <[email protected]> Fri, 20 Sep 2024 09:56:15 +0000

kms-cmake-utils (6.18.0-0kurento1) testing; urgency=medium

Expand Down
2 changes: 1 addition & 1 deletion server/jsonrpc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.0)
get_git_version(PROJECT_VERSION 7.1.1-dev)
message(STATUS "Project version: ${PROJECT_NAME}-${PROJECT_VERSION}")

# Compiler flags
Expand Down
4 changes: 2 additions & 2 deletions server/jsonrpc/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
kurento-jsonrpc (7.1.0-1kurento1) UNRELEASED; urgency=medium
kurento-jsonrpc (7.1.1-1kurento1) UNRELEASED; urgency=medium

[ Juan Navarro ]
* UNRELEASED

-- Saul Pablo Labajo Izquierdo <[email protected]> Mon, 16 Sep 2024 14:29:55 +0000
-- Saul Pablo Labajo Izquierdo <[email protected]> Fri, 20 Sep 2024 09:56:15 +0000

kms-jsonrpc (6.18.0-0kurento1) testing; urgency=medium

Expand Down
2 changes: 1 addition & 1 deletion server/jsonrpc/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Priority: optional
Build-Depends:
cmake,
debhelper-compat (= 13),
kurento-cmake-utils (>= 7.1.0),
kurento-cmake-utils (>= 7.1.1),
libboost-dev,
libboost-test-dev,
libjsoncpp-dev,
Expand Down
2 changes: 1 addition & 1 deletion server/media-server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.0)
get_git_version(PROJECT_VERSION 7.1.1-dev)
message(STATUS "Project version: ${PROJECT_NAME}-${PROJECT_VERSION}")

# Compiler flags
Expand Down
4 changes: 2 additions & 2 deletions server/media-server/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kurento-media-server (7.1.0-1kurento1) UNRELEASED; urgency=medium
kurento-media-server (7.1.1-1kurento1) UNRELEASED; urgency=medium

[ Mario Jr ]
* GStreamer 1.14 port
Expand All @@ -8,7 +8,7 @@ kurento-media-server (7.1.0-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]> Mon, 16 Sep 2024 14:29:56 +0000
-- Saul Pablo Labajo Izquierdo <[email protected]> Fri, 20 Sep 2024 09:56:16 +0000

kurento-media-server (6.18.0-0kurento1) testing; urgency=medium

Expand Down
26 changes: 13 additions & 13 deletions server/media-server/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ Build-Depends:
cmake,
debhelper-compat (= 13),
gstreamer1.0-plugins-good,
kurento-cmake-utils (>= 7.1.0),
kurento-module-core-dev (>= 7.1.0),
kurento-module-creator (>= 7.1.0),
kurento-module-elements-dev (>= 7.1.0),
kurento-module-filters-dev (>= 7.1.0),
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),
libboost-dev,
libboost-filesystem-dev,
libboost-log-dev,
Expand Down Expand Up @@ -41,9 +41,9 @@ Depends:
gstreamer1.0-plugins-base,
gstreamer1.0-plugins-good,
gstreamer1.0-plugins-ugly,
kurento-module-core (>= 7.1.0),
kurento-module-elements (>= 7.1.0),
kurento-module-filters (>= 7.1.0),
kurento-module-core (>= 7.1.1),
kurento-module-elements (>= 7.1.1),
kurento-module-filters (>= 7.1.1),
libgstreamer-plugins-base1.0-0,
Suggests:
kurento-dbg,
Expand All @@ -61,12 +61,12 @@ Section: devel
Depends:
${misc:Depends},
cmake,
kurento-cmake-utils (>= 7.1.0),
kurento-cmake-utils (>= 7.1.1),
kurento-media-server (= ${binary:Version}),
kurento-module-core-dev (>= 7.1.0),
kurento-module-creator (>= 7.1.0),
kurento-module-elements-dev (>= 7.1.0),
kurento-module-filters-dev (>= 7.1.0),
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),
libboost-log-dev,
libboost-program-options-dev,
libboost-thread-dev,
Expand Down
4 changes: 2 additions & 2 deletions server/module-core/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
kurento-module-core (7.1.0-1kurento1) UNRELEASED; urgency=medium
kurento-module-core (7.1.1-1kurento1) UNRELEASED; urgency=medium

[ Kurento ]
* UNRELEASED

-- Saul Pablo Labajo Izquierdo <[email protected]> Mon, 16 Sep 2024 14:29:55 +0000
-- Saul Pablo Labajo Izquierdo <[email protected]> Fri, 20 Sep 2024 09:56:15 +0000

kms-core (6.18.0-0kurento1) testing; urgency=medium

Expand Down
14 changes: 7 additions & 7 deletions server/module-core/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Build-Depends:
gstreamer1.0-plugins-base,
gstreamer1.0-plugins-good,
gstreamer1.0-plugins-ugly,
kurento-cmake-utils (>= 7.1.0),
kurento-jsonrpc-dev (>= 7.1.0),
kurento-module-creator (>= 7.1.0),
kurento-cmake-utils (>= 7.1.1),
kurento-jsonrpc-dev (>= 7.1.1),
kurento-module-creator (>= 7.1.1),
libboost-filesystem-dev,
libboost-regex-dev,
libboost-system-dev,
Expand All @@ -36,7 +36,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
gstreamer1.0-plugins-base,
kurento-jsonrpc (>= 7.1.0),
kurento-jsonrpc (>= 7.1.1),
Breaks:
kms-core-6.0,
kms-core,
Expand All @@ -51,10 +51,10 @@ Architecture: any
Section: libdevel
Depends:
${misc:Depends},
kurento-cmake-utils (>= 7.1.0),
kurento-jsonrpc-dev (>= 7.1.0),
kurento-cmake-utils (>= 7.1.1),
kurento-jsonrpc-dev (>= 7.1.1),
kurento-module-core (= ${binary:Version}),
kurento-module-creator (>= 7.1.0),
kurento-module-creator (>= 7.1.1),
libboost-filesystem-dev,
libboost-regex-dev,
libboost-system-dev,
Expand Down
2 changes: 1 addition & 1 deletion server/module-core/src/server/interface/core.kmd.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "core",
"version": "7.1.0",
"version": "7.1.1-dev",
"code": {
"kmd": {
"java": {
Expand Down
4 changes: 2 additions & 2 deletions server/module-creator/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
kurento-module-creator (7.1.0-1kurento1) UNRELEASED; urgency=medium
kurento-module-creator (7.1.1-1kurento1) UNRELEASED; urgency=medium

[ Kurento ]
* UNRELEASED

-- Saul Pablo Labajo Izquierdo <[email protected]> Mon, 16 Sep 2024 14:29:55 +0000
-- Saul Pablo Labajo Izquierdo <[email protected]> Fri, 20 Sep 2024 09:56:15 +0000

kurento-module-creator (6.18.0-0kurento1) testing; urgency=medium

Expand Down
2 changes: 1 addition & 1 deletion server/module-creator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- Maven coordinates -->
<groupId>org.kurento</groupId>
<artifactId>kurento-module-creator</artifactId>
<version>7.1.0</version>
<version>7.1.1-SNAPSHOT</version>
<packaging>jar</packaging>

<!-- Project-level information -->
Expand Down
Loading

0 comments on commit 3ca11c1

Please sign in to comment.