Prepare for next development iteration

Kurento · Mar 22, 2023 · eab87fe · eab87fe
1 parent c59a5e6
commit eab87fe
Show file tree

Hide file tree

Showing 141 changed files with 490 additions and 400 deletions.
diff --git a/browser/kurento-utils-js/bin/set-versions.sh b/browser/kurento-utils-js/bin/set-versions.sh
@@ -167,9 +167,11 @@ function git_commit {
     fi
 
     # Amend the last commit if one already exists with same message.
-    local GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
-    if ! git log --max-count 1 --grep "^${COMMIT_MSG}$" --format="" --exit-code; then
-        GIT_COMMIT_ARGS+=(--amend)
+    local GIT_COMMIT_ARGS=()
+    if git show --no-patch --format='format:%s' HEAD | grep --quiet "^${COMMIT_MSG}$"; then
+        GIT_COMMIT_ARGS=(--amend --no-edit)
+    else
+        GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
     fi
 
     git commit "${GIT_COMMIT_ARGS[@]}"

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.0.0",
+  "version": "7.0.1-dev",
   "description": "Kurento JavaScript Utilities",
   "keywords": [
     "kurento",

diff --git a/clients/java/bin/set-versions.sh b/clients/java/bin/set-versions.sh
@@ -208,9 +208,11 @@ function git_commit {
     fi
 
     # Amend the last commit if one already exists with same message.
-    local GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
-    if ! git log --max-count 1 --grep "^${COMMIT_MSG}$" --format="" --exit-code; then
-        GIT_COMMIT_ARGS+=(--amend)
+    local GIT_COMMIT_ARGS=()
+    if git show --no-patch --format='format:%s' HEAD | grep --quiet "^${COMMIT_MSG}$"; then
+        GIT_COMMIT_ARGS=(--amend --no-edit)
+    else
+        GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
     fi
 
     git commit "${GIT_COMMIT_ARGS[@]}"

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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+		<version>7.0.1-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.0.0</version>
+	<version>7.0.1-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 
 	<!-- Project-level information -->
@@ -151,7 +151,7 @@
 		<dependency>
 			<groupId>org.kurento</groupId>
 			<artifactId>kurento-module-creator</artifactId>
-			<version>7.0.0</version>
+			<version>7.0.1-SNAPSHOT</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.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 		<relativePath>../qa-pom</relativePath>
 	</parent>
 	<artifactId>kurento-parent-pom</artifactId>
-	<version>7.0.0</version>
+	<version>7.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<!-- Project-level information -->
@@ -69,9 +69,9 @@
 		It's not critical that these versions coincide with the latest available,
 		but whenever an API update is done in those files and released,
 		these version numbers should get updated accordingly. -->
-		<version.kms-api-core>7.0.0</version.kms-api-core>
-		<version.kms-api-elements>7.0.0</version.kms-api-elements>
-		<version.kms-api-filters>7.0.0</version.kms-api-filters>
+		<version.kms-api-core>7.0.1-SNAPSHOT</version.kms-api-core>
+		<version.kms-api-elements>7.0.1-SNAPSHOT</version.kms-api-elements>
+		<version.kms-api-filters>7.0.1-SNAPSHOT</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.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 		<relativePath>parent-pom</relativePath>
 	</parent>
 	<artifactId>kurento-java</artifactId>

diff --git a/clients/java/qa-pom/bin/set-versions.sh b/clients/java/qa-pom/bin/set-versions.sh
@@ -201,9 +201,11 @@ function git_commit {
     fi
 
     # Amend the last commit if one already exists with same message.
-    local GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
-    if ! git log --max-count 1 --grep "^${COMMIT_MSG}$" --format="" --exit-code; then
-        GIT_COMMIT_ARGS+=(--amend)
+    local GIT_COMMIT_ARGS=()
+    if git show --no-patch --format='format:%s' HEAD | grep --quiet "^${COMMIT_MSG}$"; then
+        GIT_COMMIT_ARGS=(--amend --no-edit)
+    else
+        GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
     fi
 
     git commit "${GIT_COMMIT_ARGS[@]}"

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.0.0</version>
+	<version>7.0.1-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.0.0</version>
+		<version>7.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>kurento-qa-config</artifactId>
 

diff --git a/clients/javascript/bin/set-versions.sh b/clients/javascript/bin/set-versions.sh
@@ -167,9 +167,11 @@ function git_commit {
     fi
 
     # Amend the last commit if one already exists with same message.
-    local GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
-    if ! git log --max-count 1 --grep "^${COMMIT_MSG}$" --format="" --exit-code; then
-        GIT_COMMIT_ARGS+=(--amend)
+    local GIT_COMMIT_ARGS=()
+    if git show --no-patch --format='format:%s' HEAD | grep --quiet "^${COMMIT_MSG}$"; then
+        GIT_COMMIT_ARGS=(--amend --no-edit)
+    else
+        GIT_COMMIT_ARGS=(--message "$COMMIT_MSG")
     fi
 
     git commit "${GIT_COMMIT_ARGS[@]}"

diff --git a/clients/javascript/client/package.json b/clients/javascript/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kurento-client",
-  "version": "7.0.0",
+  "version": "7.0.1-dev",
   "description": "JavaScript Client API for Kurento Media Server",
   "keywords": [
     "kurento",
@@ -68,10 +68,10 @@
     "es6-promise": "^4.0.5",
     "extend": "^3.0.0",
     "inherits": "^2.0.0",
-    "kurento-client-core": "7.0.0",
-    "kurento-client-elements": "7.0.0",
-    "kurento-client-filters": "7.0.0",
-    "kurento-jsonrpc": "7.0.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",

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

diff --git a/doc-kurento/VERSIONS.env b/doc-kurento/VERSIONS.env
@@ -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.0.0"
+    [VERSION_DOC]="7.0.1-dev"
 
     # Version of Kurento Media Server
     [VERSION_KMS]="7.0.0"
@@ -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