Update to Plone 6.0.6 (#1672)

* Update to Plone 6.0.6 * changelog * update test response
plone · Jul 14, 2023 · 8249653 · 8249653
1 parent 477bfa4
commit 8249653
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 55 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,3 @@
-# keep in sync with: https://github.com/kitconcept/buildout/edit/master/Makefile
-# update by running 'make update'
 SHELL := /bin/bash
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
@@ -31,14 +29,6 @@ all: build-plone-6.0
 help: ## This help message
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-.PHONY: Update Makefile and Buildout
-update: ## Update Make and Buildout
-	wget -O Makefile https://raw.githubusercontent.com/kitconcept/buildout/5.2/Makefile
-	wget -O requirements.txt https://raw.githubusercontent.com/kitconcept/buildout/5.2/requirements.txt
-	wget -O plone-5.2.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/plone-5.2.x.cfg
-	wget -O ci.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/ci.cfg
-	wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/5.2/versions.cfg
-
 .installed.cfg: bin/buildout *.cfg
 
 bin/buildout: bin/pip

diff --git a/ci.cfg b/ci.cfg
diff --git a/heroku.cfg b/heroku.cfg
diff --git a/news/1672.internal b/news/1672.internal
@@ -0,0 +1 @@
+Update Makefile and buildout to use Plone 6.0.6. @davisagli
diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg
@@ -4,7 +4,7 @@ extends =
     base.cfg
 
 [versions]
-black = 21.7b0
+black = 22.3.0
 
 # Use the newest plone.rest
 plone.rest = 3.0.0
diff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/6.0.4/versions.cfg
+    https://dist.plone.org/release/6.0.6/versions.cfg
     base.cfg
 
 [buildout:python37]
@@ -13,5 +13,5 @@ recipe = plone.recipe.zope2instance
 zodb-temporary-storage = off
 
 [versions]
-black = 21.7b0
+black = 22.3.0
 pygments = 2.14.0
diff --git a/requirements-6.0.txt b/requirements-6.0.txt
@@ -1 +1 @@
--r https://dist.plone.org/release/6.0.4/requirements.txt
+-r https://dist.plone.org/release/6.0.6/requirements.txt
diff --git a/src/plone/restapi/tests/http-examples/vocabularies.resp b/src/plone/restapi/tests/http-examples/vocabularies.resp
@@ -2,14 +2,14 @@ HTTP/1.1 200 OK
 Content-Type: application/json
 
 [
-    {
-        "@id": "http://localhost:55001/plone/@vocabularies/plone.contentrules.events",
-        "title": "plone.contentrules.events"
-    },
     {
         "@id": "http://localhost:55001/plone/@vocabularies/Behaviors",
         "title": "Behaviors"
     },
+    {
+        "@id": "http://localhost:55001/plone/@vocabularies/plone.contentrules.events",
+        "title": "plone.contentrules.events"
+    },
     {
         "@id": "http://localhost:55001/plone/@vocabularies/plone.app.vocabularies.AvailableContentLanguages",
         "title": "plone.app.vocabularies.AvailableContentLanguages"
@@ -90,10 +90,6 @@ Content-Type: application/json
         "@id": "http://localhost:55001/plone/@vocabularies/plone.app.vocabularies.Principals",
         "title": "plone.app.vocabularies.Principals"
     },
-    {
-        "@id": "http://localhost:55001/plone/@vocabularies/plone.app.vocabularies.Catalog",
-        "title": "plone.app.vocabularies.Catalog"
-    },
     {
         "@id": "http://localhost:55001/plone/@vocabularies/plone.app.vocabularies.Actions",
         "title": "plone.app.vocabularies.Actions"
@@ -162,6 +158,10 @@ Content-Type: application/json
         "@id": "http://localhost:55001/plone/@vocabularies/plone.app.event.SynchronizationStrategies",
         "title": "plone.app.event.SynchronizationStrategies"
     },
+    {
+        "@id": "http://localhost:55001/plone/@vocabularies/plone.app.vocabularies.Catalog",
+        "title": "plone.app.vocabularies.Catalog"
+    },
     {
         "@id": "http://localhost:55001/plone/@vocabularies/plone.app.contenttypes.metadatafields",
         "title": "plone.app.contenttypes.metadatafields"