From fa0e6684d96c2dca5da8a69c898a75b26c057b90 Mon Sep 17 00:00:00 2001
From: mauritsvanrees <maurits@vanrees.org>
Date: Fri, 6 Sep 2024 11:02:23 +0200
Subject: [PATCH] [fc] Repository: Products.CMFPlone

Branch: refs/heads/6.0.x
Date: 2024-09-06T11:02:23+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/b18c7f5428d1ec5b8c3614af0e5f50cb6238a4b2

Added upgrade to 6025, Plone 6.0.14.

Files changed:
A news/6025.internal
M Products/CMFPlone/profiles/default/metadata.xml
---
 last_commit.txt | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/last_commit.txt b/last_commit.txt
index 9c5c5ba0e2..320b38bffc 100644
--- a/last_commit.txt
+++ b/last_commit.txt
@@ -1,32 +1,16 @@
-Repository: plone.app.upgrade
+Repository: Products.CMFPlone
 
 
-Branch: refs/heads/master
-Date: 2024-09-06T10:59:01+02:00
+Branch: refs/heads/6.0.x
+Date: 2024-09-06T11:02:23+02:00
 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
-Commit: https://github.com/plone/plone.app.upgrade/commit/6bec84f5720d3e704b608a682b2f6fc17cc4356e
+Commit: https://github.com/plone/Products.CMFPlone/commit/b18c7f5428d1ec5b8c3614af0e5f50cb6238a4b2
 
 Added upgrade to 6025, Plone 6.0.14.
 
 Files changed:
 A news/6025.internal
-M plone/app/upgrade/v60/configure.zcml
+M Products/CMFPlone/profiles/default/metadata.xml
 
-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     </gs:upgradeSteps>\n \n+    <gs:upgradeSteps\n+        profile="Products.CMFPlone:plone"\n+        source="6024"\n+        destination="6025"\n+        >\n+        <!-- Plone 6.0.14 -->\n+\n+        <gs:upgradeStep\n+            title="Miscellaneous"\n+            handler="..utils.null_upgrade_step"\n+            />\n+\n+    </gs:upgradeSteps>\n+\n </configure>\n'
-
-Repository: plone.app.upgrade
-
-
-Branch: refs/heads/master
-Date: 2024-09-06T10:59:32+02:00
-Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
-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
-
-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   </gs:upgradeSteps>\n \n+  <gs:upgradeSteps\n+      profile="Products.CMFPlone:plone"\n+      source="6104"\n+      destination="6105"\n+      >\n+    <!-- Plone 6.1.0a6 -->\n+    <gs:upgradeStep\n+        title="Miscellaneous"\n+        handler="..utils.null_upgrade_step"\n+        />\n+  </gs:upgradeSteps>\n+\n </configure>\n'
+b'diff --git a/Products/CMFPlone/profiles/default/metadata.xml b/Products/CMFPlone/profiles/default/metadata.xml\nindex 262e00c282..53c3c71ba3 100644\n--- a/Products/CMFPlone/profiles/default/metadata.xml\n+++ b/Products/CMFPlone/profiles/default/metadata.xml\n@@ -1,4 +1,4 @@\n <?xml version="1.0" encoding="utf-8"?>\n <metadata>\n-  <version>6024</version>\n+  <version>6025</version>\n </metadata>\ndiff --git a/news/6025.internal b/news/6025.internal\nnew file mode 100644\nindex 0000000000..5f5fe496dd\n--- /dev/null\n+++ b/news/6025.internal\n@@ -0,0 +1,2 @@\n+Added upgrade to 6025, Plone 6.0.14.\n+[maurits]\n'