Plone 6.0.14 and 6.1.0b1. (#61)

* Plone 6.0.14 and 6.1.0b1. * Update to latest Volto * Changelog --------- Co-authored-by: Victor Fernandez de Alba <[email protected]>
plone · Jan 7, 2025 · 1c6e24f · 1c6e24f
1 parent cc389dd
commit 1c6e24f
Show file tree

Hide file tree

Showing 18 changed files with 3,224 additions and 2,233 deletions.
diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
@@ -8,7 +8,7 @@ on:
 env:
   node-version: 20.x
   python: "3.11"
-  plone: "6.0.13"
+  plone: "6.0.14"
 
 jobs:
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ on:
 env:
   node-version: 20.x
   python: "3.11"
-  plone: "6.0.13"
+  plone: "6.0.14"
 
 jobs:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2024-12-24
+
+- Merry Christmas!
+- Update to Plone 6.1b2 and Volto 18.4.0 @mauritsvanrees @sneridagh
+
 # 2024-09-07
 
 - Update instructions. [ksuess]

diff --git a/backend-volto/Dockerfile b/backend-volto/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG SEED=1000
-ARG PLONE_VERSION=6.1.0b1
+ARG PLONE_VERSION=6.1.0b2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 WORKDIR /app

diff --git a/backend-volto/Dockerfile.acceptance b/backend-volto/Dockerfile.acceptance
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG PLONE_VERSION=6.1.0b1
+ARG PLONE_VERSION=6.1.0b2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 WORKDIR /app

diff --git a/backend-volto/constraints.txt b/backend-volto/constraints.txt
@@ -1 +1 @@
--c https://dist.plone.org/release/6.1.0b1/constraints.txt
+-c https://dist.plone.org/release/6.1.0b2/constraints.txt
diff --git a/backend-volto/version.txt b/backend-volto/version.txt
@@ -1 +1 @@
-6.1.0b1
+6.1.0b2
diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG SEED=1000
-ARG PLONE_VERSION=6.1.0b1
+ARG PLONE_VERSION=6.1.0b2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 WORKDIR /app

diff --git a/backend/Dockerfile.acceptance b/backend/Dockerfile.acceptance
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG PLONE_VERSION=6.1.0b1
+ARG PLONE_VERSION=6.1.0b2
 FROM plone/server-builder:${PLONE_VERSION} AS builder
 
 WORKDIR /app

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

diff --git a/classic/Makefile b/classic/Makefile
@@ -19,7 +19,7 @@ YELLOW=`tput setaf 3`
 DISTRIBUTIONS="classicdemo"
 ALLOWED_DISTRIBUTIONS="classicdemo"
 
-PLONE_VERSION=6.0.13
+PLONE_VERSION=6.0.14
 
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 

diff --git a/classic/constraints.txt b/classic/constraints.txt
@@ -1,2 +1,2 @@
--c https://dist.plone.org/release/6.0.13/constraints.txt
+-c https://dist.plone.org/release/6.0.14/constraints.txt
 plone.distribution==1.0.0b4
diff --git a/frontend-volto/mrs.developer.json b/frontend-volto/mrs.developer.json
@@ -4,6 +4,6 @@
     "package": "@plone/volto",
     "url": "[email protected]:plone/volto.git",
     "https": "https://github.com/plone/volto.git",
-    "tag": "18.1.0"
+    "tag": "18.4.0"
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-c https://dist.plone.org/release/6.1.0b1/constraints.txt
		-c https://dist.plone.org/release/6.1.0b2/constraints.txt