SecureDrop 2.2.0

freedomofpress · Feb 17, 2022 · b773d88 · b773d88
1 parent 5626a6e
commit b773d88
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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 <[email protected]>  Wed, 16 Feb 2022 11:53:39 -0800
-
-securedrop-app-code (2.2.0~rc2+focal) focal; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 09 Feb 2022 09:42:43 -0800
-
-securedrop-app-code (2.2.0~rc1+focal) focal; urgency=medium
-
-  * see changelog.md
-
- -- SecureDrop Team <[email protected]>  Thu, 03 Feb 2022 17:06:28 -0800
-
-securedrop-app-code (2.2.0~rc1+focal) focal; urgency=medium
-
-  * see changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 20 Oct 2021 10:31:48 -0400
+ -- SecureDrop Team <[email protected]>  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
@@ -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
@@ -1 +1 @@
-2.1.0
+2.2.0
diff --git 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
@@ -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="[email protected]",
     description="SecureDrop Server",