Skip to content

Commit 750a74e

Browse files
hvelardehvelarde
committed
Merge branch '4.2' of github.com:plone/buildout.coredev into 4.2
2 parents b4e27bf + c50f033 commit 750a74e

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎checkouts.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ auto-checkout =
88
Products.CMFPlone
99
plone.app.locales
1010
plone.app.upgrade
11-
plone.resource
11+
Products.Archetypes
12+
plonetheme.classic
13+
plonetheme.sunburst
14+
plone.app.jquerytools
15+
Zope2
1216
# Test fixes only
1317
Products.kupu
1418
Products.CMFCalendar
@@ -17,7 +21,3 @@ auto-checkout =
1721
Products.CMFPlacefulWorkflow
1822
Products.PasswordResetTool
1923
archetypes.kss
20-
plone.app.blob
21-
plone.app.caching
22-
plone.app.kss
23-
plone.outputfilters

‎core.cfg

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ versions = versions
3030
eggs =
3131
Products.CMFPlone
3232
plone.reload
33-
# temporary bypass for https://bugs.launchpad.net/zope2/+bug/539181
34-
roman
3533
# currently required by Products.CMFCore
3634
Products.ZSQLMethods
3735

‎jenkins.plone.org/plone-4.2-code-analysis.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ bin/jenkins-code-analysis</command>
4949
<dontComputeNew>true</dontComputeNew>
5050
<high></high>
5151
<normal>XXX, BBB, TODO</normal>
52-
<low></low>
52+
<low>failUnlessEqual, assertEquals, failIfEqual, failUnless, assert_, failIf, failUnlessRaises, failUnlessAlmostEqual, failIfAlmostEqual</low>
5353
<ignoreCase>false</ignoreCase>
5454
<pattern>packages/**/*</pattern>
55-
<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>
55+
<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>
5656
</hudson.plugins.tasks.TasksPublisher>
5757
<hudson.plugins.warnings.WarningsPublisher>
5858
<healthy></healthy>

‎jenkins.plone.org/plone-4.2-tests.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</logTexts>
3232
<EscalateStatus>false</EscalateStatus>
3333
<RunIfJobSuccessful>true</RunIfJobSuccessful>
34-
<script>cp -R $WORKSPACE ../last-successful</script>
34+
<script>rsync -avz $WORKSPACE $WORKSPACE/../last-successful</script>
3535
</hudson.plugins.postbuildtask.TaskProperties>
3636
</tasks>
3737
</hudson.plugins.postbuildtask.PostbuildTask>

‎sources.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ plone.scale = git ${remotes:plone}/plone.scale.git pushu
6161
plone.session = git ${remotes:plone}/plone.session.git pushurl=${remotes:plone_push}/plone.session.git
6262
plone.stringinterp = git ${remotes:plone}/plone.stringinterp.git pushurl=${remotes:plone_push}/plone.stringinterp.git
6363
plone.subrequest = git ${remotes:plone}/plone.subrequest.git pushurl=${remotes:plone_push}/plone.subrequest.git
64-
plone.supermodel = git ${remotes:plone}/plone.supermodel.git pushurl=${remotes:plone_push}/plone.supermodel.git
64+
plone.supermodel = git ${remotes:plone}/plone.supermodel.git pushurl=${remotes:plone_push}/plone.supermodel.git branche=1.1.x
6565
plone.testing = git ${remotes:plone}/plone.testing.git pushurl=${remotes:plone_push}/plone.testing.git
6666
plone.theme = git ${remotes:plone}/plone.theme.git pushurl=${remotes:plone_push}/plone.theme.git
6767
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
9292
plone.app.portlets = git ${remotes:plone}/plone.app.portlets.git pushurl=${remotes:plone_push}/plone.app.portlets.git
9393
plone.app.querystring = git ${remotes:plone}/plone.app.querystring.git pushurl=${remotes:plone_push}/plone.app.querystring.git
9494
plone.app.redirector = git ${remotes:plone}/plone.app.redirector.git pushurl=${remotes:plone_push}/plone.app.redirector.git
95-
plone.app.registry = git ${remotes:plone}/plone.app.registry.git pushurl=${remotes:plone_push}/plone.app.registry.git
95+
plone.app.registry = git ${remotes:plone}/plone.app.registry.git pushurl=${remotes:plone_push}/plone.app.registry.git branch=1.1.x
9696
plone.app.search = git ${remotes:plone}/plone.app.search.git pushurl=${remotes:plone_push}/plone.app.search.git
9797
plone.app.testing = git ${remotes:plone}/plone.app.testing.git pushurl=${remotes:plone_push}/plone.app.testing.git
9898
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
156156
Products.ResourceRegistries = git ${remotes:plone}/Products.ResourceRegistries.git pushurl=${remotes:plone_push}/Products.ResourceRegistries.git
157157
Products.SecureMailHost = svn ${remotes:svn_collective}/SecureMailHost/branches/1.1
158158
Products.statusmessages = git ${remotes:plone}/Products.statusmessages.git pushurl=${remotes:plone_push}/Products.statusmessages.git
159-
Products.TinyMCE = git ${remotes:plone}/Products.TinyMCE.git pushurl=${remotes:plone_push}/Products.TinyMCE.git
159+
Products.TinyMCE = git ${remotes:plone}/Products.TinyMCE.git pushurl=${remotes:plone_push}/Products.TinyMCE.git branch=1.2.x
160160
Products.validation = git ${remotes:plone}/Products.validation.git pushurl=${remotes:plone_push}/Products.validation.git
161161
Products.ZCatalog = svn ${remotes:zope}/Products.ZCatalog/trunk
162162
Products.ZopeVersionControl = svn ${remotes:zope}/Products.ZopeVersionControl/trunk

