Merge branch '4.2' of github.com:plone/buildout.coredev into 4.2

wesleybl · May 25, 2012 · 750a74e · 750a74e
2 parents b4e27bf + c50f033
commit 750a74e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/checkouts.cfg b/checkouts.cfg
@@ -8,7 +8,11 @@ auto-checkout =
     Products.CMFPlone
     plone.app.locales
     plone.app.upgrade
-    plone.resource
+    Products.Archetypes
+    plonetheme.classic
+    plonetheme.sunburst
+    plone.app.jquerytools
+    Zope2
 # Test fixes only
     Products.kupu
     Products.CMFCalendar
@@ -17,7 +21,3 @@ auto-checkout =
     Products.CMFPlacefulWorkflow
     Products.PasswordResetTool
     archetypes.kss
-    plone.app.blob
-    plone.app.caching
-    plone.app.kss
-    plone.outputfilters
diff --git a/core.cfg b/core.cfg
@@ -30,8 +30,6 @@ versions = versions
 eggs =
     Products.CMFPlone
     plone.reload
-# temporary bypass for https://bugs.launchpad.net/zope2/+bug/539181
-    roman
 # currently required by Products.CMFCore
     Products.ZSQLMethods
 

diff --git a/jenkins.plone.org/plone-4.2-code-analysis.xml b/jenkins.plone.org/plone-4.2-code-analysis.xml
@@ -49,10 +49,10 @@ bin/jenkins-code-analysis</command>
       <dontComputeNew>true</dontComputeNew>
       <high></high>
       <normal>XXX, BBB, TODO</normal>
-      <low></low>
+      <low>failUnlessEqual, assertEquals, failIfEqual, failUnless, assert_, failIf, failUnlessRaises, failUnlessAlmostEqual, failIfAlmostEqual</low>
       <ignoreCase>false</ignoreCase>
       <pattern>packages/**/*</pattern>
-      <excludePattern>packages/**/*.png, packages/**/*.gif,  packages/**/*.jpg, packages/**/*.zip, packages/**/*.ppt, packages/**/*.jar,   packages/**/*.stx, packages/**/CHANGES.txt, packages/**/HISTORY.txt, packages/**/INSTALL.txt, packages/**/*.rst, packages/**/CHANGELOG.txt, packages/**/ChangeLog</excludePattern>
+      <excludePattern>packages/**/*.png, packages/**/*.gif,  packages/**/*.jpg, packages/**/*.zip, packages/**/*.ppt, packages/**/*.jar,   packages/**/*.stx, packages/**/CHANGES.txt, packages/**/HISTORY.txt, packages/**/INSTALL.txt, packages/**/*.rst, packages/**/CHANGELOG.txt, packages/**/ChangeLog, packages/unittest2, packages/**/*.pyc,packages/**/*.pyo</excludePattern>
     </hudson.plugins.tasks.TasksPublisher>
     <hudson.plugins.warnings.WarningsPublisher>
       <healthy></healthy>

diff --git a/jenkins.plone.org/plone-4.2-tests.xml b/jenkins.plone.org/plone-4.2-tests.xml
@@ -31,7 +31,7 @@
           </logTexts>
           <EscalateStatus>false</EscalateStatus>
           <RunIfJobSuccessful>true</RunIfJobSuccessful>
-          <script>cp -R $WORKSPACE ../last-successful</script>
+          <script>rsync -avz $WORKSPACE $WORKSPACE/../last-successful</script>
         </hudson.plugins.postbuildtask.TaskProperties>
       </tasks>
     </hudson.plugins.postbuildtask.PostbuildTask>

diff --git a/sources.cfg b/sources.cfg
@@ -61,7 +61,7 @@ plone.scale                         = git ${remotes:plone}/plone.scale.git pushu
 plone.session                       = git ${remotes:plone}/plone.session.git pushurl=${remotes:plone_push}/plone.session.git
 plone.stringinterp                  = git ${remotes:plone}/plone.stringinterp.git pushurl=${remotes:plone_push}/plone.stringinterp.git
 plone.subrequest                    = git ${remotes:plone}/plone.subrequest.git pushurl=${remotes:plone_push}/plone.subrequest.git
-plone.supermodel                    = git ${remotes:plone}/plone.supermodel.git pushurl=${remotes:plone_push}/plone.supermodel.git
+plone.supermodel                    = git ${remotes:plone}/plone.supermodel.git pushurl=${remotes:plone_push}/plone.supermodel.git branche=1.1.x
 plone.testing                       = git ${remotes:plone}/plone.testing.git pushurl=${remotes:plone_push}/plone.testing.git
 plone.theme                         = git ${remotes:plone}/plone.theme.git pushurl=${remotes:plone_push}/plone.theme.git
 plone.transformchain                = git ${remotes:plone}/plone.transformchain.git pushurl=${remotes:plone_push}/plone.transformchain.git
@@ -92,7 +92,7 @@ plone.app.openid                    = git ${remotes:plone}/plone.app.openid.git
 plone.app.portlets                  = git ${remotes:plone}/plone.app.portlets.git pushurl=${remotes:plone_push}/plone.app.portlets.git
 plone.app.querystring               = git ${remotes:plone}/plone.app.querystring.git pushurl=${remotes:plone_push}/plone.app.querystring.git
 plone.app.redirector                = git ${remotes:plone}/plone.app.redirector.git pushurl=${remotes:plone_push}/plone.app.redirector.git
