Release 2.2.0 (#118)

* release 2.2.0 --------- Co-authored-by: Sonny Bakker <[email protected]>
maykinmedia · Jun 27, 2024 · 3a2bc22 · 3a2bc22
1 parent 4126518
commit 3a2bc22
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 29 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 2.1.2
+current_version = 2.2.0
 
 [bumpversion:file:README.rst]
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,37 +2,66 @@
 Change history
 ==============
 
-2.2.0 (WIP)
------------
+2.2.0 (2024-06-27)
+------------------
 
-**Bugfixes and QOL**
+**New features**
 
-* updated to Django 4.2 (objects-api#385)
-* changed caching backend from LocMem to Redis
+* added `name` and `name_plural` fields to objecttype admin list view (#111)
+* added the ``createinitialsuperuser`` command (#92)
+* added ``SUBPATH`` environment variable to the docker compose setup (#108)
 
 .. warning::
 
-   Two-factor authentication is enabled by default. The ``DISABLE_2FA`` environment variable
-   can be used to disable it if needed.
+   Two-factor authentication is enabled by default. The ``DISABLE_2FA``
+   environment variable can be used to disable it if needed.
 
 .. warning::
 
-    Because the caching barefer to env config for envvarsckend was changed to Redis,
-    existing deployments must add a Redis container or Redis instance
-    (see ``Installation > Environment configuration reference`` in the documentation on how to configure) the connection with Redis
+    Because the caching backend was changed to Redis, existing deployments must
+    add a Redis container or Redis instance (see ``Installation > Environment
+    configuration reference`` in the documentation on how to configure) the
+    connection with Redis.
 
 .. warning::
 
-    The service name for Elastic APM is now configurable via the ``ELASTIC_APM_SERVICE_NAME`` environment variable.
-    The default value changed from ``Objecttypes API`` to ``objecttypes - <ENVIRONMENT>``
+    The service name for Elastic APM is now configurable via the
+    ``ELASTIC_APM_SERVICE_NAME`` environment variable. The default value changed
+    from ``Objecttypes API`` to ``objecttypes - <ENVIRONMENT>``.
 
 .. warning::
 
-    The following defaults for environment variables changed for the docker settings, be sure to override them:
+    The following defaults for environment variables changed for the docker
+    settings, be sure to override them:
       * ``DB_NAME``: ``objecttypes`` -> ``postgres``
       * ``DB_USER``: ``objecttypes`` -> ``postgres``
       * ``DB_PASSWORD``: ``objecttypes`` -> ``""``
 
+**Bugfixes and QOL**
+
+* updated to Django 4.2 (objects-api#385)
+* updated python to 3.11 (#117)
+* changed caching backend from LocMem to Redis
+* fixed ``Application groups`` admin changelist page (#116)
+* upgraded open-api-framework to ``0.4.2`` (#116)
+* upgraded various python libraries due to security issues (#109)
+* fixed objecttype admin searching with invalid UUIDs (objects-api#361)
+* updated changelog regarding ``ELASTIC_AP_SERVICE_NAME`` and changes to default values (#113)
+* merged the ``docker-compose-quickstart.yml`` with ``docker-compose.yml`` (#110)
+* refactored various settings and configurations (#102)
+* added Trivy image scanning and add ``publish`` CI step (#107)
+* fixed CodeQL CI action (#106)
+* fixed the styling for OIDC login (#105)
+
+2.1.3 (2024-05-03)
+------------------
+
+Bugfix release
+
+This release addresses a security weakness.
+
+* [GHSA-3wcp-29hm-g82c] replaced PK for Token model.
+
 2.1.2 (2024-02-06)
 ------------------
 

diff --git a/README.NL.rst b/README.NL.rst
@@ -2,7 +2,7 @@
 Objecttypen API
 ===============
 
-:Version: 2.1.2
+:Version: 2.2.0
 :Source: https://github.com/maykinmedia/objecttypes-api
 :Keywords: objecten, assets, zaakobjecten
 
@@ -36,10 +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.1.2..master#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
-2.1.2           2022-06-24      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.1.2/src/objecttypes/api/v2/openapi.yaml>`_,
-                                `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.1.2/src/objecttypes/api/v2/openapi.yaml>`_
-                                (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/2.0.0..2.1.2#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
+                                (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/2.2.0..master#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>`_)
 2.0.0           2021-10-04      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.0.0/src/objecttypes/api/v2/openapi.yaml>`_,
                                 `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.0.0/src/objecttypes/api/v2/openapi.yaml>`_
                                 (`verschillen <https://github.com/maykinmedia/objecttypes-api/compare/1.2.0..2.0.0#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)

diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 Objecttypes API
 ===============
 
-:Version: 2.1.2
+:Version: 2.2.0
 :Source: https://github.com/maykinmedia/objecttypes-api
 :Keywords: objects, assets, zaakobjecten
 
@@ -35,10 +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.1.2..master#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
-2.1.2           2022-06-24      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.1.2/src/objecttypes/api/v2/openapi.yaml>`_,
-                                `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.1.2/src/objecttypes/api/v2/openapi.yaml>`_
-                                (`diff <https://github.com/maykinmedia/objecttypes-api/compare/2.0.0..2.1.2#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)
+                                (`diff <https://github.com/maykinmedia/objecttypes-api/compare/2.2.0..master#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>`_)
 2.0.0           2021-10-04      `ReDoc <https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.0.0/src/objecttypes/api/v2/openapi.yaml>`_,
                                 `Swagger <https://petstore.swagger.io/?url=https://raw.githubusercontent.com/maykinmedia/objecttypes-api/2.0.0/src/objecttypes/api/v2/openapi.yaml>`_
                                 (`diff <https://github.com/maykinmedia/objecttypes-api/compare/1.2.0..2.0.0#diff-b9c28fec6c3f3fa5cff870d24601d6ab7027520f3b084cc767aefd258cb8c40a>`_)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "objecttypes",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "objecttypes project",
   "main": "src/objecttypes/static/bundles/objecttypes-js.js",
   "directories": {

diff --git 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.1.2
+softwareVersion: 2.2.0
 releaseDate: '2021-01-13'
 logo: 'https://github.com/maykinmedia/objects-api/blob/master/docs/logo.png'
 platforms:

diff --git 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.1.2"
-VERSIONS = {"v1": "1.2.0", "v2": "2.1.2"}
+API_VERSION = "2.2.0"
+VERSIONS = {"v1": "1.2.0", "v2": "2.2.0"}
 
 
 # api settings