‎versions.cfg

+10-9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ extends = http://download.zope.org/zopetoolkit/index/1.0.6/zopeapp-versions.cfg
44

55
[versions]
66
# Zope overrides
7+
docutils = 0.9
78
# Products.BTreeFolder2 2.13.4 causes a regression
89
Products.BTreeFolder2 = 2.13.3
910
Products.ZCatalog = 2.13.23
@@ -71,7 +72,7 @@ Products.PloneTestCase = 0.9.14
7172
Products.PluggableAuthService = 1.8.0
7273
Products.PluginRegistry = 1.3
7374
Products.PortalTransforms = 2.0.7
74-
Products.ResourceRegistries = 2.1.1
75+
Products.ResourceRegistries = 2.1.2
7576
Products.SecureMailHost = 1.1.2
7677
Products.TinyMCE = 1.2.12
7778
Products.ZopeVersionControl = 1.1.3
@@ -94,24 +95,24 @@ five.formlib = 1.0.4
9495
five.globalrequest = 1.0
9596
five.localsitemanager = 2.0.5
9697
kss.core = 1.6.3
97-
plone.app.blob = 1.5.1
98+
plone.app.blob = 1.5.2
9899
plone.app.caching = 1.0.3
99100
plone.app.collection = 1.0.3
100101
plone.app.content = 2.0.10
101102
plone.app.contentmenu = 2.0.5
102103
plone.app.contentlisting = 1.0.1
103104
plone.app.contentrules = 2.1.5
104-
plone.app.controlpanel = 2.2.4
105+
plone.app.controlpanel = 2.2.5
105106
plone.app.customerize = 1.2.2
106107
plone.app.discussion = 2.1.5
107108
plone.app.folder = 1.0.4
108-
plone.app.form = 2.0.5
109+
plone.app.form = 2.1
109110
plone.app.i18n = 2.0.1
110111
plone.app.imaging = 1.0.6
111112
plone.app.iterate = 2.1.5
112113
plone.app.jquery = 1.4.4
113114
plone.app.jquerytools = 1.3.1
114-
plone.app.kss = 1.7.0
115+
plone.app.kss = 1.7.1
115116
plone.app.layout = 2.2.6
116117
plone.app.linkintegrity = 1.4.5
117118
plone.app.locales = 4.0.12
@@ -129,11 +130,11 @@ plone.app.uuid = 1.0
129130
plone.app.viewletmanager = 2.0.2
130131
plone.app.vocabularies = 2.1.6
131132
plone.app.workflow = 2.0.6
132-
plone.app.z3cform = 0.5.8
133+
plone.app.z3cform = 0.6.0
133134
plone.autoform = 1.2
134135
plone.browserlayer = 2.1.1
135136
plone.cachepurging = 1.0.3
136-
plone.caching = 1.0
137+
plone.caching = 1.1
137138
plone.contentrules = 2.0.1
138139
plone.fieldsets = 2.0.1
139140
plone.folder = 1.0.1
@@ -144,14 +145,14 @@ plone.keyring = 2.0
144145
plone.locking = 2.0.3
145146
plone.memoize = 1.1.1
146147
plone.openid = 2.0
147-
plone.outputfilters = 1.2
148+
plone.outputfilters = 1.3
148149
plone.portlet.collection = 2.1
149150
plone.portlet.static = 2.0.1
150151
plone.portlets = 2.0.2
151152
plone.protect = 2.0
152153
plone.registry = 1.0
153154
plone.reload = 2.0
154-
plone.resource = 1.0
155+
plone.resource = 1.0.1
155156
plone.rfc822 = 1.0
156157
plone.scale = 1.2.2
157158
plone.session = 3.5

0 commit comments

Comments
 (0)