app-dependency: update Cartridge to 2.12.2 and metrics to 1.2.0

tarantool · Jul 25, 2024 · a4cd2c6 · a4cd2c6
1 parent 7f7efcf
commit a4cd2c6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+- Update `cartridge` to `2.12.2` and `metrics` to `1.2.0` in application template.
+
 ## [2.12.12] - 2024-05-07
 
 ### Fixed
@@ -15,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-- Updated the `go` and `docker` package versions used to build the binary, 
+- Updated the `go` and `docker` package versions used to build the binary,
   that fixes known security issues.
 
 ## [2.12.10] - 2023-12-14

diff --git a/cli/create/templates/cartridge/{{ .NameToLower }}-scm-1.rockspec b/cli/create/templates/cartridge/{{ .NameToLower }}-scm-1.rockspec
@@ -8,8 +8,8 @@ dependencies = {
     'tarantool',
     'lua >= 5.1',
     'checks == 3.3.0-1',
-    'cartridge == 2.8.4-1',
-    'metrics == 1.0.0-1',
+    'cartridge == 2.12.2-1',
+    'metrics == 1.2.0-1',
     'cartridge-metrics-role == 0.1.1-1',
     'cartridge-cli-extensions == 1.1.1-1',
 }

diff --git a/examples/getting-started-app/README.md b/examples/getting-started-app/README.md
@@ -661,9 +661,9 @@ dependencies = {
     'tarantool',
     'lua >= 5.1',
     'checks == 3.3.0-1',
-    'cartridge == 2.8.4-1',
+    'cartridge == 2.12.2-1',
     'ldecnumber == 1.1.3-1',
-    'metrics == 1.0.0-1',
+    'metrics == 1.2.0-1',
     'cartridge-metrics-role == 0.1.1-1',
 }
 build = {

diff --git a/examples/getting-started-app/README_RUS.md b/examples/getting-started-app/README_RUS.md
@@ -655,9 +655,9 @@ dependencies = {
     'tarantool',
     'lua >= 5.1',
     'checks == 3.3.0-1',
-    'cartridge == 2.8.4-1',
+    'cartridge == 2.12.2-1',
     'ldecnumber == 1.1.3-1',
-    'metrics == 1.0.0-1',
+    'metrics == 1.2.0-1',
     'cartridge-metrics-role == 0.1.1-1',
 }
 build = {

diff --git a/examples/getting-started-app/getting-started-app-scm-1.rockspec b/examples/getting-started-app/getting-started-app-scm-1.rockspec
@@ -8,9 +8,9 @@ dependencies = {
     'tarantool',
     'lua >= 5.1',
     'checks == 3.3.0-1',
-    'cartridge == 2.8.4-1',
+    'cartridge == 2.12.2-1',
     'ldecnumber == 1.1.3-1',
-    'metrics == 1.0.0-1',
+    'metrics == 1.2.0-1',
     'cartridge-metrics-role == 0.1.1-1',
 }
 build = {

diff --git a/test/integration/cli/test_version.py b/test/integration/cli/test_version.py
@@ -144,5 +144,5 @@ def test_duplicate_cartridge_no_rocks_flag(project_with_cartridge, cartridge_cmd
 
     rc, output = run_command_and_get_output(cmd)
     assert rc == 0
-    assert "Version:\t2.5.0-1, 2.8.4-1" in output
+    assert "Version:\t2.12.2-1, 2.5.0-1" in output
     assert "Found multiple versions of Cartridge in rocks manifest" in output
diff --git a/test/integration/create/test_create.py b/test/integration/create/test_create.py
@@ -106,8 +106,8 @@ def app_template(tmpdir):
     'tarantool',
     'lua >= 5.1',
     'checks == 3.3.0-1',
-    'cartridge == 2.8.4-1',
-    'metrics == 1.0.0-1',
+    'cartridge == 2.12.2-1',
+    'metrics == 1.2.0-1',
     'cartridge-metrics-role == 0.1.1-1',
 }
 build = {