Merge pull request #90 from plone/5.0-nocmfdefault2

Remove CMFDefault from buildout config
plone · Jun 28, 2015 · 24159d7 · 24159d7
2 parents c22e944 + 80ab36b
commit 24159d7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 25 deletions.
diff --git a/jenkins-package-dependencies.cfg b/jenkins-package-dependencies.cfg
@@ -82,12 +82,12 @@ mode = 755
 [jenkins-package-dependencies-cmf]
 <= package-dependencies-generic
 output = ${buildout:bin-directory}/jenkins-package-dependencies-cmf
-distributions = CMFCore CMFDefault CMFDiffTool CMFDynamicViewFTI CMFEditions CMFFormController CMFPlacefulWorkflow CMFQuickInstallerTool CMFUid
+distributions = CMFCore CMFDiffTool CMFDynamicViewFTI CMFEditions CMFFormController CMFPlacefulWorkflow CMFQuickInstallerTool CMFUid
 
 [jenkins-package-dependencies-cmf-imports]
 <= package-dependencies-generic-imports
 output = ${buildout:bin-directory}/jenkins-package-dependencies-cmf-imports
-distributions = Products.CMFCore Products.CMFDefault Products.CMFDiffTool Products.CMFDynamicViewFTI Products.CMFEditions Products.CMFFormController Products.CMFPlacefulWorkflow Products.CMFQuickInstallerTool Products.CMFUid
+distributions = Products.CMFCore Products.CMFDiffTool Products.CMFDynamicViewFTI Products.CMFEditions Products.CMFFormController Products.CMFPlacefulWorkflow Products.CMFQuickInstallerTool Products.CMFUid
 
 [jenkins-package-dependencies-pac]
 <= package-dependencies-generic

diff --git a/plips/plip-nocmfdefault.cfg b/plips/plip-nocmfdefault.cfg
diff --git a/tests.cfg b/tests.cfg
@@ -7,7 +7,6 @@ test-eggs =
     Products.ATContentTypes [test]
     Products.Archetypes [test]
     Products.CMFCore
-    Products.CMFDefault
     Products.CMFDiffTool
     Products.CMFDynamicViewFTI
     Products.CMFEditions
@@ -234,7 +233,6 @@ AT_plone_app_testing =
     Products.contentmigration
     Products.CMFDynamicViewFTI
 CMF =
-    Products.CMFDefault
     Products.CMFUid
     Products.GenericSetup
     Products.PluggableAuthService

diff --git a/versions.cfg b/versions.cfg
@@ -89,7 +89,6 @@ Plone                                 = 5.0b2
 Products.ATContentTypes               = 2.2.5
 Products.Archetypes                   = 1.10.7
 Products.CMFCore                      = 2.2.8
-Products.CMFDefault                   = 2.2.4
 Products.CMFDiffTool                  = 3.0.1
 Products.CMFDynamicViewFTI            = 4.1.2
 Products.CMFEditions                  = 2.2.13