.

component/ZODB/buildout-zodb3.cfg

@@ -5,22 +5,9 @@
 extends = buildout.cfg
 
 
-# ZODB4: we maintain our own 3-nxd branch with patches for wendelin.core to work
-# correctly. The patches are backports of what is in ZODB master (ZODB5) ... XXX
-[ZODB3]
-recipe  = zc.recipe.egg:develop
-setup   = ${ZODB3-repository:location}
-egg     = ZODB
-
-[ZODB3-repository]
-recipe  = slapos.recipe.build:gitclone
-# XXX kirr -> nexedi
-repository = https://lab.nexedi.com/kirr/ZODB.git
+[ZODB-repository]
 branch  = 3.10-nxd
 #revision= ...	XXX pin
-location = ${buildout:parts-directory}/ZODB3
-git-executable = ${git:location}/bin/git
-
 
 [versions]
 transaction = 1.1.1

component/ZODB/buildout-zodb5.cfg

@@ -4,15 +4,10 @@
 [buildout]
 extends = buildout.cfg
 
-# ZODB5 is plain upstream egg
-[ZODB5]
-recipe  = zc.recipe.egg:eggs
-egg     = ZODB
-eggs    = ${:egg}
 
-[ZODB]
-egg     = ${ZODB5:egg}
+[ZODB-repository]
+branch = master
+#revision = ...  XXX pin
 
 [versions]
-ZODB = 5.6.0
 transaction = 2.4.0

component/ZODB/buildout.cfg

@@ -8,7 +8,7 @@ extends =
 parts = ZODB/scripts
 
 
-# ZODB allows to use either ZODB3, ZODB4 or ZODB5
+# ZODB allows to use either ZODB3, ZODB4 or ZODB5	XXX
 # To select which version to use users should do:
 #
 #   [ZODB]
@@ -31,19 +31,21 @@ eggs    = ${ZODB:egg}
 # correctly. The patches are backports of what is in ZODB master (ZODB5) ... XXX
 [ZODB4]
 recipe  = zc.recipe.egg:develop
-setup   = ${ZODB4-repository:location}
+setup   = ${ZODB-repository:location}
 egg     = ZODB
 
-[ZODB4-repository]
+[ZODB-repository]
 recipe  = slapos.recipe.build:gitclone
 # XXX kirr -> nexedi
 repository = https://lab.nexedi.com/kirr/ZODB.git
+location = ${buildout:parts-directory}/ZODB
+git-executable = ${git:location}/bin/git
+
+
+[ZODB-repository]
 # XXX 4-nxd--t -> 4-nxd
 branch  = 4-nxd--t
 #revision= ...	XXX pin
-location = ${buildout:parts-directory}/ZODB4
-git-executable = ${git:location}/bin/git
-
 
 [versions]
 # TODO update to 4.7.3 once it is released

component/ZODB/test-common.cfg

@@ -7,7 +7,6 @@ extends =
 # appropriate ZODB version.
 
     ../../stack/nxdtest.cfg
-    buildout-dev.cfg
 
 parts =
     ZODB
@@ -18,6 +17,11 @@ parts =
     instance.cfg
 
 
+# unpin ZODB from particular revision; only ${ZODB:branch} is left.
+[ZODB]
+revision=
+
+
 # bin/python is preinstalled with sys.path to ZODB & friends.
 [ZODB-python]
 <= python-interpreter