From b380a0b5a4fc76a14519181620e3c20e4eef9563 Mon Sep 17 00:00:00 2001
From: Anna Shamray <anna.shamray@maykinmedia.nl>
Date: Thu, 29 Aug 2024 16:48:54 +0200
Subject: [PATCH] :bookmark: release 2.2.1

---
 .bumpversion.cfg                    |  2 +-
 CHANGELOG.rst                       | 20 ++++++++++++++++++--
 README.NL.rst                       |  7 +++++--
 README.rst                          |  7 +++++--
 package-lock.json                   |  4 ++--
 package.json                        |  2 +-
 publiccode.yaml                     |  2 +-
 src/objecttypes/api/v2/openapi.yaml |  2 +-
 src/objecttypes/conf/api.py         |  4 ++--
 9 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index a906260d..33142dac 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 2.2.0
+current_version = 2.2.1
 
 [bumpversion:file:README.rst]
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 37729cda..de7ac89a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,17 +2,33 @@
 Change history
 ==============
 
-2.x (TBD)
+2.2.1 (2024-08-29)
 ------------------
 
 **New features**
 
-* made user emails unique to prevent two users logging in with the same email, causing an error
+* made user emails unique to prevent two users logging in with the same email, causing an error (maykinmedia/open-api-framework#39)
+* updated open-api-framework to 0.8.0, which includes adding CSRF, CSP and HSTS settings (#124).
+  All new environment variables are added to the `documentation <https://objects-and-objecttypes-api.readthedocs.io/en/latest/installation/config.html>`_
 
 .. warning::
     User email addresses will now be unique on a database level. The database migration will fail if there are already
     two or more users with the same email address. You must ensure this is not the case before upgrading.
 
+.. warning::
+
+    SECURE_HSTS_SECONDS has been added with a default of 31536000 seconds, ensure that
+    before upgrading to this version of open-api-framework, your entire application is served
+    over HTTPS, otherwise this setting can break parts of your application (see https://docs.djangoproject.com/en/4.2/ref/middleware/#http-strict-transport-security)
+
+
+**Bugfixes and QOL**
+
+* fixed CSS style of help-text icon in the Admin (open-zaak/open-notificaties#150)
+* bumped python dependencies due to security issues: django, celery, certifi, maykin-2fa, mozilla-django-oidc-db,
+  sentry-sdk, webob and others (#122, #123)
+
+
 2.2.0 (2024-06-27)
 ------------------
 
diff --git a/README.NL.rst b/README.NL.rst
index 3400be05..4987b5c8 100644
--- a/README.NL.rst
+++ b/README.NL.rst
@@ -2,7 +2,7 @@
 Objecttypen API
 ===============
 
-:Version: 2.2.0
+:Version: 2.2.1
 :Source: https://github.com/maykinmedia/objecttypes-api
 :Keywords: objecten, assets, zaakobjecten
 
@@ -36,7 +36,10 @@ Versie          Release datum   API specificatie
 ==============  ==============  =============================
 latest          n/a             `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/src/objecttypes/api/v2/openapi.yaml>`_,
                                 `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/src/objecttypes/api/v2/openapi.yaml>`_,
-                                (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/2.2.0..master#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
+                                (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/2.2.1..master#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
+2.2.1           2022-08-23      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.1/src/objecttypes/api/v2/openapi.yaml>`_,
+                                `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.1/src/objecttypes/api/v2/openapi.yaml>`_
+                                (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/2.2.0..2.2.1#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
 2.2.0           2022-06-24      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.0/src/objecttypes/api/v2/openapi.yaml>`_,
                                 `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.0/src/objecttypes/api/v2/openapi.yaml>`_
                                 (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/2.0.0..2.2.0#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
diff --git a/README.rst b/README.rst
index 87dfa927..31869ba7 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
 Objecttypes API
 ===============
 
-:Version: 2.2.0
+:Version: 2.2.1
 :Source: https://github.com/maykinmedia/objecttypes-api
 :Keywords: objects, assets, zaakobjecten
 
@@ -35,7 +35,10 @@ Version         Release date    API specification
 ==============  ==============  =============================
 latest          n/a             `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/src/objecttypes/api/v2/openapi.yaml>`_,
                                 `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/master/src/objecttypes/api/v2/openapi.yaml>`_,
-                                (`diff <https://github.com/maykinmedia/objecttypes-api/compare/2.2.0..master#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
+                                (`diff <https://github.com/maykinmedia/objecttypes-api/compare/2.2.1..master#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
+2.2.1           2022-08-23      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.1/src/objecttypes/api/v2/openapi.yaml>`_,
+                                `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.1/src/objecttypes/api/v2/openapi.yaml>`_
+                                (`diff <https://github.com/maykinmedia/objecttypes-api/compare/2.2.0..2.2.1#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
 2.2.0           2022-06-24      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.0/src/objecttypes/api/v2/openapi.yaml>`_,
                                 `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.2.0/src/objecttypes/api/v2/openapi.yaml>`_
                                 (`diff <https://github.com/maykinmedia/objecttypes-api/compare/2.0.0..2.2.0#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
diff --git a/package-lock.json b/package-lock.json
index 67ea8b42..021ff14c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "objecttypes",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "objecttypes",
-      "version": "2.2.0",
+      "version": "2.2.1",
       "license": "EUPL",
       "dependencies": {
         "microscope-sass": "latest",
diff --git a/package.json b/package.json
index e8ffce39..1a1962db 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "objecttypes",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "objecttypes project",
   "main": "src/objecttypes/static/bundles/objecttypes-js.js",
   "directories": {
diff --git a/publiccode.yaml b/publiccode.yaml
index f67a5d1e..c32d4579 100644
--- a/publiccode.yaml
+++ b/publiccode.yaml
@@ -7,7 +7,7 @@ publiccodeYmlVersion: '0.2'
 name: Objecttypes API
 url: 'http://github.com/maykinmedia/objecttypes-api.git'
 softwareType: standalone/backend
-softwareVersion: 2.2.0
+softwareVersion: 2.2.1
 releaseDate: '2021-01-13'
 logo: 'https://github.com/maykinmedia/objects-api/blob/master/docs/logo.png'
 platforms:
diff --git a/src/objecttypes/api/v2/openapi.yaml b/src/objecttypes/api/v2/openapi.yaml
index ddc6522c..eceb5d02 100644
--- a/src/objecttypes/api/v2/openapi.yaml
+++ b/src/objecttypes/api/v2/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: Objecttypes API
-  version: 2.2.0 (v2)
+  version: 2.2.1 (v2)
   description: |+
     An API to manage Object types.
 
diff --git a/src/objecttypes/conf/api.py b/src/objecttypes/conf/api.py
index fb7e0ccc..d8fe46fd 100644
--- a/src/objecttypes/conf/api.py
+++ b/src/objecttypes/conf/api.py
@@ -1,7 +1,7 @@
 from vng_api_common.conf.api import *  # noqa - imports white-listed
 
-API_VERSION = "2.2.0"
-VERSIONS = {"v1": "1.2.0", "v2": "2.2.0"}
+API_VERSION = "2.2.1"
+VERSIONS = {"v1": "1.2.0", "v2": "2.2.1"}
 
 
 # api settings