From 3fddcf79100998cfffda80b62eb00f3663c04381 Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Fri, 6 Sep 2024 10:59:32 +0200 Subject: [PATCH] [fc] Repository: plone.app.upgrade Branch: refs/heads/master Date: 2024-09-06T10:59:01+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.app.upgrade/commit/6bec84f5720d3e704b608a682b2f6fc17cc4356e Added upgrade to 6025, Plone 6.0.14. Files changed: A news/6025.internal M plone/app/upgrade/v60/configure.zcml Repository: plone.app.upgrade Branch: refs/heads/master Date: 2024-09-06T10:59:32+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.app.upgrade/commit/631c59a41e17a786e46572885b08fb6268521839 Added upgrade to 6105, Plone 6.1.0a6. Files changed: A news/6105.internal M plone/app/upgrade/v61/configure.zcml --- last_commit.txt | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 39e37c87ca..9c5c5ba0e2 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,35 +1,32 @@ -Repository: plone.restapi +Repository: plone.app.upgrade -Branch: refs/heads/main -Date: 2024-09-05T10:24:34-07:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.restapi/commit/4ea8bf8659527b7e40ec680b136694eb344277e3 +Branch: refs/heads/master +Date: 2024-09-06T10:59:01+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.upgrade/commit/6bec84f5720d3e704b608a682b2f6fc17cc4356e -Preparing release 9.7.2 +Added upgrade to 6025, Plone 6.0.14. Files changed: -M CHANGES.rst -M setup.py -D news/1798.documentation -D news/1799.bugfix -D news/1802.bugfix -D news/244.internal +A news/6025.internal +M plone/app/upgrade/v60/configure.zcml -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex f049a42e00..7d5323edb8 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,32 @@ Changelog\n \n .. towncrier release notes start\n \n+9.7.2 (2024-09-05)\n+------------------\n+\n+Bug fixes:\n+\n+\n+- Fixed Dexterity content serializer:\n+ Return an empty object for `next_item` and `previous_item`\n+ unless the parent has next/previous support enabled.\n+ @JeffersonBledsoe, @davisagli (#1799)\n+- Fixed implementation of the `jwt_auth` plugin. It now can be added, and its properties, `use_keyring` and `store_tokens`, can be updated. @sauzher (#1802)\n+\n+\n+Internal:\n+\n+\n+- Explicitly globally disable comments in the tests that need it.\n+ [maurits] (#244)\n+\n+\n+Documentation:\n+\n+\n+- Update contributing docs for Plone 6, and switch from Netlify to Read the Docs for pull request previews. @stevepiercy (#1798)\n+\n+\n 9.7.1 (2024-06-29)\n ------------------\n \ndiff --git a/news/1798.documentation b/news/1798.documentation\ndeleted file mode 100644\nindex b56db95533..0000000000\n--- a/news/1798.documentation\n+++ /dev/null\n@@ -1 +0,0 @@\n-Update contributing docs for Plone 6, and switch from Netlify to Read the Docs for pull request previews. @stevepiercy\ndiff --git a/news/1799.bugfix b/news/1799.bugfix\ndeleted file mode 100644\nindex 171db7f10a..0000000000\n--- a/news/1799.bugfix\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-Fixed Dexterity content serializer:\n-Return an empty object for `next_item` and `previous_item`\n-unless the parent has next/previous support enabled.\n-@JeffersonBledsoe, @davisagli\ndiff --git a/news/1802.bugfix b/news/1802.bugfix\ndeleted file mode 100644\nindex 347ab28a27..0000000000\n--- a/news/1802.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Fixed implementation of the `jwt_auth` plugin. It now can be added, and its properties, `use_keyring` and `store_tokens`, can be updated. @sauzher\ndiff --git a/news/244.internal b/news/244.internal\ndeleted file mode 100644\nindex 0ee4acc1f6..0000000000\n--- a/news/244.internal\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Explicitly globally disable comments in the tests that need it.\n-[maurits]\n\\ No newline at end of file\ndiff --git a/setup.py b/setup.py\nindex 50235c9839..3befc70089 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -4,7 +4,7 @@\n import sys\n \n \n-version = "9.7.2.dev0"\n+version = "9.7.2"\n \n if sys.version_info.major == 2:\n raise ValueError(\n' +b'diff --git a/news/6025.internal b/news/6025.internal\nnew file mode 100644\nindex 00000000..5f5fe496\n--- /dev/null\n+++ b/news/6025.internal\n@@ -0,0 +1,2 @@\n+Added upgrade to 6025, Plone 6.0.14.\n+[maurits]\ndiff --git a/plone/app/upgrade/v60/configure.zcml b/plone/app/upgrade/v60/configure.zcml\nindex a1b50e90..a195da81 100644\n--- a/plone/app/upgrade/v60/configure.zcml\n+++ b/plone/app/upgrade/v60/configure.zcml\n@@ -412,4 +412,18 @@\n \n \n \n+ \n+ \n+\n+ \n+\n+ \n+\n \n' -Repository: plone.restapi +Repository: plone.app.upgrade -Branch: refs/heads/main -Date: 2024-09-05T10:27:58-07:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.restapi/commit/5dd4bef6399dc954094f28e547f092a41259e409 +Branch: refs/heads/master +Date: 2024-09-06T10:59:32+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.upgrade/commit/631c59a41e17a786e46572885b08fb6268521839 -Back to development: 9.7.3 +Added upgrade to 6105, Plone 6.1.0a6. Files changed: -M setup.py +A news/6105.internal +M plone/app/upgrade/v61/configure.zcml -b'diff --git a/setup.py b/setup.py\nindex 3befc7008..c9b76e910 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -4,7 +4,7 @@\n import sys\n \n \n-version = "9.7.2"\n+version = "9.7.3.dev0"\n \n if sys.version_info.major == 2:\n raise ValueError(\n' +b'diff --git a/news/6105.internal b/news/6105.internal\nnew file mode 100644\nindex 00000000..06efe27e\n--- /dev/null\n+++ b/news/6105.internal\n@@ -0,0 +1,2 @@\n+Added upgrade to 6105, Plone 6.1.0a6.\n+[maurits]\ndiff --git a/plone/app/upgrade/v61/configure.zcml b/plone/app/upgrade/v61/configure.zcml\nindex b941668c..53ef70a3 100644\n--- a/plone/app/upgrade/v61/configure.zcml\n+++ b/plone/app/upgrade/v61/configure.zcml\n@@ -76,4 +76,16 @@\n />\n \n \n+ \n+ \n+ \n+ \n+\n \n'