From f5a8ad80318205c11b7289d90c1d53586fbbc9b5 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Sat, 27 Apr 2024 15:52:15 +0300 Subject: [PATCH] app-dependency: update Cartridge to 2.10.0 --- CHANGELOG.md | 7 ++++++- .../templates/cartridge/{{ .NameToLower }}-scm-1.rockspec | 2 +- examples/getting-started-app/README.md | 2 +- examples/getting-started-app/README_RUS.md | 2 +- .../getting-started-app/getting-started-app-scm-1.rockspec | 2 +- test/integration/cli/test_version.py | 2 +- test/integration/create/test_create.py | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce419ffc..b9d70cf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,16 @@ 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.10.0` in application template. + ## [2.12.11] - 2024-04-02 ### 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 index 93e7f56b..a18e911d 100644 --- a/cli/create/templates/cartridge/{{ .NameToLower }}-scm-1.rockspec +++ b/cli/create/templates/cartridge/{{ .NameToLower }}-scm-1.rockspec @@ -8,7 +8,7 @@ dependencies = { 'tarantool', 'lua >= 5.1', 'checks == 3.3.0-1', - 'cartridge == 2.8.4-1', + 'cartridge == 2.10.0-1', 'metrics == 1.0.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 index 78523698..9370ff39 100644 --- a/examples/getting-started-app/README.md +++ b/examples/getting-started-app/README.md @@ -661,7 +661,7 @@ dependencies = { 'tarantool', 'lua >= 5.1', 'checks == 3.3.0-1', - 'cartridge == 2.8.4-1', + 'cartridge == 2.10.0-1', 'ldecnumber == 1.1.3-1', 'metrics == 1.0.0-1', 'cartridge-metrics-role == 0.1.1-1', diff --git a/examples/getting-started-app/README_RUS.md b/examples/getting-started-app/README_RUS.md index e391fc38..4cf9ef3e 100644 --- a/examples/getting-started-app/README_RUS.md +++ b/examples/getting-started-app/README_RUS.md @@ -655,7 +655,7 @@ dependencies = { 'tarantool', 'lua >= 5.1', 'checks == 3.3.0-1', - 'cartridge == 2.8.4-1', + 'cartridge == 2.10.0-1', 'ldecnumber == 1.1.3-1', 'metrics == 1.0.0-1', 'cartridge-metrics-role == 0.1.1-1', diff --git a/examples/getting-started-app/getting-started-app-scm-1.rockspec b/examples/getting-started-app/getting-started-app-scm-1.rockspec index d2a78834..21cd3e97 100644 --- a/examples/getting-started-app/getting-started-app-scm-1.rockspec +++ b/examples/getting-started-app/getting-started-app-scm-1.rockspec @@ -8,7 +8,7 @@ dependencies = { 'tarantool', 'lua >= 5.1', 'checks == 3.3.0-1', - 'cartridge == 2.8.4-1', + 'cartridge == 2.10.0-1', 'ldecnumber == 1.1.3-1', 'metrics == 1.0.0-1', 'cartridge-metrics-role == 0.1.1-1', diff --git a/test/integration/cli/test_version.py b/test/integration/cli/test_version.py index 7c01d8cc..77adbab4 100644 --- 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.5.0-1, 2.10.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 index 75d3922c..fdc5de19 100644 --- a/test/integration/create/test_create.py +++ b/test/integration/create/test_create.py @@ -106,7 +106,7 @@ def app_template(tmpdir): 'tarantool', 'lua >= 5.1', 'checks == 3.3.0-1', - 'cartridge == 2.8.4-1', + 'cartridge == 2.10.0-1', 'metrics == 1.0.0-1', 'cartridge-metrics-role == 0.1.1-1', }