Merge pull request #15 from plone/upgradeto6.0.4

plone · Apr 27, 2023 · fe848a1 · fe848a1
2 parents 95c5179 + 1b761f5
commit fe848a1
Show file tree

Hide file tree

Showing 9 changed files with 2,154 additions and 1,695 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ on:
 env:
   node-version: 16.x
   python: "3.11"
-  plone: "6.0.3"
+  plone: "6.0.4"
 
 jobs:
 

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG SEED=1000
-ARG PLONE_VERSION=6.0.3
+ARG PLONE_VERSION=6.0.4
 FROM plone/plone-backend:${PLONE_VERSION}
 
 

diff --git a/backend/Makefile b/backend/Makefile
@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-PLONE_VERSION=6.0.3
+PLONE_VERSION=6.0.4
 
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 

diff --git a/backend/constraints.txt b/backend/constraints.txt
@@ -1 +1 @@
--c https://dist.plone.org/release/6.0.3/constraints.txt
+-c https://dist.plone.org/release/6.0.4/constraints.txt
diff --git a/classic/Dockerfile b/classic/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG SEED=1000
-ARG PLONE_VERSION=6.0.3
+ARG PLONE_VERSION=6.0.4
 FROM plone/plone-backend:${PLONE_VERSION}
 ENV zope_i18n_compile_mo_files=true
 

diff --git a/classic/Makefile b/classic/Makefile
@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-PLONE_VERSION=6.0.3
+PLONE_VERSION=6.0.4
 
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 

diff --git a/classic/constraints.txt b/classic/constraints.txt
@@ -1 +1 @@
--c https://dist.plone.org/release/6.0.3/constraints.txt
+-c https://dist.plone.org/release/6.0.4/constraints.txt
diff --git a/frontend/package.json b/frontend/package.json
@@ -125,8 +125,8 @@
     "node": "^14 || ^16"
   },
   "dependencies": {
-    "@kitconcept/volto-blocks-grid": "6.1.0",
-    "@plone/volto": "16.9.0"
+    "@kitconcept/volto-blocks-grid": "7.0.0",
+    "@plone/volto": "16.20.4"
   },
   "devDependencies": {
     "@plone/scripts": "^2.3.0",

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-c https://dist.plone.org/release/6.0.3/constraints.txt
		-c https://dist.plone.org/release/6.0.4/constraints.txt