Adapt to 4.2

HISTORY.txt

@@ -1,4 +1,6 @@
-4.2rc3 - unreleased
+4.2 - 2012-07-02
+
+   - Adapt to 4.2.
 
    - --without-lxml is no longer supported, as lxml is required. Option removed.
 

README.txt

@@ -1,13 +1,13 @@
 ==============================
-Plone 4.2rc2: Unified Installer
+Plone 4.2: Unified Installer
 ==============================
 
 The Plone Unified Installer is a source-installation kit that installs
 Plone and its dependencies from source on most Unix-like platforms. The
 kit includes Plone, Zope and Python. Python is installed in a way that
 will not change or interfere with your system Python.
 
-This version includes Plone 4.2rc2, Zope 2.12.14, and Python 2.6.7.
+This version includes Plone 4.2, Zope 2.12.14, and Python 2.6.7.
 
 Feedback/bugs to: http://dev.plone.org/plone; component: Installer (Unified)
 

base_skeleton/versions.cfg

@@ -1,15 +1,17 @@
-# http://dist.plone.org/release/4.2rc2/versions.cfg
+# http://dist.plone.org/release/4.2/versions.cfg
 
 [buildout]
 extends =
     zopeapp-versions.cfg
     zope-versions.cfg
 #    http://download.zope.org/zopetoolkit/index/1.0.7/zopeapp-versions.cfg
-#    http://download.zope.org/Zope2/index/2.13.14/versions.cfg
+#    http://download.zope.org/Zope2/index/2.13.15/versions.cfg
 
 [versions]
 # Zope overrides
-docutils = 0.9
+docutils = 0.9.1
+# AC 2.13.8 didn't make it into Zope 2.13.15
+AccessControl = 2.13.8
 # Products.BTreeFolder2 2.13.4 causes a regression
 Products.BTreeFolder2 = 2.13.3
 
@@ -43,7 +45,7 @@ simplejson = 2.5.0
 WebOb = 1.0.8
 
 # Plone release
-Plone                                 = 4.2rc2
+Plone                                 = 4.2
 Products.ATContentTypes               = 2.1.7
 Products.ATReferenceBrowserWidget     = 3.0
 Products.Archetypes                   = 1.8
@@ -53,17 +55,17 @@ Products.CMFCore                      = 2.2.6
 Products.CMFDefault                   = 2.2.2
 Products.CMFDiffTool                  = 2.0
 Products.CMFDynamicViewFTI            = 4.0.2
-Products.CMFEditions                  = 2.2.3
+Products.CMFEditions                  = 2.2.4
 Products.CMFFormController            = 3.0.2
 Products.CMFPlacefulWorkflow          = 1.5.7
-Products.CMFPlone                     = 4.2rc2
+Products.CMFPlone                     = 4.2.0.1
 Products.CMFQuickInstallerTool        = 3.0.6
 Products.CMFTestCase                  = 0.9.11
 Products.CMFTopic                     = 2.2.1
 Products.CMFUid                       = 2.2.1
 Products.contentmigration             = 2.1.1
 Products.DCWorkflow                   = 2.2.4
-Products.ExtendedPathIndex            = 3.0
+Products.ExtendedPathIndex            = 3.0.1
 Products.ExternalEditor               = 1.0
 Products.GenericSetup                 = 1.7.1
 Products.Marshall                     = 2.1.1
@@ -86,13 +88,13 @@ Products.kupu                         = 1.5.0
 Products.statusmessages               = 4.0
 Products.validation                   = 2.0
 archetypes.kss                        = 1.7.2
-archetypes.querywidget                = 1.0.2
+archetypes.querywidget                = 1.0.3
 archetypes.referencebrowserwidget     = 2.4.11
 archetypes.schemaextender             = 2.1.1
 borg.localrole                        = 3.0.2
 collective.monkeypatcher              = 1.0.1
 collective.testcaselayer              = 1.4
-collective.z3cform.datetimewidget     = 1.1.1
+collective.z3cform.datetimewidget     = 1.2.0
 diazo                                 = 1.0.1
 five.customerize                      = 1.0.3
 five.formlib                          = 1.0.4
@@ -101,7 +103,7 @@ five.localsitemanager                 = 2.0.5
 kss.core                              = 1.6.3
 plone.app.blob                        = 1.5.2
 plone.app.caching                     = 1.1
-plone.app.collection                  = 1.0.3
+plone.app.collection                  = 1.0.4
 plone.app.content                     = 2.0.11
 plone.app.contentmenu                 = 2.0.5
 plone.app.contentlisting              = 1.0.1
@@ -119,16 +121,16 @@ plone.app.jquerytools                 = 1.3.2
 plone.app.kss                         = 1.7.1
 plone.app.layout                      = 2.2.6
 plone.app.linkintegrity               = 1.4.5
-plone.app.locales                     = 4.0.12
+plone.app.locales                     = 4.0.13
 plone.app.openid                      = 2.0.2
 plone.app.portlets                    = 2.2.5
-plone.app.querystring                 = 1.0.4
+plone.app.querystring                 = 1.0.5
 plone.app.redirector                  = 1.1.3
 plone.app.registry                    = 1.1
 plone.app.search                      = 1.0.2
 plone.app.testing                     = 4.2
 plone.app.theming                     = 1.0
-plone.app.upgrade                     = 1.2rc2
+plone.app.upgrade                     = 1.2
 plone.app.users                       = 1.1.3
 plone.app.uuid                        = 1.0
 plone.app.viewletmanager              = 2.0.2
