Merge branch '6.0' of github.com:plone/buildout.coredev into 6.0

last_commit.txt

@@ -1,16 +1,32 @@
-Repository: plonetheme.barceloneta
+Repository: plone.app.caching
 
 
-Branch: refs/heads/3.1.x
-Date: 2023-10-24T10:39:47+02:00
-Author: Peter Mathis (petschki) <[email protected]>
-Commit: https://github.com/plone/plonetheme.barceloneta/commit/bc6a24b25c22a15dda84eba498508f57a680cdba
+Branch: refs/heads/master
+Date: 2023-10-25T08:46:46+02:00
+Author: Timo Stollenwerk (tisto) <[email protected]>
+Commit: https://github.com/plone/plone.app.caching/commit/48bab816f18d738064434f82546700b9d1417bda
 
-update dependencies
+Preparing release 3.1.3
 
 Files changed:
-M package-lock.json
-M package.json
+M CHANGES.md
+M setup.py
+D news/122.bugfix
 
-b'diff --git a/package-lock.json b/package-lock.json\nindex 53d2dc68..c56722e3 100644\n--- a/package-lock.json\n+++ b/package-lock.json\n@@ -21,7 +21,7 @@\n         "sass": "^1.58.3",\n         "stylelint": "^14.16.1",\n         "stylelint-config-twbs-bootstrap": "^7.0.0",\n-        "tinymce": "^5.10.7"\n+        "tinymce": "^5.10.8"\n       }\n     },\n     "node_modules/@babel/code-frame": {\n@@ -3551,9 +3551,9 @@\n       "dev": true\n     },\n     "node_modules/tinymce": {\n-      "version": "5.10.7",\n-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.7.tgz",\n-      "integrity": "sha512-9UUjaO0R7FxcFo0oxnd1lMs7H+D0Eh+dDVo5hKbVe1a+VB0nit97vOqlinj+YwgoBDt6/DSCUoWqAYlLI8BLYA==",\n+      "version": "5.10.8",\n+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.10.8.tgz",\n+      "integrity": "sha512-iyoo3VGMAJhLMDdblAefKvYgBRk9kQi58GTwAmoieqsyggGsKZWlQl/YY6nTILFHUCA1FhYu0HdmM5YYjs17UQ==",\n       "dev": true\n     },\n     "node_modules/to-regex-range": {\ndiff --git a/package.json b/package.json\nindex f1887a77..54ee49c1 100644\n--- a/package.json\n+++ b/package.json\n@@ -1,7 +1,7 @@\n {\n   "name": "@plone/plonetheme-barceloneta-base",\n   "description": "Plone Theme Barceloneta Resources",\n-  "version": "3.1.3",\n+  "version": "3.1.4",\n   "files": [\n     "/scss",\n     "/plonetheme/barceloneta/theme/tinymce/*.css"\n@@ -32,7 +32,7 @@\n     "sass": "^1.58.3",\n     "stylelint": "^14.16.1",\n     "stylelint-config-twbs-bootstrap": "^7.0.0",\n-    "tinymce": "^5.10.7"\n+    "tinymce": "^5.10.8"\n   },\n   "scripts": {\n     "watch": "nodemon --watch scss/ --ext scss --exec \\"npm run css-main\\"",\n'
+b'diff --git a/CHANGES.md b/CHANGES.md\nindex 340b8b7..bd233c2 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,14 @@\n \n <!-- towncrier release notes start -->\n \n+## 3.1.3 (2023-10-25)\n+\n+\n+### Bug fixes:\n+\n+- Fix `locked` component of ETag to discriminate between different locks. @JeffersonBledsoe, @davisagli #122\n+\n+\n ## 3.1.2 (2023-06-16)\n \n \ndiff --git a/news/122.bugfix b/news/122.bugfix\ndeleted file mode 100644\nindex 1b2c10f..0000000\n--- a/news/122.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Fix `locked` component of ETag to discriminate between different locks. @JeffersonBledsoe, @davisagli\ndiff --git a/setup.py b/setup.py\nindex 0045087..47db32f 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.1.3.dev0"\n+version = "3.1.3"\n \n long_description = f"""\n {Path("README.md").read_text()}\\n\n'
+
+Repository: plone.app.caching
+
+
+Branch: refs/heads/master
+Date: 2023-10-25T08:47:10+02:00
+Author: Timo Stollenwerk (tisto) <[email protected]>
+Commit: https://github.com/plone/plone.app.caching/commit/298da573f137d7ae352b044c8a80d3eaffbe5db5
+
+Back to development: 3.1.4
+
+Files changed:
+M setup.py
+
+b'diff --git a/setup.py b/setup.py\nindex 47db32f..193fd91 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -3,7 +3,7 @@\n from setuptools import setup\n \n \n-version = "3.1.3"\n+version = "3.1.4.dev0"\n \n long_description = f"""\n {Path("README.md").read_text()}\\n\n'
 

versions-ecosystem.cfg

@@ -9,7 +9,7 @@ plone.app.blocks = 7.0.0
 plone.app.debugtoolbar = 1.3.0
 plone.app.drafts = 2.0.0
 plone.app.jquerytools = 1.9.5
-plone.app.mosaic = 3.1.4
+plone.app.mosaic = 3.1.5
 plone.app.standardtiles = 3.1.2
 plone.app.tiles = 4.0.0
 plone.formwidget.autocomplete = 1.4.1

versions.cfg

@@ -105,7 +105,7 @@ plone.scale = 4.0.2
 plone.schema = 2.0.1
 plone.schemaeditor = 4.0.5
 plone.session = 4.0.4
-plone.staticresources = 2.1.7
+plone.staticresources = 2.1.8
 plone.stringinterp = 2.0.1
 plone.subrequest = 2.0.4
 plone.supermodel = 2.0.3