Skip to content

Commit

Permalink
Merge branch '5.0' of https://github.com/plone/buildout.coredev into 5.0
Browse files Browse the repository at this point in the history 
Conflicts:
	checkouts.cfg
  • Loading branch information
@bloodbare
bloodbare committed Nov 1, 2014
2 parents dcf6448 + 027dc03 commit 41db526
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 39 deletions.
28 changes: 9 additions & 19 deletions checkouts.cfg
View file
@@ -1,40 +1,28 @@
[buildout]
always-checkout = force
auto-checkout =
Plone
Products.CMFPlone
Products.CMFDiffTool
Products.PasswordResetTool
Products.TinyMCE
icalendar
Plone
plonetheme.barceloneta
mockup
plone.subrequest
plone.app.event
plone.app.controlpanel
plone.app.iterate
plone.app.jquerytools
plone.app.layout
plone.app.locales
plone.app.relationfield
plone.app.testing
plone.app.upgrade
plone.app.versioningbehavior
plone.app.viewletmanager
plone.formwidget.contenttree
plone.formwidget.datetime
plone.formwidget.querystring
plone.protect
plone.recipe.zope2instance
plone.stringinterp
plonetheme.barceloneta
# test fixes only
plone.app.blob
plone.app.customerize
plone.app.dexterity
plone.app.event
plone.app.intid
plone.app.iterate
plone.app.jquerytools
plone.app.openid
plone.app.referenceablebehavior
plone.app.robotframework
plone.app.testing
plone.app.viewletmanager
plone.app.widgets
plone.browserlayer
plone.caching
Expand All @@ -43,5 +31,7 @@ auto-checkout =
plone.rfc822
plone.session
plone.theme
Products.CMFDiffTool
Products.PasswordResetTool
collective.xmltestreport

2 changes: 1 addition & 1 deletion plips/plip-mosaic.cfg
View file
Expand Up @@ -63,7 +63,7 @@ jenkins-test-directories =

[sources]
plone.subrequest = git ${remotes:plone}/plone.subrequest.git pushurl=${remotes:plone_push}/plone.subrequest.git branch=mosaicsprint
plone.app.mosaic = git ${remotes:plone}/plone.app.mosaic.git pushurl=${remotes:plone_push}/plone.app.mosaic.git branch=plone5
plone.app.mosaic = git ${remotes:plone}/plone.app.mosaic.git pushurl=${remotes:plone_push}/plone.app.mosaic.git branch=master
plone.app.page = git ${remotes:plone}/plone.app.page.git pushurl=${remotes:plone_push}/plone.app.page.git branch=mosaicsprint
plone.app.standardtiles = git ${remotes:plone}/plone.app.standardtiles.git pushurl=${remotes:plone_push}/plone.app.standardtiles.git branch=mosaicsprint
plone.app.tiles = git ${remotes:plone}/plone.app.tiles.git pushurl=${remotes:plone_push}/plone.app.tiles.git
Expand Down
3 changes: 2 additions & 1 deletion tests.cfg
View file
Expand Up @@ -234,7 +234,6 @@ Plone =
# PloneTestCase: Packages that use PloneTestCase without test isolation problems.
PloneTestCase =
plone.app.users
Products.contentmigration
Products.PasswordResetTool
Products.ResourceRegistries

Expand Down Expand Up @@ -312,9 +311,11 @@ plone_app_testing =
plone.uuid
plone.z3cform
plonetheme.barceloneta
Products.contentmigration
Products.CMFPlone
Products.CMFQuickInstallerTool
Products.ExtendedPathIndex
Products.PasswordResetTool
Products.PlacelessTranslationService
Products.PlonePAS
repoze.xmliter
Expand Down
38 changes: 20 additions & 18 deletions versions.cfg
View file
Expand Up @@ -12,6 +12,8 @@ AccessControl = 3.0.8
DateTime = 3.0.3
# Products.BTreeFolder2 2.13.4 causes a regression
Products.BTreeFolder2 = 2.13.3
# Override until zope is updated
Products.StandardCacheManagers = 2.13.1
# Override until ztk is updated
Sphinx = 1.1.3
# required for recent z3c.form and chameleon
Expand All @@ -27,7 +29,7 @@ collective.recipe.template = 1.9
decorator = 3.4.0
mr.developer = 1.26
plone.recipe.alltests = 1.4
plone.recipe.zope2instance = 4.2.15
plone.recipe.zope2instance = 4.2.16
plone.recipe.zeoserver = 1.2.6
zc.buildout = 2.2.1
z3c.coverage = 1.2.0
Expand Down Expand Up @@ -82,7 +84,7 @@ slimit = 0.8.1