-plone.app.registry                  = git ${remotes:plone}/plone.app.registry.git pushurl=${remotes:plone_push}/plone.app.registry.git
+plone.app.registry                  = git ${remotes:plone}/plone.app.registry.git pushurl=${remotes:plone_push}/plone.app.registry.git branch=1.1.x
 plone.app.search                    = git ${remotes:plone}/plone.app.search.git pushurl=${remotes:plone_push}/plone.app.search.git
 plone.app.testing                   = git ${remotes:plone}/plone.app.testing.git pushurl=${remotes:plone_push}/plone.app.testing.git
 plone.app.theming                   = git ${remotes:plone}/plone.app.theming.git pushurl=${remotes:plone_push}/plone.app.theming.git
@@ -156,7 +156,7 @@ Products.PortalTransforms           = git ${remotes:plone}/Products.PortalTransf
 Products.ResourceRegistries         = git ${remotes:plone}/Products.ResourceRegistries.git pushurl=${remotes:plone_push}/Products.ResourceRegistries.git
 Products.SecureMailHost             = svn ${remotes:svn_collective}/SecureMailHost/branches/1.1
 Products.statusmessages             = git ${remotes:plone}/Products.statusmessages.git pushurl=${remotes:plone_push}/Products.statusmessages.git
-Products.TinyMCE                    = git ${remotes:plone}/Products.TinyMCE.git pushurl=${remotes:plone_push}/Products.TinyMCE.git
+Products.TinyMCE                    = git ${remotes:plone}/Products.TinyMCE.git pushurl=${remotes:plone_push}/Products.TinyMCE.git branch=1.2.x
 Products.validation                 = git ${remotes:plone}/Products.validation.git pushurl=${remotes:plone_push}/Products.validation.git
 Products.ZCatalog                   = svn ${remotes:zope}/Products.ZCatalog/trunk
 Products.ZopeVersionControl         = svn ${remotes:zope}/Products.ZopeVersionControl/trunk
diff --git a/versions.cfg b/versions.cfg
@@ -4,6 +4,7 @@ extends = http://download.zope.org/zopetoolkit/index/1.0.6/zopeapp-versions.cfg
 
 [versions]
 # Zope overrides
+docutils = 0.9
 # Products.BTreeFolder2 2.13.4 causes a regression
 Products.BTreeFolder2 = 2.13.3
 Products.ZCatalog = 2.13.23
@@ -71,7 +72,7 @@ Products.PloneTestCase                = 0.9.14
 Products.PluggableAuthService         = 1.8.0
 Products.PluginRegistry               = 1.3
 Products.PortalTransforms             = 2.0.7
-Products.ResourceRegistries           = 2.1.1
+Products.ResourceRegistries           = 2.1.2
 Products.SecureMailHost               = 1.1.2
 Products.TinyMCE                      = 1.2.12
 Products.ZopeVersionControl           = 1.1.3
@@ -94,24 +95,24 @@ five.formlib                          = 1.0.4
 five.globalrequest                    = 1.0
 five.localsitemanager                 = 2.0.5
 kss.core                              = 1.6.3
-plone.app.blob                        = 1.5.1
+plone.app.blob                        = 1.5.2
 plone.app.caching                     = 1.0.3
 plone.app.collection                  = 1.0.3
 plone.app.content                     = 2.0.10
 plone.app.contentmenu                 = 2.0.5
 plone.app.contentlisting              = 1.0.1
 plone.app.contentrules                = 2.1.5
-plone.app.controlpanel                = 2.2.4
+plone.app.controlpanel                = 2.2.5
 plone.app.customerize                 = 1.2.2
 plone.app.discussion                  = 2.1.5
 plone.app.folder                      = 1.0.4
-plone.app.form                        = 2.0.5
+plone.app.form                        = 2.1
 plone.app.i18n                        = 2.0.1
 plone.app.imaging                     = 1.0.6
 plone.app.iterate                     = 2.1.5
 plone.app.jquery                      = 1.4.4
 plone.app.jquerytools                 = 1.3.1
-plone.app.kss                         = 1.7.0
+plone.app.kss                         = 1.7.1
 plone.app.layout                      = 2.2.6
 plone.app.linkintegrity               = 1.4.5
 plone.app.locales                     = 4.0.12
@@ -129,11 +130,11 @@ plone.app.uuid                        = 1.0
 plone.app.viewletmanager              = 2.0.2
 plone.app.vocabularies                = 2.1.6
 plone.app.workflow                    = 2.0.6
-plone.app.z3cform                     = 0.5.8
+plone.app.z3cform                     = 0.6.0
 plone.autoform                        = 1.2
 plone.browserlayer                    = 2.1.1
 plone.cachepurging                    = 1.0.3
-plone.caching                         = 1.0
+plone.caching                         = 1.1
 plone.contentrules                    = 2.0.1
 plone.fieldsets                       = 2.0.1
 plone.folder                          = 1.0.1
@@ -144,14 +145,14 @@ plone.keyring                         = 2.0
 plone.locking                         = 2.0.3
 plone.memoize                         = 1.1.1
 plone.openid                          = 2.0
-plone.outputfilters                   = 1.2
+plone.outputfilters                   = 1.3
 plone.portlet.collection              = 2.1
 plone.portlet.static                  = 2.0.1
 plone.portlets                        = 2.0.2
 plone.protect                         = 2.0
 plone.registry                        = 1.0
 plone.reload                          = 2.0
-plone.resource                        = 1.0
+plone.resource                        = 1.0.1
 plone.rfc822                          = 1.0
 plone.scale                           = 1.2.2
 plone.session                         = 3.5