@@ -178,9 +180,10 @@ z3c.form                              = 2.5.1
 z3c.formwidget.query                  = 0.8
 z3c.zcmlhook                          = 1.0b1
 zope.globalrequest                    = 1.0
+zope.schema                           = 4.2.0
 
 # Ecosystem (not officially part of core)
-collective.z3cform.datagridfield      = 0.10
+collective.z3cform.datagridfield      = 0.11
 collective.z3cform.datagridfield-demo = 0.5
 five.grok                             = 1.2.0
 five.intid                            = 1.0.2
@@ -195,7 +198,7 @@ martian                               = 0.11.3
 mocker                                = 1.1
 plone.alterego                        = 1.0
 plone.app.dexterity                   = 1.2.1
-plone.app.intid                       = 1.0
+plone.app.intid                       = 1.0.1
 plone.app.lockingbehavior             = 1.0.1
 plone.app.referenceablebehavior       = 0.3
 plone.app.relationfield               = 1.1
@@ -218,4 +221,4 @@ rwproperty                            = 1.0
 z3c.blobfile                          = 0.1.5
 z3c.objpath                           = 1.0
 z3c.relationfield                     = 0.6.1
-zc.relation                           = 1.0
+zc.relation                           = 1.0

base_skeleton/zope-versions.cfg

@@ -1,4 +1,4 @@
-# http://download.zope.org/Zope2/index/2.13.14/versions.cfg
+# http://download.zope.org/Zope2/index/2.13.15/versions.cfg
 
 [buildout]
 extends =
@@ -8,7 +8,7 @@ versions = versions
 
 [versions]
 # Zope2-specific
-Zope2 = 2.13.14
+Zope2 = 2.13.15
 AccessControl = 2.13.7
 Acquisition = 2.13.8
 DateTime = 2.12.6
@@ -39,10 +39,12 @@ manuel = 1.1.1
 mechanize = 0.2.5
 python-gettext = 1.2
 ZConfig = 2.9.0
+# security fix, not yet in ZTK 1.0.7
+zdaemon = 2.0.7
 ZODB3 = 3.10.5
 
 # Zope2 dependencies
 repoze.retry = 1.0
 repoze.tm2 = 1.0b2
 repoze.who = 2.0
-zope.testbrowser = 3.11.1
+zope.testbrowser = 3.11.1

buildme.sh

@@ -28,7 +28,7 @@ else
   TAR='tar'
 fi
 
-NEWVER=4.2rc2
+NEWVER=4.2
 
 SDIR=`pwd`
 

buildout_templates/cluster.cfg

@@ -50,7 +50,7 @@ extends =
 # If you change your Plone version, you'll also need to update
 # the repository below.
 find-links +=
-    http://dist.plone.org/release/4.2rc2
+    http://dist.plone.org/release/4.2
 
 
 ############################################
@@ -219,10 +219,10 @@ parts =
 # config files.
 #
 [versions]
+ZopeSkel = 2.21.2
 Cheetah = 2.2.1
 Pillow = 1.7.7
 Products.DocFinderTab = 1.0.5
-ZopeSkel = 2.21.2
 collective.recipe.backup = 2.4
 plone.recipe.command = 1.1
-plone.recipe.unifiedinstaller = 4.1
+plone.recipe.unifiedinstaller = 4.1

buildout_templates/standalone.cfg

@@ -50,7 +50,7 @@ extends =
 # If you change your Plone version, you'll also need to update
 # the repository link below.
 find-links +=
-    http://dist.plone.org/release/4.2rc2
+    http://dist.plone.org/release/4.2
 
 ############################################
 # Ports
@@ -214,10 +214,10 @@ parts =
 # config files.
 #
 [versions]
+ZopeSkel = 2.21.2
 Cheetah = 2.2.1
 Pillow = 1.7.7
 Products.DocFinderTab = 1.0.5
-ZopeSkel = 2.21.2
 collective.recipe.backup = 2.4
 plone.recipe.command = 1.1
-plone.recipe.unifiedinstaller = 4.1
+plone.recipe.unifiedinstaller = 4.1

install.sh

@@ -604,7 +604,7 @@ else
     echo "Rootless install method chosen. Will install for use by system user $USER"
 fi
 echo ""
-echo "Installing Plone 4.2rc2 at $PLONE_HOME"
+echo "Installing Plone 4.2 at $PLONE_HOME"
 echo ""
 
 

tests/tests.txt

@@ -62,7 +62,7 @@ Test a ZEO install
 
     >>> print stdout
     ZEO Cluster Install selected...
-    Installing Plone 4.2rc2 at ...
+    Installing Plone 4.2 at ...
     Plone successfully installed at ...
       Username: admin
       Password: admin...
@@ -329,7 +329,7 @@ Test an --instance=... install
 
     >>> print stdout
     ZEO Cluster Install selected...
-    Installing Plone 4.2rc2 at ...
+    Installing Plone 4.2 at ...
     Plone successfully installed at ...
       Username: admin
       Password: admin...

version.txt

@@ -1,2 +1,2 @@
-Plone version: 4.2rc2 (with Zope 2.13.7, Python 2.6.7)
-Installer version: Unified Installer 4.2rc2
+Plone version: 4.2 (with Zope 2.13.7, Python 2.6.7)
+Installer version: Unified Installer 4.2