# Plone release
Plone = 5.0a2
Plone = 5.0a3
Products.ATContentTypes = 2.2.2
Products.Archetypes = 1.10.2
Products.CMFActionIcons = 2.1.3
Expand All @@ -93,7 +95,7 @@ Products.CMFDynamicViewFTI = 4.0.5
Products.CMFEditions = 2.2.11
Products.CMFFormController = 3.0.3
Products.CMFPlacefulWorkflow = 1.6.0
Products.CMFPlone = 5.0a2
Products.CMFPlone = 5.0a3
Products.CMFQuickInstallerTool = 3.0.7
Products.CMFTestCase = 0.9.12
Products.CMFTopic = 2.2.1
Expand All @@ -116,7 +118,7 @@ Products.PluginRegistry = 1.3
Products.PortalTransforms = 2.1.4
Products.ResourceRegistries = 3.0.1
Products.SecureMailHost = 1.1.2
Products.TinyMCE = 1.4.1
Products.TinyMCE = 1.4.2
Products.ZopeVersionControl = 1.1.3
Products.ZSQLMethods = 2.13.4
Products.i18ntestcase = 1.3
Expand All @@ -133,7 +135,7 @@ five.globalrequest = 1.0
five.localsitemanager = 2.0.5
five.pt = 2.2.2
future = 0.14.0
icalendar = 3.8.3
icalendar = 3.8.4
plone.app.blob = 1.5.10
plone.app.caching = 1.2.2
plone.app.collection = 1.1.2
Expand All @@ -142,7 +144,7 @@ plone.app.contentlisting = 1.1.0
plone.app.contentmenu = 2.1.2
plone.app.contentrules = 4.0.0
plone.app.contenttypes = 1.2a5
plone.app.controlpanel = 2.4.5
plone.app.controlpanel = 2.4.6
plone.app.customerize = 1.3.1
plone.app.dexterity = 2.1.2
plone.app.discussion = 2.3.3
Expand All @@ -154,7 +156,7 @@ plone.app.imaging = 1.1.2
plone.app.iterate = 3.0.0
plone.app.jquery = 1.9.1.2
plone.app.jquerytools = 1.6.1
plone.app.layout = 2.5.1
plone.app.layout = 2.5.3
plone.app.linkintegrity = 2.1.0
plone.app.locales = 4.3.3
plone.app.openid = 2.0.2
Expand All @@ -163,10 +165,10 @@ plone.app.querystring = 1.2.3
plone.app.redirector = 1.2.1
plone.app.registry = 1.2.3
plone.app.search = 1.2.2
plone.app.testing = 5.0a2
plone.app.testing = 5.0b1
plone.app.textfield = 1.2.4
plone.app.theming = 1.2.1
plone.app.upgrade = 1.3.7
plone.app.upgrade = 1.3.8
plone.app.users = 2.1.0
plone.app.uuid = 1.1
plone.app.viewletmanager = 2.0.6
Expand All @@ -188,7 +190,7 @@ plone.fieldsets = 2.0.2
plone.folder = 1.0.5
plone.formwidget.datetime = 1.0
plone.formwidget.namedfile = 1.0.11
plone.formwidget.querystring = 1.1.2
plone.formwidget.querystring = 1.1.3
plone.formwidget.recurrence = 1.2.5
plone.i18n = 2.0.9
plone.indexer = 1.0.2
Expand All @@ -202,7 +204,7 @@ plone.outputfilters = 1.14
plone.portlet.collection = 3.0
plone.portlet.static = 3.0.1
plone.portlets = 2.2
plone.protect = 3.0.0
plone.protect = 3.0.1
plone.registry = 1.0.2
plone.reload = 2.0
plone.resource = 1.0.3
Expand All @@ -212,7 +214,7 @@ plone.scale = 1.3.4
plone.schema = 1.0a1
plone.schemaeditor = 2.0.1
plone.session = 3.5.3
plone.stringinterp = 1.1
plone.stringinterp = 1.1.1
plone.subrequest = 1.6.8
plone.supermodel = 1.2.6
plone.synchronize = 1.0.1
Expand All @@ -221,7 +223,7 @@ plone.theme = 2.1.1
plone.transformchain = 1.0.3
plone.uuid = 1.0.3
plone.z3cform = 0.8.0
plonetheme.barceloneta = 1.6.0
plonetheme.barceloneta = 1.6.1
plonetheme.sunburst = 1.5.1
rwproperty = 1.0
sourcecodegen = 0.6.14
Expand Down Expand Up @@ -252,20 +254,20 @@ grokcore.component = 2.5
grokcore.formlib = 1.9
grokcore.security = 1.6.2
grokcore.site = 1.6.1
grokcore.view = 2.7
grokcore.viewlet = 1.10.1
grokcore.view = 2.8
grokcore.viewlet = 1.11
martian = 0.14
mocker = 1.1.1
plone.app.intid = 1.0.3
plone.app.lockingbehavior = 1.0.1
plone.app.referenceablebehavior = 0.7.0
plone.app.relationfield = 1.2.2
plone.app.stagingbehavior = 0.1b4
plone.app.relationfield = 1.3.0
plone.app.stagingbehavior = 0.1
plone.app.versioningbehavior = 1.2.0
plone.directives.dexterity = 1.0.2
plone.directives.form = 2.0
plone.formwidget.autocomplete = 1.2.7
plone.formwidget.contenttree = 1.0.8
plone.formwidget.contenttree = 1.0.9
plone.mocktestcase = 1.0b3
z3c.objpath = 1.1
z3c.relationfield = 0.6.3
Expand Down

1 comment on commit 41db526

@mister-roboto
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TESTS FAILED
Mr.roboto url : http://jenkins.plone.org/roboto/get_info?push=2cfff9e9bdaf4608b9f5aba5093c0f2f
plone-5.0-python-2.7 [FAILURE]

Please sign in to comment.