move to CMF2.3

component/egg-patch/Products.DCWorkflow/workflow_method.patch

-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/DCWorkflow.py	2013-10-31 16:42:05.021141352 +0100
-@@ -40,6 +40,7 @@
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/DCWorkflow.py	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/DCWorkflow.py	2019-09-13 17:51:27.396181694 +0200
+@@ -37,6 +37,7 @@
  from Products.DCWorkflow.permissions import ManagePortal
  from Products.DCWorkflow.Transitions import TRIGGER_AUTOMATIC
  from Products.DCWorkflow.Transitions import TRIGGER_USER_ACTION
@@ -9,7 +9,7 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
  from Products.DCWorkflow.utils import Message as _
  from Products.DCWorkflow.utils import modifyRolesForGroup
  from Products.DCWorkflow.utils import modifyRolesForPermission
-@@ -281,6 +282,52 @@
+@@ -277,6 +278,52 @@
              raise Unauthorized(action)
          self._changeStateOf(ob, tdef, kw)
  
@@ -62,9 +62,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
      security.declarePrivate('isInfoSupported')
      def isInfoSupported(self, ob, name):
          '''
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properties.dtml	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transition_properties.dtml	2013-10-31 16:42:05.021141352 +0100
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transition_properties.dtml	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transition_properties.dtml	2019-09-13 17:53:15.309111199 +0200
 @@ -56,6 +56,16 @@
  </tr>
  
@@ -82,9 +82,9 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transition_properti
  <th align="left">Script (before)</th>
  <td>
  <select name="script_name">
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/dtml/transitions.dtml	2013-10-31 16:42:05.021141352 +0100
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/dtml/transitions.dtml	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/dtml/transitions.dtml	2019-09-13 17:54:18.323989786 +0200
 @@ -17,7 +17,8 @@
    <td>
     Destination state: <code><dtml-if new_state_id>&dtml-new_state_id;<dtml-else>(Remain in state)</dtml-if></code> <br />
@@ -95,26 +95,26 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/dtml/transitions.dtml Pr
     <br />
     <dtml-if script_name>
       Script (before): &dtml-script_name;
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/exportimport.py	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/exportimport.py	2013-10-31 16:42:09.221141578 +0100
-@@ -34,7 +34,7 @@
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/exportimport.py	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/exportimport.py	2019-09-13 17:55:03.758065281 +0200
+@@ -32,7 +32,7 @@
  from Products.GenericSetup.interfaces import ISetupEnviron
  from Products.GenericSetup.utils import BodyAdapterBase
  
--TRIGGER_TYPES = ( 'AUTOMATIC', 'USER' )
-+TRIGGER_TYPES = ( 'AUTOMATIC', 'USER', 'METHOD' )
+-TRIGGER_TYPES = ('AUTOMATIC', 'USER')
++TRIGGER_TYPES = ('AUTOMATIC', 'USER', 'METHOD')
  _FILENAME = 'workflows.xml'
  
  
-diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py
---- Products.DCWorkflow-2.2.4/Products/DCWorkflow/Transitions.py	2011-11-01 18:55:01.000000000 +0100
-+++ Products.DCWorkflow-2.2.4nxd001/Products/DCWorkflow/Transitions.py	2013-10-31 16:42:12.389141749 +0100
-@@ -31,6 +31,7 @@
+diff -uNr Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py
+--- Products.DCWorkflow-2.3.0/Products/DCWorkflow/Transitions.py	2017-05-04 11:35:48.000000000 +0200
++++ Products.DCWorkflow-2.3.0nxd001/Products/DCWorkflow/Transitions.py	2019-09-13 17:56:55.071150292 +0200
+@@ -29,6 +29,7 @@
  
  TRIGGER_AUTOMATIC = 0
  TRIGGER_USER_ACTION = 1
 +TRIGGER_WORKFLOW_METHOD = 2
  
  
- class TransitionDefinition (SimpleItem):
+ class TransitionDefinition(SimpleItem):

stack/erp5/buildout.cfg

@@ -385,21 +385,11 @@ setup-eggs =
   eggtestinfo
 egg = ${:_buildout_section_name_}
 
-[Products.CMFUid]
-<= zope-product-with-eggtestinfo
-[Products.CMFActionIcons]
-<= zope-product-with-eggtestinfo
-[Products.CMFCalendar]
-<= zope-product-with-eggtestinfo
 [Products.CMFCore]
 <= zope-product-with-eggtestinfo
-[Products.CMFDefault]
-<= zope-product-with-eggtestinfo
-[Products.CMFTopic]
-<= zope-product-with-eggtestinfo
 [Products.DCWorkflow]
 <= zope-product-with-eggtestinfo
-Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#975b49e96bae33ac8563454fe5fa9899
+Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#0bd00af377750253bd275f2ccfdf9379
 Products.DCWorkflow-patch-options = -p1
 [Products.GenericSetup]
 <= zope-product-with-eggtestinfo
@@ -497,13 +487,8 @@ eggs = ${neoppod:eggs}
   Products.PluggableAuthService
   Products.PluginRegistry
 
-# CMF 2.2
-  ${Products.CMFActionIcons:egg}
-  ${Products.CMFCalendar:egg}
+# CMF 2.3
   ${Products.CMFCore:egg}
-  ${Products.CMFDefault:egg}
-  ${Products.CMFTopic:egg}
-  ${Products.CMFUid:egg}
   ${Products.DCWorkflow:egg}
   ${Products.GenericSetup:egg}
   five.localsitemanager
@@ -607,7 +592,7 @@ depends =
 
 # patched eggs
 Acquisition = 2.13.12+SlapOSPatched001
-Products.DCWorkflow = 2.2.4+SlapOSPatched001
+Products.DCWorkflow = 2.3.0+SlapOSPatched001
 ocropy = 1.0+SlapOSPatched001
 pysvn = 1.7.10+SlapOSPatched002
 python-ldap = 2.4.32+SlapOSPatched001
@@ -630,12 +615,8 @@ rdiff-backup = 1.0.5+SlapOSPatched001
 # modified version that works fine for buildout installation
 SOAPpy = 0.12.0nxd001
 
-# CMF 2.3 is not yet supported.
-Products.CMFCalendar = 2.2.3
-Products.CMFCore = 2.2.10
-Products.CMFDefault = 2.2.4
-Products.CMFTopic = 2.2.1
-Products.CMFUid = 2.2.1
+# CMF 2.3
+Products.CMFCore = 2.3.1
 
 # newer version requires zope.traversing>=4.0.0a2.
 zope.app.appsetup = 3.16.0
@@ -649,11 +630,10 @@ zope.app.testing = 3.8.1
 # Pinned versions
 APacheDEX = 1.8
 Pillow = 6.2.2
-Products.CMFActionIcons = 2.1.3
 Products.DCWorkflowGraph = 0.4.1
 # Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
 Products.ExternalEditor = 1.1.1
-Products.GenericSetup = 1.8.6
+Products.GenericSetup = 1.8.7
 Products.LongRequestLogger = 2.1.0
 # Products.MimetypesRegistry 2.1 requires AccessControl>=3.0.0Acquisition.
 Products.MimetypesRegistry = 2.0.10