From 97167146f6ea6645b71dcd82bbc6cf7108844272 Mon Sep 17 00:00:00 2001
From: Luca <lucabel@gmail.com>
Date: Wed, 20 Dec 2023 09:48:37 +0100
Subject: [PATCH] fix versions removing duplicates and merge ldap section (#24)

* fix version removing duplicates and merge dap section
* set design.plone.contenttypes to 6.1.7
---
 CHANGELOG.md | 11 +++++++++++
 versions.cfg | 33 +++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18e90ca..3e98091 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 20231220-01
+- Update versions for pas.plugins.ldap dependencies [lucabel]
+  - yafowil.plone = 5.0.0a1
+  - yafowil.bootstrap = 2.0.0a1
+
+- Merge two section with pas.plusings.ldap dependencies versions [lucabel]
+
+- design.plone.contenttypes 6.1.6 -> 6.1.7
+  - Improved "Check notizie" view [lucabel]
+  - Fixed label for tassonomia_evento taxonomies [filippo] 
+
 ## 20231218-01
 - Upgrade Plone 6.0.4 -> 6.0.8 [mamico]
 - redturtle.prenotazioni 2.2.5 -> 2.3.0 [cekk]
diff --git a/versions.cfg b/versions.cfg
index ab88735..50aa352 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -42,7 +42,7 @@ collective.volto.socialsettings = 0.2.1
 collective.volto.subfooter = 1.1.0
 collective.volto.subsites = 1.4.0
 collective.z3cform.datagridfield = 3.0.1
-design.plone.contenttypes = 6.1.6
+design.plone.contenttypes = 6.1.7
 design.plone.policy = 5.0.7
 eea.api.taxonomy = 1.5
 et-xmlfile = 1.1.0
@@ -73,13 +73,6 @@ zope.index = 5.2.1
 node.ext.zodb = 1.3
 plumber = 1.7
 
-# ldap
-node = 1.1
-node.ext.ldap = 1.1
-odict = 1.9.0
-pas.plugins.ldap = 1.8.2
-node.ext.ugm = 1.0
-
 # dev
 Products.ZMIntrospection = 1.0
 experimental.gracefulblobmissing = 1.0
@@ -122,20 +115,24 @@ psycopg2 = 2.9.6
 perfmetrics = 3.3.0
 
 # LDAP
-pas.plugins.ldap = 1.8.2
-yafowil.yaml = 2.0
-yafowil.widget.dict = 1.8
-yafowil.widget.array = 1.7
-yafowil.plone = 4.0.0a5
-yafowil = 3.1.0
-python-ldap = 3.4.3
-five.globalrequest = 99.1
 bda.cache = 1.3.0
+five.globalrequest = 99.1
 node = 1.2.1
-pyasn1-modules = 0.3.0
-pyasn1 = 0.5.0
+node.ext.ldap = 1.1
+node.ext.ugm = 1.0
+odict = 1.9.0
+pas.plugins.ldap = 1.8.2
 passlib = 1.7.4
+pyasn1 = 0.5.0
+pyasn1-modules = 0.3.0
+python-ldap = 3.4.3
 python-memcached = 1.59
+yafowil = 3.1.0
+yafowil.bootstrap = 2.0.0a1
+yafowil.plone = 5.0.0a1
+yafowil.widget.array = 1.7
+yafowil.widget.dict = 1.8
+yafowil.yaml = 2.0
 
 # buildout
 plone.recipe.haproxy = 2.0.0