diff --git a/changelog.md b/changelog.md index 01db1c9d65..1f9a9cd65c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 2.2.0~rc3 +## 2.2.0 ### Web applications diff --git a/install_files/ansible-base/group_vars/all/securedrop b/install_files/ansible-base/group_vars/all/securedrop index 331c9fb40d..6a494e1fbb 100644 --- a/install_files/ansible-base/group_vars/all/securedrop +++ b/install_files/ansible-base/group_vars/all/securedrop @@ -2,7 +2,7 @@ # Variables that apply to both the app and monitor server go in this file # If the monitor or app server need different values define the variable in # hosts_vars/app.yml or host_vars/mon.yml -securedrop_version: "2.2.0~rc3" +securedrop_version: "2.2.0" securedrop_app_code_sdist_name: "securedrop-app-code-{{ securedrop_version | replace('~', '-') }}.tar.gz" grsecurity: true diff --git a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal index ee960003f3..d56ae969b1 100644 --- a/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal +++ b/install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal @@ -1,26 +1,8 @@ -securedrop-app-code (2.2.0~rc3+focal) focal; urgency=medium +securedrop-app-code (2.2.0+focal) focal; urgency=medium * See changelog.md - -- SecureDrop Team Wed, 16 Feb 2022 11:53:39 -0800 - -securedrop-app-code (2.2.0~rc2+focal) focal; urgency=medium - - * See changelog.md - - -- SecureDrop Team Wed, 09 Feb 2022 09:42:43 -0800 - -securedrop-app-code (2.2.0~rc1+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team Thu, 03 Feb 2022 17:06:28 -0800 - -securedrop-app-code (2.2.0~rc1+focal) focal; urgency=medium - - * see changelog.md - - -- SecureDrop Team Wed, 20 Oct 2021 10:31:48 -0400 + -- SecureDrop Team Thu, 17 Feb 2022 11:04:38 -0800 securedrop-app-code (2.1.0+focal) focal; urgency=medium diff --git a/molecule/builder-focal/tests/vars.yml b/molecule/builder-focal/tests/vars.yml index 9dfc74587a..50e09e9286 100644 --- a/molecule/builder-focal/tests/vars.yml +++ b/molecule/builder-focal/tests/vars.yml @@ -1,5 +1,5 @@ --- -securedrop_version: "2.2.0~rc3" +securedrop_version: "2.2.0" ossec_version: "3.6.0" keyring_version: "0.1.5" config_version: "0.1.4" diff --git a/molecule/shared/stable.ver b/molecule/shared/stable.ver index 7ec1d6db40..ccbccc3dc6 100644 --- a/molecule/shared/stable.ver +++ b/molecule/shared/stable.ver @@ -1 +1 @@ -2.1.0 +2.2.0 diff --git a/securedrop/version.py b/securedrop/version.py index 046a64c84d..04188a16d9 100644 --- a/securedrop/version.py +++ b/securedrop/version.py @@ -1 +1 @@ -__version__ = '2.2.0~rc3' +__version__ = '2.2.0' diff --git a/setup.py b/setup.py index 2a4c8643b4..28e742276f 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setuptools.setup( name="securedrop-app-code", - version="2.2.0~rc3", + version="2.2.0", author="Freedom of the Press Foundation", author_email="securedrop@freedom.press", description="SecureDrop Server",